TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

always pull out a via variable and simplify logic

Browse Source
This commit is contained in:
Aaron Patterson 2014-05-30 11:12:01 -07:00
parent 16e210745c
commit 6a3cbaca2e
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
actionpack/lib/action_dispatch/routing/mapper.rb
View File

@ -213,19 +213,22 @@ def normalize_conditions!(path_params, path, ast)
end
@conditions[:required_defaults] = required_defaults
via_all = options.delete(:via) if options[:via] == :all
via = options[:via]
if !via_all && options[:via].blank?
msg = "You should not use the `match` method in your router without specifying an HTTP method.\n" \
"If you want to expose your action to both GET and POST, add `via: [:get, :post]` option.\n" \
"If you want to expose your action to GET, use `get` in the router:\n" \
" Instead of: match \"controller#action\"\n" \
" Do: get \"controller#action\""
raise ArgumentError, msg
end
if via == :all
options.delete(:via)
else
via = Array(via).compact
if via.empty?
msg = "You should not use the `match` method in your router without specifying an HTTP method.\n" \
"If you want to expose your action to both GET and POST, add `via: [:get, :post]` option.\n" \
"If you want to expose your action to GET, use `get` in the router:\n" \
" Instead of: match \"controller#action\"\n" \
" Do: get \"controller#action\""
raise ArgumentError, msg
end
if via = options[:via]
@conditions[:request_method] = Array(via).map { |m| m.to_s.dasherize.upcase }
@conditions[:request_method] = via.map { |m| m.to_s.dasherize.upcase }
end
end