mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
remove side effects in normalize_defaults
now the `@defaults` variable doesn't need to be set before calling `normalize_defaults`
This commit is contained in:
parent
3e3e23f048
commit
a4f7809472
1 changed files with 3 additions and 8 deletions
|
@ -121,14 +121,13 @@ module ActionDispatch
|
||||||
|
|
||||||
@requirements = formats[:requirements].merge Hash[requirements]
|
@requirements = formats[:requirements].merge Hash[requirements]
|
||||||
@conditions = Hash[conditions]
|
@conditions = Hash[conditions]
|
||||||
@defaults = formats[:defaults].merge @defaults
|
@defaults = formats[:defaults].merge(@defaults).merge(normalize_defaults(options))
|
||||||
|
|
||||||
@conditions[:required_defaults] = (split_options[:required_defaults] || []).map(&:first)
|
@conditions[:required_defaults] = (split_options[:required_defaults] || []).map(&:first)
|
||||||
@conditions[:path_info] = path
|
@conditions[:path_info] = path
|
||||||
@conditions[:parsed_path_info] = ast
|
@conditions[:parsed_path_info] = ast
|
||||||
|
|
||||||
add_request_method(via, @conditions)
|
add_request_method(via, @conditions)
|
||||||
normalize_defaults!(options)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def to_route
|
def to_route
|
||||||
|
@ -219,12 +218,8 @@ module ActionDispatch
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def normalize_defaults!(options)
|
def normalize_defaults(options)
|
||||||
options.each_pair do |key, default|
|
Hash[options.reject { |_, default| Regexp === default }]
|
||||||
unless Regexp === default
|
|
||||||
@defaults[key] = default
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def add_request_method(via, conditions)
|
def add_request_method(via, conditions)
|
||||||
|
|
Loading…
Reference in a new issue