diff options
Diffstat (limited to 'actionpack/lib/action_view/renderer/abstract_renderer.rb')
-rw-r--r-- | actionpack/lib/action_view/renderer/abstract_renderer.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb index 77cfa51dff..4a52b3172e 100644 --- a/actionpack/lib/action_view/renderer/abstract_renderer.rb +++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb @@ -1,9 +1,7 @@ module ActionView class AbstractRenderer #:nodoc: - attr_reader :vew, :lookup_context - delegate :find_template, :template_exists?, :with_fallbacks, :update_details, - :with_layout_format, :formats, :to => :lookup_context + :with_layout_format, :formats, :freeze_formats, :to => :@lookup_context def initialize(view) @view = view @@ -18,19 +16,22 @@ module ActionView # the lookup context to take this new format into account. def wrap_formats(value) return yield unless value.is_a?(String) - @@formats_regexp ||= /\.(#{Mime::SET.symbols.join('|')})$/ - if value.sub!(@@formats_regexp, "") + if value.sub!(formats_regexp, "") update_details(:formats => [$1.to_sym]){ yield } else yield end end + def formats_regexp + @@formats_regexp ||= /\.(#{Mime::SET.symbols.join('|')})$/ + end + protected def instrument(name, options={}) ActiveSupport::Notifications.instrument("render_#{name}.action_view", options){ yield } end end -end
\ No newline at end of file +end |