aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2014-10-28 16:17:33 -0700
committerXavier Noria <fxn@hashref.com>2014-10-28 16:35:24 -0700
commitb3bfa361c503e107aff4dee5edf79bd7fd3d3725 (patch)
tree4a9725f90708b45ff85e68b01335bbf94ee35f17 /actionview
parent777142d3a7b9ea36fcc8562613749299ac6dc243 (diff)
downloadrails-b3bfa361c503e107aff4dee5edf79bd7fd3d3725.tar.gz
rails-b3bfa361c503e107aff4dee5edf79bd7fd3d3725.tar.bz2
rails-b3bfa361c503e107aff4dee5edf79bd7fd3d3725.zip
let's warn with heredocs
The current style for warning messages without newlines uses concatenation of string literals with manual trailing spaces where needed. Heredocs have better readability, and with `squish` we can still produce a single line. This is a similar use case to the one that motivated defining `strip_heredoc`, heredocs are super clean.
Diffstat (limited to 'actionview')
-rw-r--r--actionview/lib/action_view/template/resolver.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/actionview/lib/action_view/template/resolver.rb b/actionview/lib/action_view/template/resolver.rb
index d77421d5f5..b65507f4a2 100644
--- a/actionview/lib/action_view/template/resolver.rb
+++ b/actionview/lib/action_view/template/resolver.rb
@@ -1,6 +1,7 @@
require "pathname"
require "active_support/core_ext/class"
require "active_support/core_ext/module/attribute_accessors"
+require 'active_support/core_ext/string/filters'
require "action_view/template"
require "thread"
require "thread_safe"
@@ -251,9 +252,10 @@ module ActionView
extension = pieces.pop
unless extension
- message = "The file #{path} did not specify a template handler. The default is currently ERB, " \
- "but will change to RAW in the future."
- ActiveSupport::Deprecation.warn message
+ ActiveSupport::Deprecation.warn(<<-MSG.squish)
+ The file #{path} did not specify a template handler. The default is
+ currently ERB, but will change to RAW in the future.
+ MSG
end
handler = Template.handler_for_extension(extension)