提交 e38a456f 编写于 作者: A Aaron Patterson

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.
上级 aef421ed
...@@ -59,15 +59,15 @@ class Mapping #:nodoc: ...@@ -59,15 +59,15 @@ class Mapping #:nodoc:
ANCHOR_CHARACTERS_REGEX = %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z} ANCHOR_CHARACTERS_REGEX = %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z}
attr_reader :requirements, :conditions, :defaults 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] options = scope[:options].merge(options) if scope[:options]
defaults = (scope[:defaults] || {}).dup defaults = (scope[:defaults] || {}).dup
scope_constraints = scope[:constraints] || {} 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 end
def self.check_via(via) def self.check_via(via)
...@@ -82,7 +82,7 @@ def self.check_via(via) ...@@ -82,7 +82,7 @@ def self.check_via(via)
via via
end 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 @defaults = defaults
@set = set @set = set
...@@ -90,7 +90,6 @@ def initialize(set, path, defaults, as, controller, default_action, modyoule, to ...@@ -90,7 +90,6 @@ def initialize(set, path, defaults, as, controller, default_action, modyoule, to
@default_controller = controller @default_controller = controller
@default_action = default_action @default_action = default_action
@as = as @as = as
@anchor = anchor
options_constraints = options.delete(:constraints) || {} options_constraints = options.delete(:constraints) || {}
...@@ -132,7 +131,7 @@ def initialize(set, path, defaults, as, controller, default_action, modyoule, to ...@@ -132,7 +131,7 @@ def initialize(set, path, defaults, as, controller, default_action, modyoule, to
end end
def to_route def to_route
[ app(@blocks), conditions, requirements, defaults, as, anchor ] [ app(@blocks), conditions, requirements, defaults, as ]
end end
private private
...@@ -1611,8 +1610,8 @@ def add_route(action, controller, options, _path, to, via, formatted, anchor) # ...@@ -1611,8 +1610,8 @@ def add_route(action, controller, options, _path, to, via, formatted, anchor) #
name_for_action(options.delete(:as), action) name_for_action(options.delete(:as), action)
end end
mapping = Mapping.build(@scope, @set, URI.parser.escape(path), as, controller, default_action, to, via, formatted, anchor, options) mapping = Mapping.build(@scope, @set, URI.parser.escape(path), as, controller, default_action, to, via, formatted, options)
app, conditions, requirements, defaults, as, anchor = mapping.to_route app, conditions, requirements, defaults, as = mapping.to_route
@set.add_route(app, conditions, requirements, defaults, as, anchor) @set.add_route(app, conditions, requirements, defaults, as, anchor)
end end
......
...@@ -95,7 +95,7 @@ def test_random_keys ...@@ -95,7 +95,7 @@ def test_random_keys
def test_mapping_requirements def test_mapping_requirements
options = { } options = { }
scope = Mapper::Scope.new({}) 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 _, _, requirements, _ = m.to_route
assert_equal(/.+?/, requirements[:rest]) assert_equal(/.+?/, requirements[:rest])
end end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册