diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-11 13:54:25 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-11 14:49:19 -0700 |
commit | 5935e4c882b89d539d7a1441263bc265d397cf8e (patch) | |
tree | d7581a6132fe14ed66d2a1fe656fc5b94053c052 /actionpack/lib/action_dispatch/routing | |
parent | 934bdf672466c789f4c9725f09e1ef2e7aae6694 (diff) | |
download | rails-5935e4c882b89d539d7a1441263bc265d397cf8e.tar.gz rails-5935e4c882b89d539d7a1441263bc265d397cf8e.tar.bz2 rails-5935e4c882b89d539d7a1441263bc265d397cf8e.zip |
push option decomposition up a bit more
I think we can find the original place where `action` is added to the
options hash now.
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 92e32ac29b..a207349e11 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -61,7 +61,7 @@ module ActionDispatch attr_reader :requirements, :conditions, :defaults attr_reader :to, :default_controller, :default_action, :as, :anchor - def self.build(scope, set, path, as, controller, options) + def self.build(scope, set, path, as, controller, default_action, options) options = scope[:options].merge(options) if scope[:options] options.delete :only @@ -72,8 +72,6 @@ module ActionDispatch defaults = (scope[:defaults] || {}).dup - default_action = options.delete(:action) || scope[:action] - new scope, set, path, defaults, as, controller, default_action, options end @@ -1593,7 +1591,9 @@ module ActionDispatch name_for_action(options.delete(:as), action) end - mapping = Mapping.build(@scope, @set, URI.parser.escape(path), as, controller, options) + default_action = options.delete(:action) || @scope[:action] + + mapping = Mapping.build(@scope, @set, URI.parser.escape(path), as, controller, default_action, options) app, conditions, requirements, defaults, as, anchor = mapping.to_route @set.add_route(app, conditions, requirements, defaults, as, anchor) end |