diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 397318ed5099408a8ce5d4576851f78d253b328f..11f2e33b45040252e207915bd6daa2c17051bc8d 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -59,15 +59,15 @@ class Mapping #:nodoc: 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 @@ def self.check_via(via) 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 @@ def initialize(set, path, defaults, as, controller, default_action, modyoule, to @default_controller = controller @default_action = default_action @as = as - @anchor = anchor options_constraints = options.delete(:constraints) || {} @@ -132,7 +131,7 @@ def initialize(set, path, defaults, as, controller, default_action, modyoule, to end def to_route - [ app(@blocks), conditions, requirements, defaults, as, anchor ] + [ app(@blocks), conditions, requirements, defaults, as ] end private @@ -1611,8 +1610,8 @@ def add_route(action, controller, options, _path, to, via, formatted, anchor) # 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 diff --git a/actionpack/test/dispatch/mapper_test.rb b/actionpack/test/dispatch/mapper_test.rb index 4a72bfa048add5376bfec139e42b9c97bc1a298b..8734380008a4ea7084597cc8d530c174eda42b06 100644 --- a/actionpack/test/dispatch/mapper_test.rb +++ b/actionpack/test/dispatch/mapper_test.rb @@ -95,7 +95,7 @@ def test_random_keys def test_mapping_requirements options = { } scope = Mapper::Scope.new({}) - m = Mapper::Mapping.build(scope, FakeSet.new, '/store/:name(*rest)', nil, 'foo', 'bar', nil, [:get], nil, nil, options) + m = Mapper::Mapping.build(scope, FakeSet.new, '/store/:name(*rest)', nil, 'foo', 'bar', nil, [:get], nil, options) _, _, requirements, _ = m.to_route assert_equal(/.+?/, requirements[:rest]) end