ngmoco-cache-money 0.2.23 → 0.2.24.2

data/spec/cash/calculations_spec.rb

@@ -36,6 +36,17 @@ module Cash
               mock(Story.connection).execute.never
               story.characters.count(:all, :conditions => { :name => name }).should == characters.size
             end
+
+            it 'has correct counter cache' do
+              story = Story.create!
+              characters = [story.characters.create!(:name => name = 'name'), story.characters.create!(:name => name)]
+              $memcache.flush_all
+              story.characters.find(:all, :conditions => { :name => name }) == characters
+              story.characters.count(:all, :conditions => { :name => name }).should == characters.size
+              story.characters.find(:all, :conditions => { :name => name }) == characters
+              mock(Story.connection).execute.never
+              # story.characters.count(:all, :conditions => { :name => name }).should == characters.size
+            end
           end
         end
       end

data/spec/cash/finders_spec.rb

@@ -369,6 +369,7 @@ module Cash
             @short2 = Short.create(:title => 'another title',
               :subtitle => 'subtitle')
             $memcache.flush_all
+            # debugger
             Short.find(:all, :conditions => { :subtitle => @short1.subtitle },
               :order => 'title')
           end
@@ -387,10 +388,9 @@ module Cash
               :order => 'title').map(&:id).should == [@short2.id, @short1.id]
           end
 
-          # it 'pulls multiple objects from the cache, not the database' do
-          #   mock(Story.connection).execute.never
-          #   Short.find(:all, :conditions => { :subtitle => @short1.subtitle },
-          #     :order => 'title').should_not be_empty
+          # it 'populates cache for each object' do
+            # Short.fetch("id/#{@short1.id}").should == [@short1]
+            # Short.fetch("id/#{@short2.id}").should == [@short2]
           # end
         end
 

data/spec/cash/lock_spec.rb

@@ -2,10 +2,12 @@ require "spec_helper"
 
 module Cash
   describe Lock do
+    let(:lock) { Cash::Lock.new($memcache) }
+    
     describe '#synchronize' do
       it "yields the block" do
         block_was_called = false
-        $lock.synchronize('lock_key') do
+        lock.synchronize('lock_key') do
           block_was_called = true
         end
         block_was_called.should == true
@@ -13,26 +15,26 @@ module Cash
 
       it "acquires the specified lock before the block is run" do
         $memcache.get("lock/lock_key").should == nil
-        $lock.synchronize('lock_key') do
+        lock.synchronize('lock_key') do
            $memcache.get("lock/lock_key").should_not == nil
          end
       end
 
       it "releases the lock after the block is run" do
         $memcache.get("lock/lock_key").should == nil
-        $lock.synchronize('lock_key') {}
+        lock.synchronize('lock_key') {}
         $memcache.get("lock/lock_key").should == nil
       end
 
       it "releases the lock even if the block raises" do
         $memcache.get("lock/lock_key").should == nil
-        $lock.synchronize('lock_key') { raise } rescue nil
+        lock.synchronize('lock_key') { raise } rescue nil
         $memcache.get("lock/lock_key").should == nil
       end
 
       it "does not block on recursive lock acquisition" do
-        $lock.synchronize('lock_key') do
-          lambda { $lock.synchronize('lock_key') {} }.should_not raise_error
+        lock.synchronize('lock_key') do
+          lambda { lock.synchronize('lock_key') {} }.should_not raise_error
         end
       end
     end
@@ -40,47 +42,51 @@ module Cash
     describe '#acquire_lock' do
       it "creates a lock at a given cache key" do
         $memcache.get("lock/lock_key").should == nil
-        $lock.acquire_lock("lock_key")
+        lock.acquire_lock("lock_key")
         $memcache.get("lock/lock_key").should_not == nil
       end
 
       describe 'when given a timeout for the lock' do
         it "correctly sets timeout on memcache entries" do
           mock($memcache).add('lock/lock_key', "#{Socket.gethostname} #{Process.pid}", timeout = 10) { true }
-          # $lock.acquire_lock('lock_key', timeout)
-          lambda { $lock.acquire_lock('lock_key', timeout, 1) }.should raise_error
+          # lock.acquire_lock('lock_key', timeout)
+          lambda { lock.acquire_lock('lock_key', timeout, 1) }.should raise_error(Cash::Lock::Error)
         end
       end
 
-      describe 'when to processes contend for a lock' do
+      describe 'when two processes contend for a lock' do
         it "prevents two processes from acquiring the same lock at the same time" do
-          $lock.acquire_lock('lock_key')
+          lock.acquire_lock('lock_key')
           as_another_process do
-            stub($lock).exponential_sleep
-            lambda { $lock.acquire_lock('lock_key') }.should raise_error
+            stub(lock).exponential_sleep
+            lambda { lock.acquire_lock('lock_key') }.should raise_error(Cash::Lock::Error)
           end
         end
         
         describe 'when given a number of times to retry' do
           it "retries specified number of times" do
-            $lock.acquire_lock('lock_key')
+            lock.acquire_lock('lock_key')
             as_another_process do
               mock($memcache).add("lock/lock_key", "#{Socket.gethostname} #{Process.pid}", timeout = 10) { false }.times(retries = 3)
-              stub($lock).exponential_sleep
-              lambda { $lock.acquire_lock('lock_key', timeout, retries) }.should raise_error
+              stub(lock).exponential_sleep
+              lambda { lock.acquire_lock('lock_key', timeout, retries) }.should raise_error(Cash::Lock::Error)
             end
           end
         end
         
         describe 'when given an initial wait' do
           it 'sleeps exponentially starting with the initial wait' do
-            stub($lock).sleep(initial_wait = 0.123)
-            stub($lock).sleep(2 * initial_wait)
-            stub($lock).sleep(4 * initial_wait)
-            stub($lock).sleep(8 * initial_wait)
-            $lock.acquire_lock('lock_key')
+            stub(lock).sleep(initial_wait = 0.123)
+            stub(lock).sleep(2 * initial_wait)
+            stub(lock).sleep(4 * initial_wait)
+            stub(lock).sleep(8 * initial_wait)
+            stub(lock).sleep(16 * initial_wait)
+            stub(lock).sleep(32 * initial_wait)
+            stub(lock).sleep(64 * initial_wait)
+            stub(lock).sleep(128 * initial_wait)
+            lock.acquire_lock('lock_key')
             as_another_process do
-              lambda { $lock.acquire_lock('lock_key', Lock::DEFAULT_EXPIRY, Lock::DEFAULT_RETRY, initial_wait) }.should raise_error
+              lambda { lock.acquire_lock('lock_key', Lock::DEFAULT_EXPIRY, Lock::DEFAULT_RETRY, initial_wait) }.should raise_error(Cash::Lock::Error)
             end            
           end
         end
@@ -98,9 +104,9 @@ module Cash
     describe '#release_lock' do
       it "deletes the lock for a given cache key" do
         $memcache.get("lock/lock_key").should == nil
-        $lock.acquire_lock("lock_key")
+        lock.acquire_lock("lock_key")
         $memcache.get("lock/lock_key").should_not == nil
-        $lock.release_lock("lock_key")
+        lock.release_lock("lock_key")
         $memcache.get("lock/lock_key").should == nil
       end
     end

data/spec/cash/marshal_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Marshal do
   describe '#load' do

data/spec/cash/transactional_spec.rb

@@ -2,8 +2,10 @@ require "spec_helper"
 
 module Cash
   describe Transactional do
+    let(:lock) { Cash::Lock.new($memcache) }
+    
     before do
-      @cache = Transactional.new($memcache, $lock)
+      @cache = Transactional.new($memcache, lock)
       @value = "stuff to be cached"
       @key   = "key"
     end
@@ -230,9 +232,9 @@ module Cash
 
       describe 'Lock Acquisition' do
         it "locks @keys to be written before writing to memcache and release them after" do
-          mock($lock).acquire_lock(@key)
+          mock(lock).acquire_lock(@key)
           mock($memcache).set(@key, @value)
-          mock($lock).release_lock(@key)
+          mock(lock).release_lock(@key)
 
           @cache.transaction do
             @cache.set(@key, @value)
@@ -240,8 +242,8 @@ module Cash
         end
 
         it "does not acquire locks on reads" do
-          mock($lock).acquire_lock.never
-          mock($lock).release_lock.never
+          mock(lock).acquire_lock.never
+          mock(lock).release_lock.never
 
           @cache.transaction do
             @cache.get(@key)
@@ -250,11 +252,11 @@ module Cash
 
         it "locks @keys in lexically sorted order" do
           keys = ['c', 'a', 'b']
-          keys.sort.inject(mock($lock)) do |mock, key|
+          keys.sort.inject(mock(lock)) do |mock, key|
             mock.acquire_lock(key).then
           end
           keys.each { |key| mock($memcache).set(key, @value) }
-          keys.each { |key| mock($lock).release_lock(key) }
+          keys.each { |key| mock(lock).release_lock(key) }
           @cache.transaction do
             @cache.set(keys[0], @value)
             @cache.set(keys[1], @value)
@@ -263,8 +265,8 @@ module Cash
         end
 
         it "releases locks even if memcache blows up" do
-          mock($lock).acquire_lock.with(@key)
-          mock($lock).release_lock.with(@key)
+          mock(lock).acquire_lock.with(@key)
+          mock(lock).release_lock.with(@key)
           stub($memcache).set(anything, anything) { raise }
           @cache.transaction do
             @cache.set(@key, @value)
@@ -414,8 +416,8 @@ module Cash
       end
 
       it "does not acquire locks if transaction is rolled back" do
-        mock($lock).acquire_lock.never
-        mock($lock).release_lock.never
+        mock(lock).acquire_lock.never
+        mock(lock).release_lock.never
 
         @cache.transaction do
           @cache.set(@key, value)
@@ -474,11 +476,11 @@ module Cash
 
       it "acquire locks in lexical order for all keys" do
         keys = ['c', 'a', 'b']
-        keys.sort.inject(mock($lock)) do |mock, key|
+        keys.sort.inject(mock(lock)) do |mock, key|
           mock.acquire_lock(key).then
         end
         keys.each { |key| mock($memcache).set(key, @value) }
-        keys.each { |key| mock($lock).release_lock(key) }
+        keys.each { |key| mock(lock).release_lock(key) }
         @cache.transaction do
           @cache.set(keys[0], @value)
           @cache.transaction do
@@ -504,8 +506,8 @@ module Cash
 
       describe 'Error Handling' do
         it "releases locks even if memcache blows up" do
-          mock($lock).acquire_lock(@key)
-          mock($lock).release_lock(@key)
+          mock(lock).acquire_lock(@key)
+          mock(lock).release_lock(@key)
           stub($memcache).set(anything, anything) { raise }
           @cache.transaction do
             @cache.transaction do
@@ -543,8 +545,8 @@ module Cash
         end
 
         it "not acquire locks if transaction is rolled back" do
-          mock($lock).acquire_lock.never
-          mock($lock).release_lock.never
+          mock(lock).acquire_lock.never
+          mock(lock).release_lock.never
 
           @cache.transaction do
             @cache.transaction do

data/spec/cash/without_caching_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Cash do
+  describe 'when disabled' do
+    before(:each) do
+      Cash.enabled = false
+      
+      mock($memcache).get.never
+      mock($memcache).add.never
+      mock($memcache).set.never
+    end
+      
+    after(:each) do
+      Cash.enabled = true
+    end
+  
+    it 'creates and looks up objects without using cache' do
+      story = Story.create!
+      Story.find(story.id).should == story
+    end
+    
+    it 'updates objects without using cache' do
+      story = Story.create!
+      story.title = 'test'
+      story.save!
+    end
+    
+    it 'should find using indexed condition without using cache' do
+      Story.find(:all, :conditions => {:title => 'x'})
+    end
+  end
+end

data/spec/cash/write_through_spec.rb

@@ -64,6 +64,13 @@ module Cash
             Story.get("title/").should == nil
           end
         end
+        
+        it 'should not remember instance variables' do
+          story = Story.new(:title => 'story')
+          story.instance_eval { @forgetme = "value" }
+          story.save!
+          Story.find(story.id).instance_variables.should_not include("@forgetme")
+        end
       end
 
       describe 'after update' do

data/spec/spec_helper.rb

@@ -1,13 +1,13 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift "#{dir}/../lib"
 
+require 'rubygems'
+require 'bundler'
+
 require File.join(dir, '../config/environment')
 require 'spec'
 require 'pp'
 require 'cache_money'
-#require 'memcache'
-require 'memcached'
-require 'memcached_wrapper'
 
 Spec::Runner.configure do |config|
   config.mock_with :rr
@@ -15,8 +15,32 @@ Spec::Runner.configure do |config|
     load File.join(dir, "../db/schema.rb")
 
     config = YAML.load(IO.read((File.expand_path(File.dirname(__FILE__) + "/../config/memcached.yml"))))['test']
-    $memcache = MemcachedWrapper.new(config["servers"].gsub(' ', '').split(','), config)
-    $lock = Cash::Lock.new($memcache)
+    
+    case ENV['ADAPTER']
+    when 'memcache_client'
+      # Test with MemCache client
+      require 'cash/adapter/memcache_client'
+      $memcache = Cash::Adapter::MemcacheClient.new(MemCache.new(config['servers']),
+        :default_ttl => 1.minute.to_i)
+      
+    when 'redis'
+      # Test with Redis client
+      require 'cash/adapter/redis'
+      require 'fakeredis'
+      $memcache = Cash::Adapter::Redis.new(FakeRedis::Redis.new(),
+        :default_ttl => 1.minute.to_i)
+    when 'mock'
+      # Test with Mock client
+      require 'cash/adapter/memcache_client'
+      require 'cash/mock'
+      $memcache = Cash::Adapter::MemcacheClient.new(Cash::Mock.new(),
+        :default_ttl => 1.minute.to_i)
+    else
+      require 'cash/adapter/memcached'
+      # Test with memcached client
+      $memcache = Cash::Adapter::Memcached.new(Memcached.new(config["servers"], config), 
+        :default_ttl => 1.minute.to_i)
+    end
   end
 
   config.before :each do
@@ -26,8 +50,10 @@ Spec::Runner.configure do |config|
   end
 
   config.before :suite do
+    Cash.configure :repository => $memcache, :adapter => false
+    
     ActiveRecord::Base.class_eval do
-      is_cached :repository => Cash::Transactional.new($memcache, $lock)
+      is_cached
     end
 
     Character = Class.new(ActiveRecord::Base)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ngmoco-cache-money
 version: !ruby/object:Gem::Version 
-  hash: 57
   prerelease: false
   segments: 
   - 0
   - 2
-  - 23
-  version: 0.2.23
+  - 24
+  - 2
+  version: 0.2.24.2
 platform: ruby
 authors: 
 - Nick Kallen
@@ -18,41 +18,149 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 -08:00
+date: 2012-05-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         - 2
         - 0
         version: 2.2.0
-  type: :runtime
+    - - <
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  requirement: *id001
   name: activerecord
   prerelease: false
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         - 2
         - 0
         version: 2.2.0
-  type: :runtime
+    - - <
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  requirement: *id002
   name: activesupport
   prerelease: false
-  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
+  name: rake
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 0
+        version: 0.10.0
+  requirement: *id004
+  name: ruby-debug
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  requirement: *id005
+  name: rspec
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
+  name: sqlite3-ruby
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id007
+  name: rr
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id008
+  name: memcached
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id009
+  name: memcache-client
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id010
+  name: fakeredis
+  prerelease: false
 description: Write-through and Read-through Cacheing for ActiveRecord
 email: teamplatform@ngmoco.com
 executables: []
@@ -68,9 +176,11 @@ files:
 - README
 - TODO
 - UNSUPPORTED_FEATURES
-- init.rb
 - lib/cache_money.rb
 - lib/cash/accessor.rb
+- lib/cash/adapter/memcache_client.rb
+- lib/cash/adapter/memcached.rb
+- lib/cash/adapter/redis.rb
 - lib/cash/buffered.rb
 - lib/cash/config.rb
 - lib/cash/fake.rb
@@ -87,62 +197,43 @@ files:
 - lib/cash/transactional.rb
 - lib/cash/util/array.rb
 - lib/cash/util/marshal.rb
+- lib/cash/version.rb
 - lib/cash/write_through.rb
 - lib/mem_cached_session_store.rb
 - lib/mem_cached_support_store.rb
-- lib/memcached_wrapper.rb
 - rails/init.rb
+- init.rb
 - LICENSE
 - README.markdown
-- config/environment.rb
-- config/memcached.yml
-- db/schema.rb
-- spec/cash/accessor_spec.rb
-- spec/cash/active_record_spec.rb
-- spec/cash/buffered_spec.rb
-- spec/cash/calculations_spec.rb
-- spec/cash/finders_spec.rb
-- spec/cash/local_buffer_spec.rb
-- spec/cash/local_spec.rb
-- spec/cash/lock_spec.rb
-- spec/cash/marshal_spec.rb
-- spec/cash/order_spec.rb
-- spec/cash/transactional_spec.rb
-- spec/cash/window_spec.rb
-- spec/cash/write_through_spec.rb
-- spec/memcached_wrapper_test.rb
-- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/ngmoco/cache-money
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
+  - - "="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 7
+      version: 1.3.7
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Write-through and Read-through Cacheing for ActiveRecord
@@ -162,6 +253,6 @@ test_files:
 - spec/cash/order_spec.rb
 - spec/cash/transactional_spec.rb
 - spec/cash/window_spec.rb
+- spec/cash/without_caching_spec.rb
 - spec/cash/write_through_spec.rb
-- spec/memcached_wrapper_test.rb
 - spec/spec_helper.rb