garterbelt 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/garterbelt.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{garterbelt}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kane Baccigalupi"]

data/lib/renderers/cache.rb

@@ -2,17 +2,22 @@ module Garterbelt
   class Cache < Renderer
     include ContentRendering
     
-    attr_accessor :key, :cache_output, :view_output
+    attr_accessor :key, :cache_output, :view_output, :expires_in
     
     def initialize(opts, &block)
       super
       self.key = opts[:key]
+      self.expires_in = opts[:expires_in]
       raise ArgumentError, ":key option required" unless key
       self.content = block if block_given?
       raise_unless_block_content
       self.cache_output = ""
     end
     
+    def cache_options
+      expires_in ? {:expires_in => expires_in} : {}
+    end
+    
     def head
       self.view_output = output
       self.output = cache_output
@@ -27,8 +32,8 @@ module Garterbelt
       if cached = view.cache_store[key]
         self.output << cached
       else
-        super                                 # renders block to the diverted output
-        view.cache_store[key] = cache_output  # set the cache
+        super # renders block to the diverted output
+        view.cache_store.store(key, cache_output, cache_options)  # set the cache
       end
     end
   end

data/lib/view.rb

@@ -332,10 +332,9 @@ module Garterbelt
       "#{cache_key_base}_#{detail}"
     end
     
-    def cache(key, &block)
-      renderer = Cache.new(:view => self, :key => cache_key(key), &block)
-      buffer << renderer
-      renderer
+    def cache(key, opts={}, &block)
+      opts = opts.merge(:key => cache_key(key), :view => curator)
+      add_to_buffer Cache.new(opts, &block)
     end
   end
 end

data/spec/renderers/cache_spec.rb

@@ -29,6 +29,13 @@ describe Garterbelt::Cache do
     it 'stores the full key' do
       build_cache.key.should == 'good_deal'
     end
+    
+    it 'stores the expiration information' do
+      cache = Garterbelt::Cache.new(:key => 'expiring_deal', :view => @view, :expires_in => 3600) do # one hour, in seconds
+        Garterbelt::ContentTag.new(:type => :p, :view => @view)
+      end
+      cache.expires_in.should == 3600
+    end
   end
   
   describe 'rendering' do
@@ -80,6 +87,27 @@ describe Garterbelt::Cache do
         @view.should_receive(:render_buffer)
         @cache.render
       end
+      
+      it 'adds puts the render block into the cache' do
+        @view.output = "view output; "
+        @view.cache_store.should_receive(:[]).with('good_deal').and_return(nil)
+        @view.stub(:render_buffer).and_return('buffer rendered')
+        @view.cache_store.should_receive(:store).with('good_deal', @cache.cache_output, {})
+        @cache.render
+      end
+      
+      it 'uses the expiration when it has one' do
+        cache = Garterbelt::Cache.new(:key => 'good_deal', :view => @view, :expires_in => 3600) do
+          Garterbelt::ContentTag.new(:type => :p, :view => @view)
+        end
+        
+        @view.output = "view output; "
+        @view.cache_store.should_receive(:[]).with('good_deal').and_return(nil)
+        @view.stub(:render_buffer).and_return('buffer rendered')
+        
+        @view.cache_store.should_receive(:store).with('good_deal', cache.cache_output, {:expires_in => 3600})
+        cache.render
+      end
     end
   end
 end

data/spec/view/view_caching_spec.rb

@@ -128,5 +128,13 @@ describe Garterbelt::View, "Caching" do
       cache.is_a?(Garterbelt::Cache).should be_true
       cache.key.should == 'cached_foo_you'
     end
+    
+    it 'passes on correctly the :expires_in option' do
+      @view.cache("my_key", :expires_in => 24*3600) do
+        puts "foo"
+      end
+      cache = @view.buffer.last
+      cache.expires_in.should == 24*3600
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: garterbelt
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Kane Baccigalupi