Made ActionView::Base#first_render a little more private. And added _last_render to track the most recent render. Will fix #609 as a side effect. [#609 state:resolved]

3 files changed, 6 insertions, 7 deletions

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 989e92a890..9f244d7250 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -159,11 +159,11 @@ module ActionView #:nodoc:
   class Base
     include ERB::Util
 
-    attr_accessor :base_path, :assigns, :template_extension, :first_render
+    attr_accessor :base_path, :assigns, :template_extension
     attr_accessor :controller
+    attr_accessor :_first_render, :_last_render
 
     attr_writer :template_format
-    attr_accessor :current_render_extension
 
     attr_accessor :output_buffer
 
@@ -313,7 +313,7 @@ module ActionView #:nodoc:
         template
       elsif template = self.view_paths[template_file_name]
         template
-      elsif first_render && template = self.view_paths["#{template_file_name}.#{first_render.extension}"]
+      elsif _first_render && template = self.view_paths["#{template_file_name}.#{_first_render.extension}"]
         template
       elsif template_format == :js && template = self.view_paths["#{template_file_name}.html"]
         @template_format = :html
diff --git a/actionpack/lib/action_view/helpers/cache_helper.rb b/actionpack/lib/action_view/helpers/cache_helper.rb
index 930c397785..2cdbae6e40 100644
--- a/actionpack/lib/action_view/helpers/cache_helper.rb
+++ b/actionpack/lib/action_view/helpers/cache_helper.rb
@@ -32,8 +32,7 @@ module ActionView
       #      <i>Topics listed alphabetically</i>
       #    <% end %>
       def cache(name = {}, options = nil, &block)
-        handler = Template.handler_class_for_extension(current_render_extension.to_sym)
-        handler.new(@controller).cache_fragment(block, name, options)
+        _last_render.handler.new(@controller).cache_fragment(block, name, options)
       end
     end
   end
diff --git a/actionpack/lib/action_view/renderable.rb b/actionpack/lib/action_view/renderable.rb
index 2c4302146f..ebb0f1b674 100644
--- a/actionpack/lib/action_view/renderable.rb
+++ b/actionpack/lib/action_view/renderable.rb
@@ -18,9 +18,9 @@ module ActionView
     end
 
     def render(view, local_assigns = {})
-      view.first_render ||= self
+      view._first_render ||= self
+      view._last_render = self
       view.send(:evaluate_assigns)
-      view.current_render_extension = extension
       compile(local_assigns) if handler.compilable?
       handler.new(view).render(self, local_assigns)
     end