onyx-cache-money 0.2.6.1 → 0.2.6.2

data/lib/cash/accessor.rb

@@ -52,23 +52,25 @@ module Cash
       end
       
       def add(key, value, options = {})
-        if repository.add(cache_key(key), value, options[:ttl] || 0, options[:raw]) == "NOT_STORED\r\n"
+        if repository.add(cache_key(key), value, options[:ttl] || cache_config.options[:ttl], options[:raw]) == "NOT_STORED\r\n"
           yield if block_given?
         end
       end
 
       def set(key, value, options = {})
-        repository.set(cache_key(key), value, options[:ttl] || 0, options[:raw])
+        repository.set(cache_key(key), value, options[:ttl] || cache_config.options[:ttl], options[:raw])
       end
 
-      def incr(key, delta = 1, ttl = 0)
+      def incr(key, delta = 1, ttl = nil)
+        ttl ||= cache_config.options[:ttl]
         repository.incr(cache_key = cache_key(key), delta) || begin
           repository.add(cache_key, (result = yield).to_s, ttl, true) { repository.incr(cache_key) }
           result
         end
       end
 
-      def decr(key, delta = 1, ttl = 0)
+      def decr(key, delta = 1, ttl = nil)
+        ttl ||= cache_config.options[:ttl]
         repository.decr(cache_key = cache_key(key), delta) || begin
           repository.add(cache_key, (result = yield).to_s, ttl, true) { repository.decr(cache_key) }
           result

data/spec/cash/accessor_spec.rb

@@ -102,6 +102,11 @@ module Cash
       end
 
       describe 'when there is a cache miss' do
+        it 'correctly set the ttl' do
+          mock(Story.repository.memcache).add(Story.cache_key("count"), "2", Story.cache_config.options[:ttl], true)
+          Story.incr("count", 1) { 2 }
+        end
+        
         it 'initializes the value of the cache to the value of the block' do
           Story.incr("count", 1) { 5 }
           Story.get("count", :raw => true).should =~ /5/
@@ -131,6 +136,20 @@ module Cash
           Story.add("count", 1)
           Story.get("count").should == 1
         end
+
+        it 'adds the key to the cache with the default ttl' do
+          mock(Story.repository.memcache).add(Story.cache_key("count"), 1, Story.cache_config.options[:ttl], nil)
+          Story.add("count", 1)
+        end
+      end
+    end
+
+    describe '#set' do
+      describe 'when the value does not already exist' do
+        it 'adds the key to the cache with the default ttl' do
+          mock(Story.repository.memcache).set(Story.cache_key("count"), 1, Story.cache_config.options[:ttl], nil)
+          Story.set("count", 1)
+        end
       end
     end
 
@@ -148,9 +167,15 @@ module Cash
         it 'returns the new cache value' do
           Story.decr("count", 2).should == 8
         end
+        
       end
 
       describe 'when there is a cache miss' do
+        it 'correctly set the ttl' do
+          mock(Story.repository.memcache).add(Story.cache_key("count"), "2", Story.cache_config.options[:ttl], true)
+          Story.decr("count", 1) { 2 }
+        end
+
         it 'initializes the value of the cache to the value of the block' do
           Story.decr("count", 1) { 5 }
           Story.get("count", :raw => true).should =~ /5/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: onyx-cache-money
 version: !ruby/object:Gem::Version 
-  version: 0.2.6.1
+  version: 0.2.6.2
 platform: ruby
 authors: 
 - Nick Kallen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-18 00:00:00 -07:00
+date: 2009-07-08 00:00:00 -07:00
 default_executable: 
 dependencies: []