erector-rails4 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3ade49fdb2de3d11f397885098e275424687a22
-  data.tar.gz: 1f706283a313e34c802e310cb4249128ad6dbcb0
+  metadata.gz: a74438b8e1a5e68fb0630a400e6863d5eef429d3
+  data.tar.gz: 5a3bb013b485b9afd29a816abccf442dfec8126a
 SHA512:
-  metadata.gz: 354555dd2a8e63e575993021a39cb7a40a885c6fe73d40c3d599cd974029cd484fbab11d388e6883ef665633d62752b6f9c37303f5c6b801a1a40a7d777e281d
-  data.tar.gz: f598d530d6054192c74a9b56c89c0d6c631958a2a674ffae3419e17e1944c17b0a54776005b35fe471b79253cddca87b548eefeddde179dde6252efcaff34c46
+  metadata.gz: acc2083f696024b0ece8425d4591674dbaadc00d5cfca2e6ab61f7a06fd225c5390bb39694bdca32c70e34d24bf80eaeaf60b145339eb8166cdeadc0faebaf5d
+  data.tar.gz: af17c1bb8dbd175f441b7537f7314e4c4de03abfc0c09b44c9422f2f14a264e8499c681062e878bfc18bdc205da678c252f1f51aa040e416bf74b50394a66b4b

data/lib/erector/caching.rb

@@ -67,7 +67,22 @@ module Erector
     protected
     def _emit(options = {})
       if should_cache?
-        cache[self.class, self.class.cache_version, cache_key_assigns, options[:content_method_name]] ||= super
+        if options[:output]
+          # todo: document that either :buffer or :output can be used to specify an output buffer, and deprecate :output
+          if options[:output].is_a? Output
+            @_output = options[:output]
+          else
+            @_output = Output.new({:buffer => options[:output]}.merge(options))
+          end
+        else
+          @_output = Output.new(options)
+        end
+
+        if (cached_str = cache[self.class, self.class.cache_version, cache_key_assigns, options[:content_method_name]])
+          output << cached_str
+        else
+          cache[self.class, self.class.cache_version, cache_key_assigns, options[:content_method_name]] = super
+        end
       else
         super
       end

data/lib/erector/version.rb

@@ -1,3 +1,3 @@
 module Erector
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/dummy/spec/render_spec.rb

@@ -49,6 +49,16 @@ describe ActionController::Base do
       render :widget => TestWidget, :content_method_name => :content_method
     end
 
+    def render_with_cache_one
+      @name = 'One'
+      render :widget => CashWidget
+    end
+
+    def render_with_cache_two
+      @name = 'Two'
+      render :widget => CashWidget
+    end
+
     def render_with_rails_options
       render :widget => TestWidget, :status => 500, :content_type => "application/json"
     end
@@ -229,6 +239,15 @@ describe ActionController::Base do
     end
   end
 
+  class CashWidget < Erector::Widget
+    needs :name
+    cacheable 'v1'
+
+    def content
+      text @name
+    end
+  end
+
   def test_action(action)
     @response = TestController.action(action).call(Rack::MockRequest.env_for("/path"))[2]
     @response.body
@@ -365,5 +384,12 @@ describe ActionController::Base do
       test_action(:render_with_widget_as_layout_using_content_for).should == "TOPBEFOREDURINGAFTER"
     end
 
+    it "should cache properly" do
+      test_action(:render_with_cache_one).should == "One"
+      test_action(:render_with_cache_one).should == "One"
+      test_action(:render_with_cache_two).should == "Two"
+      test_action(:render_with_cache_two).should == "Two"
+    end
+
   end
 end

data/spec/erector/caching_spec.rb

@@ -126,6 +126,8 @@ describe Erector::Caching do
     it "uses the only_keys option" do
       CashWithCacheOpts.new(name: "Adam", occupation: "Hairdresser").to_html
       @cache[CashWithCacheOpts, 'v3', {occupation: "Hairdresser"}].should == "Adam is a Hairdresser"
+      CashWithCacheOpts.new(name: "Foobar", occupation: "Hairdresser").to_html.should == "Adam is a Hairdresser"
+      CashWithCacheOpts.new(name: "Foobar", occupation: "Hairdressr").to_html.should == "Foobar is a Hairdressr"
     end
 
     it "doesn't use the cached value for widgets not declared cachable" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erector-rails4
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Alex Chaffee