Get buffer for fragment cache from template's @output_buffer

actionpack/CHANGELOG

@@ -1,5 +1,7 @@
 *Edge*
 
+* Get buffer for fragment cache from template's @output_buffer [Josh Peek]
+
 * Set config.action_view.warn_cache_misses = true to receive a warning if you perform an action that results in an expensive disk operation that could be cached [Josh Peek]
 
 * Refactor template preloading. New abstractions include Renderable mixins and a refactored Template class [Josh Peek]

actionpack/lib/action_controller/caching/fragments.rb

@@ -60,10 +60,8 @@ def fragment_cache_key(key)
         ActiveSupport::Cache.expand_cache_key(key.is_a?(Hash) ? url_for(key).split("://").last : key, :views)
       end
 
-      def fragment_for(block, name = {}, options = nil) #:nodoc:
+      def fragment_for(buffer, name = {}, options = nil, &block) #:nodoc:
         if perform_caching
-          buffer = yield
-
           if cache = read_fragment(name, options)
             buffer.concat(cache)
           else

actionpack/lib/action_view/helpers/cache_helper.rb

@@ -32,7 +32,7 @@ module CacheHelper
       #      <i>Topics listed alphabetically</i>
       #    <% end %>
       def cache(name = {}, options = nil, &block)
-        _last_render.handler.new(@controller).cache_fragment(block, name, options)
+        @controller.fragment_for(output_buffer, name, options, &block)
       end
     end
   end

actionpack/lib/action_view/template_handler.rb

@@ -17,9 +17,5 @@ def compile(template)
     def compilable?
       self.class.compilable?
     end
-
-    # Called by CacheHelper#cache
-    def cache_fragment(block, name = {}, options = nil)
-    end
   end
 end

actionpack/lib/action_view/template_handlers/builder.rb

@@ -9,15 +9,10 @@ def compile(template)
         # ActionMailer does not have a response
         "controller.respond_to?(:response) && controller.response.content_type ||= Mime::XML;" +
           "xml = ::Builder::XmlMarkup.new(:indent => 2);" +
+          "self.output_buffer = xml.target!;" +
           template.source +
           ";xml.target!;"
       end
-
-      def cache_fragment(block, name = {}, options = nil)
-        @view.fragment_for(block, name, options) do
-          eval('xml.target!', block.binding)
-        end
-      end
     end
   end
 end

actionpack/lib/action_view/template_handlers/erb.rb

@@ -51,12 +51,6 @@ def compile(template)
         src = ::ERB.new(template.source, nil, erb_trim_mode, '@output_buffer').src
         "__in_erb_template=true;#{src}"
       end
-
-      def cache_fragment(block, name = {}, options = nil) #:nodoc:
-        @view.fragment_for(block, name, options) do
-          @view.response.template.output_buffer
-        end
-      end
     end
   end
 end

actionpack/lib/action_view/template_handlers/rjs.rb

@@ -7,17 +7,6 @@ def compile(template)
         "controller.response.content_type ||= Mime::JS;" +
           "update_page do |page|;#{template.source}\nend"
       end
-
-      def cache_fragment(block, name = {}, options = nil) #:nodoc:
-        @view.fragment_for(block, name, options) do
-          begin
-            debug_mode, ActionView::Base.debug_rjs = ActionView::Base.debug_rjs, false
-            eval('page.to_s', block.binding)
-          ensure
-            ActionView::Base.debug_rjs = debug_mode
-          end
-        end
-      end
     end
   end
 end

actionpack/test/controller/caching_test.rb

@@ -555,7 +555,7 @@ def test_fragment_for__with_disabled_caching
     fragment_computed = false
 
     buffer = 'generated till now -> '
-    @controller.fragment_for(Proc.new { fragment_computed = true }, 'expensive') { buffer }
+    @controller.fragment_for(buffer, 'expensive') { fragment_computed = true }
 
     assert fragment_computed
     assert_equal 'generated till now -> ', buffer
@@ -566,50 +566,11 @@ def test_fragment_for
     fragment_computed = false
 
     buffer = 'generated till now -> '
-    @controller.fragment_for(Proc.new { fragment_computed = true }, 'expensive') { buffer}
+    @controller.fragment_for(buffer, 'expensive') { fragment_computed = true }
 
     assert !fragment_computed
     assert_equal 'generated till now -> fragment content', buffer
   end
-
-  def test_cache_erb_fragment
-    @store.write('views/expensive', 'fragment content')
-    @controller.response.template.output_buffer = 'generated till now -> '
-
-    assert_equal( 'generated till now -> fragment content',
-                  ActionView::TemplateHandlers::ERB.new(@controller).cache_fragment(Proc.new{ }, 'expensive'))
-  end
-
-  def test_cache_rxml_fragment
-    @store.write('views/expensive', 'fragment content')
-    xml = 'generated till now -> '
-    class << xml; def target!; to_s; end; end
-
-    assert_equal( 'generated till now -> fragment content',
-                  ActionView::TemplateHandlers::Builder.new(@controller).cache_fragment(Proc.new{ }, 'expensive'))
-  end
-
-  def test_cache_rjs_fragment
-    @store.write('views/expensive', 'fragment content')
-    page = 'generated till now -> '
-
-    assert_equal( 'generated till now -> fragment content',
-                  ActionView::TemplateHandlers::RJS.new(@controller).cache_fragment(Proc.new{ }, 'expensive'))
-  end
-
-  def test_cache_rjs_fragment_debug_mode_does_not_interfere
-    @store.write('views/expensive', 'fragment content')
-    page = 'generated till now -> '
-
-    begin
-      debug_mode, ActionView::Base.debug_rjs = ActionView::Base.debug_rjs, true
-      assert_equal( 'generated till now -> fragment content',
-                     ActionView::TemplateHandlers::RJS.new(@controller).cache_fragment(Proc.new{ }, 'expensive'))
-      assert ActionView::Base.debug_rjs
-    ensure
-      ActionView::Base.debug_rjs = debug_mode
-    end
-  end
 end
 
 

actionpack/test/template/javascript_helper_test.rb

@@ -3,6 +3,8 @@
 class JavaScriptHelperTest < ActionView::TestCase
   tests ActionView::Helpers::JavaScriptHelper
 
+  attr_accessor :output_buffer
+
   def test_escape_javascript
     assert_equal '', escape_javascript(nil)
     assert_equal %(This \\"thing\\" is really\\n netos\\'), escape_javascript(%(This "thing" is really\n netos'))

actionpack/test/template/prototype_helper_test.rb

@@ -25,7 +25,7 @@ class Author::Nested < Author; end
 
 
 class PrototypeHelperBaseTest < ActionView::TestCase
-  attr_accessor :template_format
+  attr_accessor :template_format, :output_buffer
 
   def setup
     @template = nil