kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

remove side effects in normalize_defaults

Browse source 
now the `@defaults` variable doesn't need to be set before calling
`normalize_defaults`
This commit is contained in:
Aaron Patterson 2015-08-12 17:10:44 -07:00
parent 3e3e23f048
commit a4f7809472
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
actionpack/lib/action_dispatch/routing/mapper.rb
View file

@ -121,14 +121,13 @@ module ActionDispatch
@requirements = formats[:requirements].merge Hash[requirements]
@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[:path_info] = path
@conditions[:parsed_path_info] = ast
add_request_method(via, @conditions)
normalize_defaults!(options)
end
def to_route
@ -219,12 +218,8 @@ module ActionDispatch
end
end
def normalize_defaults!(options)
options.each_pair do |key, default|
unless Regexp === default
@defaults[key] = default
end
end
def normalize_defaults(options)
Hash[options.reject { |_, default| Regexp === default }]
end
def add_request_method(via, conditions)