提交 e86a82c5 编写于 作者: J Joshua Peek

Move name_prefix merging into Scoping concern

上级 e600b41c
......@@ -258,7 +258,13 @@ def constraints(constraints = {})
def match(*args)
options = args.extract_options!
options = (@scope[:options] || {}).merge(options)
if @scope[:name_prefix]
options[:as] = "#{@scope[:name_prefix]}#{options[:as]}"
end
args.push(options)
super(*args)
end
......@@ -391,9 +397,7 @@ def match(*args)
validate_defaults!(app, defaults, segment_keys)
app = Constraints.new(app, blocks)
name = @scope[:name_prefix] ? "#{@scope[:name_prefix]}#{options[:as]}" : options[:as]
@set.add_route(app, conditions, requirements, defaults, name)
@set.add_route(app, conditions, requirements, defaults, options[:as])
self
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册