diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-13 13:58:16 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-13 13:58:16 -0700 |
commit | e38a456faf6d4ab90c1ea7a3f9310ea47af35049 (patch) | |
tree | bb9d3b2e102d5c3776355313e2ebcabd000690ff /actionpack/lib | |
parent | aef421ed9da6a48582876e49e103a9af586a2c8b (diff) | |
download | rails-e38a456faf6d4ab90c1ea7a3f9310ea47af35049.tar.gz rails-e38a456faf6d4ab90c1ea7a3f9310ea47af35049.tar.bz2 rails-e38a456faf6d4ab90c1ea7a3f9310ea47af35049.zip |
remove anchor from mapping
the same value that is extracted from the options hash earlier is
returned, so we don't need to pass it in in the first place. The caller
already has the data, so stop passing it around.
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 397318ed50..11f2e33b45 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -59,15 +59,15 @@ module ActionDispatch ANCHOR_CHARACTERS_REGEX = %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z} attr_reader :requirements, :conditions, :defaults - attr_reader :to, :default_controller, :default_action, :as, :anchor + attr_reader :to, :default_controller, :default_action, :as - def self.build(scope, set, path, as, controller, default_action, to, via, formatted, anchor, options) + def self.build(scope, set, path, as, controller, default_action, to, via, formatted, options) options = scope[:options].merge(options) if scope[:options] defaults = (scope[:defaults] || {}).dup scope_constraints = scope[:constraints] || {} - new set, path, defaults, as, controller, default_action, scope[:module], to, formatted, scope_constraints, scope[:blocks] || [], via, anchor, options + new set, path, defaults, as, controller, default_action, scope[:module], to, formatted, scope_constraints, scope[:blocks] || [], via, options end def self.check_via(via) @@ -82,7 +82,7 @@ module ActionDispatch via end - def initialize(set, path, defaults, as, controller, default_action, modyoule, to, formatted, scope_constraints, blocks, via, anchor, options) + def initialize(set, path, defaults, as, controller, default_action, modyoule, to, formatted, scope_constraints, blocks, via, options) @defaults = defaults @set = set @@ -90,7 +90,6 @@ module ActionDispatch @default_controller = controller @default_action = default_action @as = as - @anchor = anchor options_constraints = options.delete(:constraints) || {} @@ -132,7 +131,7 @@ module ActionDispatch end def to_route - [ app(@blocks), conditions, requirements, defaults, as, anchor ] + [ app(@blocks), conditions, requirements, defaults, as ] end private @@ -1611,8 +1610,8 @@ module ActionDispatch name_for_action(options.delete(:as), action) end - mapping = Mapping.build(@scope, @set, URI.parser.escape(path), as, controller, default_action, to, via, formatted, anchor, options) - app, conditions, requirements, defaults, as, anchor = mapping.to_route + mapping = Mapping.build(@scope, @set, URI.parser.escape(path), as, controller, default_action, to, via, formatted, options) + app, conditions, requirements, defaults, as = mapping.to_route @set.add_route(app, conditions, requirements, defaults, as, anchor) end |