aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/http
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-12-03 22:23:11 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-12-03 22:23:12 -0200
commit3b40a5d83db90534b3cb61f4dc25547f501e4775 (patch)
tree49795acfdaaf3c5b468ddcbea474709cabf54b2e /actionpack/lib/action_dispatch/http
parentbc26f442d2ef31facc493f4db518f6e104a4f14d (diff)
downloadrails-3b40a5d83db90534b3cb61f4dc25547f501e4775.tar.gz
rails-3b40a5d83db90534b3cb61f4dc25547f501e4775.tar.bz2
rails-3b40a5d83db90534b3cb61f4dc25547f501e4775.zip
Improve a couple exception messages related to variants and mime types
Avoid one-liner conditionals when they are too big. Avoid concatenating strings to build error messages. Improve messages a bit.
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
-rw-r--r--actionpack/lib/action_dispatch/http/mime_negotiation.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
index 41e6727315..346598b6de 100644
--- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb
+++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
@@ -66,15 +66,15 @@ module ActionDispatch
end
end
- # Sets the \variant for template
+ # Sets the \variant for template.
def variant=(variant)
if variant.is_a? Symbol
@variant = variant
else
- raise ArgumentError, "request.variant must be set to a Symbol, not a #{variant.class}. For security reasons," +
- "never directly set the variant to a user-provided value, like params[:variant].to_sym." +
- "Check user-provided value against a whitelist first, then set the variant:"+
- "request.variant = :tablet if params[:some_param] == 'tablet'"
+ raise ArgumentError, "request.variant must be set to a Symbol, not a #{variant.class}. " \
+ "For security reasons, never directly set the variant to a user-provided value, " \
+ "like params[:variant].to_sym. Check user-provided value against a whitelist first, " \
+ "then set the variant: request.variant = :tablet if params[:variant] == 'tablet'"
end
end