diff options
| author | Ryan Garver <ragarver@gmail.com> | 2012-10-02 10:37:27 -0700 |
|---|---|---|
| committer | Ryan Garver <ragarver@gmail.com> | 2012-10-02 10:37:27 -0700 |
| commit | 4cb50a3f571234b1202f9a0dffe39b445ecf807d (patch) | |
| tree | 13780082c3974bc480cf35722cabf8788beed3ab /actionpack/lib/action_view | |
| parent | 3fdb7126110caad3f3db4c2b44ffc365b51c34eb (diff) | |
| parent | df08271f9c044b7614d70baf4b818f1a79f4a6e1 (diff) | |
| download | rails-4cb50a3f571234b1202f9a0dffe39b445ecf807d.tar.gz rails-4cb50a3f571234b1202f9a0dffe39b445ecf807d.tar.bz2 rails-4cb50a3f571234b1202f9a0dffe39b445ecf807d.zip | |
Merge branch 'master' into feature/public-fragment_name_with_digest
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_view/log_subscriber.rb | 7 | ||||
| -rw-r--r-- | actionpack/lib/action_view/test_case.rb | 7 |
3 files changed, 11 insertions, 7 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 27ba57ff58..5b5fc84e90 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -369,9 +369,9 @@ module ActionView # <tt>:size</tt> will be ignored if the value is not in the correct format. # # image_tag("icon") - # # => <img src="/assets/icon" alt="Icon" /> + # # => <img alt="Icon" src="/assets/icon" /> # image_tag("icon.png") - # # => <img src="/assets/icon.png" alt="Icon" /> + # # => <img alt="Icon" src="/assets/icon.png" /> # image_tag("icon.png", :size => "16x10", :alt => "Edit Entry") # # => <img src="/assets/icon.png" width="16" height="10" alt="Edit Entry" /> # image_tag("/icons/icon.gif", :size => "16") diff --git a/actionpack/lib/action_view/log_subscriber.rb b/actionpack/lib/action_view/log_subscriber.rb index cc3a871576..fd9a543e0a 100644 --- a/actionpack/lib/action_view/log_subscriber.rb +++ b/actionpack/lib/action_view/log_subscriber.rb @@ -3,10 +3,13 @@ module ActionView # # Provides functionality so that Rails can output logs from Action View. class LogSubscriber < ActiveSupport::LogSubscriber + VIEWS_PATTERN = /^app\/views\//.freeze + def render_template(event) + return unless logger.info? message = " Rendered #{from_rails_root(event.payload[:identifier])}" message << " within #{from_rails_root(event.payload[:layout])}" if event.payload[:layout] - message << (" (%.1fms)" % event.duration) + message << " (#{event.duration.round(1)}ms)" info(message) end alias :render_partial :render_template @@ -19,7 +22,7 @@ module ActionView protected def from_rails_root(string) - string.sub("#{Rails.root}/", "").sub(/^app\/views\//, "") + string.sub("#{Rails.root}/", "").sub(VIEWS_PATTERN, "") end end end diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb index 04073c73cc..5434b3421e 100644 --- a/actionpack/lib/action_view/test_case.rb +++ b/actionpack/lib/action_view/test_case.rb @@ -196,16 +196,17 @@ module ActionView :@_result, :@_routes, :@controller, - :@layouts, + :@_layouts, :@locals, :@method_name, :@output_buffer, - :@partials, + :@_partials, :@passed, :@rendered, :@request, :@routes, - :@templates, + :@tagged_logger, + :@_templates, :@options, :@test_passed, :@view, |