nkallen-cache-money 0.2.4 → 0.2.5

data/TODO

@@ -1,14 +1,12 @@
 TOP PRIORITY
 
 REFACTOR
-* Reorganize transactional spec
 * Clarify terminology around cache/key/index, etc.
 
 INFRASTRUCTURE
 
 NEW FEATURES
 * transactional get multi isn't really multi
-* add on "not stored" should yield
 
 BUGS
 * Handle append strategy (using add rather than set?) to avoid race condition

data/lib/cash/accessor.rb

@@ -38,7 +38,9 @@ module Cash
       end
 
       def add(key, value, options = {})
-        repository.add(cache_key(key), value, options[:ttl] || 0, options[:raw])
+        if repository.add(cache_key(key), value, options[:ttl] || 0, options[:raw]) == "NOT_STORED\r\n"
+          yield
+        end
       end
 
       def set(key, value, options = {})
@@ -46,15 +48,15 @@ module Cash
       end
 
       def incr(key, delta = 1, ttl = 0)
-        repository.incr(cache_key(key), delta) || begin
-          repository.add(cache_key(key), (result = yield).to_s, ttl, true)
+        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)
-        repository.decr(cache_key(key), delta) || begin
-          repository.add(cache_key(key), (result = yield).to_s, ttl, true)
+        repository.decr(cache_key = cache_key(key), delta) || begin
+          repository.add(cache_key, (result = yield).to_s, ttl, true) { repository.decr(cache_key) }
           result
         end
       end
@@ -64,7 +66,7 @@ module Cash
       end
 
       def cache_key(key)
-        "#{name}/#{key.to_s.gsub(' ', '+')}"
+        "#{name}:#{cache_config.version}/#{key.to_s.gsub(' ', '+')}"
       end
     end
 
@@ -72,7 +74,6 @@ module Cash
       def expire
         self.class.expire(id)
       end
-      alias_method :expire_cache, :expire
     end
   end
 end

data/lib/cash/config.rb

@@ -9,11 +9,10 @@ module Cash
 
     module ClassMethods
       def self.extended(a_class)
-        a_class.class_eval do
-          class << self
-            delegate :repository, :indices, :to => :@cache_config
-            alias_method_chain :inherited, :cache_config
-          end
+        class << a_class
+          attr_reader :cache_config
+          delegate :repository, :indices, :to => :@cache_config
+          alias_method_chain :inherited, :cache_config
         end
       end
 
@@ -27,6 +26,10 @@ module Cash
         (@cache_config.indices.unshift(Index.new(@cache_config, self, attributes, options))).uniq!
       end
 
+      def version(number)
+        @cache_config.options[:version] = number
+      end
+
       def cache_config=(config)
         @cache_config = config
       end
@@ -52,6 +55,10 @@ module Cash
         @options[:ttl]
       end
 
+      def version
+        @options[:version] || 1
+      end
+
       def indices
         @indices ||= active_record == ActiveRecord::Base ? [] : [Index.new(self, active_record, active_record.primary_key)]
       end

data/lib/cash/finders.rb

@@ -8,17 +8,15 @@ module Cash
 
     module ClassMethods
       def self.extended(active_record_class)
-        active_record_class.class_eval do
-          class << self
-            alias_method_chain :find_every, :cache
-            alias_method_chain :find_from_ids, :cache
-            alias_method_chain :calculate, :cache
-          end
+        class << active_record_class
+          alias_method_chain :find_every, :cache
+          alias_method_chain :find_from_ids, :cache
+          alias_method_chain :calculate, :cache
         end
       end
 
       def without_cache(&block)
-        User.with_scope(:find => {:readonly => true}, &block)
+        with_scope(:find => {:readonly => true}, &block)
       end
 
       # User.find(:first, ...), User.find_by_foo(...), User.find(:all, ...), User.find_all_by_foo(...)

data/spec/cash/accessor_spec.rb

@@ -22,8 +22,8 @@ module Cash
         describe 'when there is a total cache miss' do
           it 'yields the keys to the block' do
             Story.fetch(["yabba", "dabba"]) { |*missing_ids| ["doo", "doo"] }.should == {
-              "Story/yabba" => "doo",
-              "Story/dabba" => "doo"
+              "Story:1/yabba" => "doo",
+              "Story:1/dabba" => "doo"
             }
           end
         end
@@ -32,8 +32,8 @@ module Cash
           it 'yields just the missing ids to the block' do
             Story.set("yabba", "dabba")
             Story.fetch(["yabba", "dabba"]) { |*missing_ids| "doo" }.should == {
-              "Story/yabba" => "dabba",
-              "Story/dabba" => "doo"
+              "Story:1/yabba" => "dabba",
+              "Story:1/dabba" => "doo"
             }
           end
         end
@@ -102,6 +102,22 @@ module Cash
       end
     end
 
+    describe '#add' do
+      describe 'when the value already exists' do
+        it 'yields to the block' do
+          Story.set("count", 1)
+          Story.add("count", 1) { "yield me" }.should == "yield me"
+        end
+      end
+
+      describe 'when the value does not already exist' do
+        it 'adds the key to the cache' do
+          Story.add("count", 1)
+          Story.get("count").should == 1
+        end
+      end
+    end
+
     describe '#decr' do
       describe 'when there is a cache hit' do
         before do
@@ -129,5 +145,15 @@ module Cash
         end
       end
     end
+
+    describe '#cache_key' do
+      it 'uses the version number' do
+        Story.version 1
+        Story.cache_key("foo").should == "Story:1/foo"
+
+        Story.version 2
+        Story.cache_key("foo").should == "Story:2/foo"
+      end
+    end
   end
 end

data/spec/cash/finders_spec.rb

@@ -294,6 +294,18 @@ module Cash
             end
           end
         end
+
+        describe '#without_cache' do
+          describe 'when finders are called within the provided block' do
+            it 'uses the database not the cache' do
+              story = Story.create!
+              mock(Story).get.never
+              Story.without_cache do
+                Story.find(story.id).should == story
+              end
+            end
+          end
+        end
       end
 
       describe 'when the cache is not populated' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nkallen-cache-money
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Nick Kallen
@@ -17,7 +17,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 2.2.0
     version: 
@@ -26,10 +26,19 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 2.2.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: memcache-client
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.5.0
+    version: 
 description: Cache utilities.
 email: nick@twitter.com
 executables: []