diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-11-23 19:44:43 -0600 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-11-23 19:44:43 -0600 |
commit | 8d351eac078642505057351e7113100550ed8bc7 (patch) | |
tree | f069fc2edb293c3f2c2e16882fb45d0c0bab8957 /actionpack/lib/action_dispatch/routing/mapper.rb | |
parent | 53d7acdf4f3d61865fb4c4baa6f23601a93e3630 (diff) | |
download | rails-8d351eac078642505057351e7113100550ed8bc7.tar.gz rails-8d351eac078642505057351e7113100550ed8bc7.tar.bz2 rails-8d351eac078642505057351e7113100550ed8bc7.zip |
Extract Routing.controller_constraints
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 6e112c9b54..cfe7425a61 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -282,6 +282,8 @@ module ActionDispatch constraints.reject! { |k, v| segment_keys.include?(k.to_s) } conditions.merge!(constraints) + requirements[:controller] ||= Routing.controller_constraints + if via = options[:via] via = Array(via).map { |m| m.to_s.upcase } conditions[:request_method] = Regexp.union(*via) |