aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/mapper.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-05-30 14:20:55 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-06-03 11:33:53 -0700
commit404feeb2e486597215f28d3922a65d443c643e6e (patch)
tree03e48b9f3a87c4a8e4bbb2fed99fd241cd210113 /actionpack/lib/action_dispatch/routing/mapper.rb
parent92d16ec158c3f45faceae799a15a319847e97516 (diff)
downloadrails-404feeb2e486597215f28d3922a65d443c643e6e.tar.gz
rails-404feeb2e486597215f28d3922a65d443c643e6e.tar.bz2
rails-404feeb2e486597215f28d3922a65d443c643e6e.zip
return early from add_request_method
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb22
1 files changed, 11 insertions, 11 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index cc81b23947..5182d9e8e1 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -209,18 +209,18 @@ module ActionDispatch
end
def add_request_method(via, conditions)
- unless via == [:all]
- 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
-
- conditions[:request_method] = via.map { |m| m.to_s.dasherize.upcase }
+ return if via == [:all]
+
+ 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
+
+ conditions[:request_method] = via.map { |m| m.to_s.dasherize.upcase }
end
def app(blocks)