提交 7df7c707 编写于 作者: A Aaron Patterson

one fewer hash mutation

上级 5935e4c8
...@@ -1579,8 +1579,10 @@ def add_route(action, controller, options) # :nodoc: ...@@ -1579,8 +1579,10 @@ def add_route(action, controller, options) # :nodoc:
action = action.to_s action = action.to_s
default_action = options.delete(:action) || @scope[:action]
if action =~ /^[\w\-\/]+$/ if action =~ /^[\w\-\/]+$/
options[:action] ||= action.tr('-', '_') unless action.include?("/") default_action ||= action.tr('-', '_') unless action.include?("/")
else else
action = nil action = nil
end end
...@@ -1591,8 +1593,6 @@ def add_route(action, controller, options) # :nodoc: ...@@ -1591,8 +1593,6 @@ def add_route(action, controller, options) # :nodoc:
name_for_action(options.delete(:as), action) name_for_action(options.delete(:as), action)
end end
default_action = options.delete(:action) || @scope[:action]
mapping = Mapping.build(@scope, @set, URI.parser.escape(path), as, controller, default_action, options) mapping = Mapping.build(@scope, @set, URI.parser.escape(path), as, controller, default_action, options)
app, conditions, requirements, defaults, as, anchor = mapping.to_route app, conditions, requirements, defaults, as, anchor = mapping.to_route
@set.add_route(app, conditions, requirements, defaults, as, anchor) @set.add_route(app, conditions, requirements, defaults, as, anchor)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册