Cache block components

lib/curly/compiler.rb

@@ -103,13 +103,16 @@ def compile_collection(block)
         items.each_with_index do |item, index|
           options = options.merge("#{name}" => item, "#{counter}" => index + 1)
           presenter = ::#{item_presenter_class}.new(self, options)
+
+          Curly::TemplateHandler.cache_if_key_is_not_nil(self, presenter) do
       RUBY
 
       @presenter_classes.push(item_presenter_class)
       compile(block.nodes)
       @presenter_classes.pop
 
       output <<-RUBY
+          end
         end
         options = options_stack.pop
         presenter = presenters.pop
@@ -151,14 +154,17 @@ def compile_context(block)
           options = options.merge("#{name}" => item)
           buffer = ActiveSupport::SafeBuffer.new
           presenter = ::#{item_presenter_class}.new(self, options)
+
+          Curly::TemplateHandler.cache_if_key_is_not_nil(self, presenter) do
       RUBY
 
       @presenter_classes.push(item_presenter_class)
       compile(block.nodes)
       @presenter_classes.pop
 
       output <<-RUBY
-          buffer
+            buffer
+          end
         end
         buffer = buffers.pop
         presenter = presenters.pop

lib/curly/template_handler.rb

@@ -29,10 +29,16 @@ def cache_if_key_is_not_nil(context, presenter)
 
         cache_options = presenter.cache_options || {}
         cache_options[:expires_in] ||= presenter.cache_duration
+        controller = context.controller
+        fragment_name = context.cache_fragment_name([key, presenter_key].compact, cache_options)
+        fragment = controller.read_fragment(fragment_name, cache_options)
 
-        context.cache([key, presenter_key].compact, cache_options) do
-          yield
+        if fragment.nil?
+          fragment = yield
+          controller.write_fragment(fragment_name, fragment, cache_options)
         end
+
+        fragment
       else
         yield
       end

spec/compiler_spec.rb

@@ -138,6 +138,37 @@ def square?(width:, height:)
       render("{{#square? width=2 height=2}}yeah!{{/square?}}").should == "yeah!"
     end
 
+    it "caches context blocks" do
+      define_presenter do
+        presents :author
+
+        def author(&block)
+          block.call(@author)
+        end
+      end
+
+      define_presenter "AuthorPresenter" do
+        presents :author
+
+        def name
+          @author.name
+        end
+
+        def cache_key
+          "static"
+        end
+      end
+
+      author = double("author", name: "john")
+      template = "{{@author}}{{name}}{{/author}}"
+
+      expect(render(template, locals: { author: author })).to eq "john"
+
+      author.stub(:name) { "jane" }
+
+      expect(render(template, locals: { author: author })).to eq "john"
+    end
+
     it "gives an error on incomplete blocks" do
       expect do
         render("{{#hello?}}")

spec/spec_helper.rb

@@ -5,6 +5,10 @@
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
+
+  config.before do
+    Rails.cache.clear
+  end
 end
 
 module CompilationSupport
@@ -35,6 +39,9 @@ def render(source, options = {}, &block)
     template = ActionView::Template.new(source, identifier, handler, details)
     view = ActionView::Base.new
     view.lookup_context.stub(:find_template) { source }
+    view.stub(:view_cache_dependencies) { [] }
+    view.controller = ActionView::TestCase::TestController.new
+    view.controller.perform_caching = true
 
     begin
       template.render(view, options.fetch(:locals, {}), &block)