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

split options hash and pass values down

Browse source 
`using_match_shorthand?` doesn't need to know that an options hash
exists.  Also use this opportunity to make the boolean logic a little
more sane
This commit is contained in:
Aaron Patterson 2015-08-11 14:49:08 -07:00
parent 0c3f8e3f02
commit 763dd50a76
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1556,7 +1556,7 @@ module ActionDispatch
def process_path(options, controller, path, option_path) def process_path(options, controller, path, option_path)
path_without_format = path.sub(/\(\.:format\)$/, '') path_without_format = path.sub(/\(\.:format\)$/, '')
if using_match_shorthand?(path_without_format, options) if using_match_shorthand?(path_without_format, options[:to], options[:action])
options[:to] ||= path_without_format.gsub(%r{^/}, "").sub(%r{/([^/]*)$}, '#\1') options[:to] ||= path_without_format.gsub(%r{^/}, "").sub(%r{/([^/]*)$}, '#\1')
options[:to].tr!("-", "_") options[:to].tr!("-", "_")
end end
@ -1564,8 +1564,10 @@ module ActionDispatch
decomposed_match(path, controller, options, option_path) decomposed_match(path, controller, options, option_path)
end end
def using_match_shorthand?(path, options) def using_match_shorthand?(path, to, action)
path && (options[:to] || options[:action]).nil? && path =~ %r{^/?[-\w]+/[-\w/]+$} return false if to || action
path && path =~ %r{^/?[-\w]+/[-\w/]+$}
end end
def decomposed_match(path, controller, options, _path) # :nodoc: def decomposed_match(path, controller, options, _path) # :nodoc: