identity_cache 0.1.0 → 0.2.0

data/test/fetch_multi_test.rb

@@ -25,7 +25,7 @@ class FetchMultiTest < IdentityCache::TestCase
     cache_response[bob_blob_key] = cache_response_for(@bob)
     cache_response[joe_blob_key] = cache_response_for(@joe)
     cache_response[fred_blob_key] = cache_response_for(@fred)
-    IdentityCache.cache.expects(:read_multi).with(bob_blob_key, joe_blob_key, fred_blob_key).returns(cache_response)
+    IdentityCache.cache.expects(:fetch_multi).with(bob_blob_key, joe_blob_key, fred_blob_key).returns(cache_response)
     assert_equal [@bob, @joe, @fred], Item.fetch_multi(@bob.id, @joe.id, @fred.id)
   end
 
@@ -34,7 +34,7 @@ class FetchMultiTest < IdentityCache::TestCase
     cache_response[@bob_blob_key] = cache_response_for(@bob)
     cache_response[@joe_blob_key] = cache_response_for(@joe)
     cache_response[@fred_blob_key] = cache_response_for(@fred)
-    IdentityCache.cache.expects(:read_multi).with(@bob_blob_key, @joe_blob_key, @fred_blob_key).returns(cache_response)
+    IdentityCache.cache.expects(:fetch_multi).with(@bob_blob_key, @joe_blob_key, @fred_blob_key).returns(cache_response)
     assert_equal [@bob, @joe, @fred], Item.fetch_multi(@bob.id, @joe.id, @fred.id)
   end
 
@@ -43,8 +43,9 @@ class FetchMultiTest < IdentityCache::TestCase
     cache_response[@bob_blob_key] = nil
     cache_response[@joe_blob_key] = nil
     cache_response[@fred_blob_key] = nil
-    IdentityCache.cache.expects(:read_multi).with(@bob_blob_key, @joe_blob_key, @fred_blob_key).returns(cache_response)
+    fetch_multi = fetch_multi_stub(cache_response)
     assert_equal [@bob, @joe, @fred], Item.fetch_multi(@bob.id, @joe.id, @fred.id)
+    assert fetch_multi.has_been_called_with?(@bob_blob_key, @joe_blob_key, @fred_blob_key)
   end
 
   def test_fetch_multi_with_mixed_hits_and_misses
@@ -52,8 +53,9 @@ class FetchMultiTest < IdentityCache::TestCase
     cache_response[@bob_blob_key] = cache_response_for(@bob)
     cache_response[@joe_blob_key] = nil
     cache_response[@fred_blob_key] = cache_response_for(@fred)
-    IdentityCache.cache.expects(:read_multi).with(@bob_blob_key, @joe_blob_key, @fred_blob_key).returns(cache_response)
+    fetch_multi = fetch_multi_stub(cache_response)
     assert_equal [@bob, @joe, @fred], Item.fetch_multi(@bob.id, @joe.id, @fred.id)
+    assert fetch_multi.has_been_called_with?(@bob_blob_key, @joe_blob_key, @fred_blob_key)
   end
 
   def test_fetch_multi_with_mixed_hits_and_misses_and_responses_in_the_wrong_order
@@ -61,22 +63,25 @@ class FetchMultiTest < IdentityCache::TestCase
     cache_response[@bob_blob_key] = nil
     cache_response[@joe_blob_key] = nil
     cache_response[@fred_blob_key] = cache_response_for(@fred)
-    IdentityCache.cache.expects(:read_multi).with(@bob_blob_key, @fred_blob_key, @joe_blob_key).returns(cache_response)
+    fetch_multi = fetch_multi_stub(cache_response)
     assert_equal [@bob, @fred, @joe], Item.fetch_multi(@bob.id, @fred.id, @joe.id)
+    assert fetch_multi.has_been_called_with?(@bob_blob_key, @fred_blob_key, @joe_blob_key)
   end
 
   def test_fetch_multi_with_mixed_hits_and_misses_and_non_existant_keys_1
     populate_only_fred
 
-    IdentityCache.cache.expects(:read_multi).with(@tenth_blob_key, @bob_blob_key, @joe_blob_key, @fred_blob_key).returns(@cache_response)
+    fetch_multi = fetch_multi_stub(@cache_response)
     assert_equal [@bob, @joe, @fred], Item.fetch_multi(10, @bob.id, @joe.id, @fred.id)
+    assert fetch_multi.has_been_called_with?(@tenth_blob_key, @bob_blob_key, @joe_blob_key, @fred_blob_key)
   end
 
   def test_fetch_multi_with_mixed_hits_and_misses_and_non_existant_keys_2
     populate_only_fred
 
-    IdentityCache.cache.expects(:read_multi).with(@fred_blob_key, @bob_blob_key, @tenth_blob_key, @joe_blob_key).returns(@cache_response)
+    fetch_multi = fetch_multi_stub(@cache_response)
     assert_equal [@fred, @bob, @joe], Item.fetch_multi(@fred.id, @bob.id, 10, @joe.id)
+    assert fetch_multi.has_been_called_with?(@fred_blob_key, @bob_blob_key, @tenth_blob_key, @joe_blob_key)
   end
 
 
@@ -84,9 +89,9 @@ class FetchMultiTest < IdentityCache::TestCase
     cache_result = {1 => IdentityCache::CACHED_NIL, 2 => IdentityCache::CACHED_NIL}
     fetch_result = {1 => nil, 2 => nil}
 
-    IdentityCache.cache.expects(:read_multi).with(1,2).times(2).returns({1 => nil, 2 => nil}, cache_result)
-    IdentityCache.cache.expects(:write).with(1, IdentityCache::CACHED_NIL).once
-    IdentityCache.cache.expects(:write).with(2, IdentityCache::CACHED_NIL).once
+    fetcher.expects(:cas_multi).with([1, 2]).twice.returns(nil, cache_result)
+    fetcher.expects(:add).with(1, IdentityCache::CACHED_NIL).once
+    fetcher.expects(:add).with(2, IdentityCache::CACHED_NIL).once
 
     results = IdentityCache.fetch_multi(1,2) do |keys|
       [nil, nil]
@@ -103,7 +108,7 @@ class FetchMultiTest < IdentityCache::TestCase
   def test_fetch_multi_works_with_blanks
     cache_result = {1 => false, 2 => '   '}
 
-    IdentityCache.cache.expects(:read_multi).with(1,2).returns(cache_result)
+    fetcher.expects(:fetch_multi).with([1,2]).returns(cache_result)
 
     results = IdentityCache.fetch_multi(1,2) do |keys|
       flunk "Contents should have been fetched from cache successfully"
@@ -118,7 +123,7 @@ class FetchMultiTest < IdentityCache::TestCase
 
   def test_fetch_multi_with_open_transactions_hits_the_database
     Item.connection.expects(:open_transactions).at_least_once.returns(1)
-    IdentityCache.cache.expects(:read_multi).never
+    fetcher.expects(:fetch_multi).never
     assert_equal [@bob, @joe, @fred], Item.fetch_multi(@bob.id, @joe.id, @fred.id)
   end
 
@@ -165,15 +170,15 @@ class FetchMultiTest < IdentityCache::TestCase
     cache_response[@joe_blob_key] = cache_response_for(@joe)
 
     with_batch_size 1 do
-      IdentityCache.cache.expects(:read_multi).with(@bob_blob_key).returns(cache_response).once
-      IdentityCache.cache.expects(:read_multi).with(@joe_blob_key).returns(cache_response).once
+      fetcher.expects(:fetch_multi).with([@bob_blob_key]).returns(cache_response).once
+      fetcher.expects(:fetch_multi).with([@joe_blob_key]).returns(cache_response).once
       assert_equal [@bob, @joe], Item.fetch_multi(@bob.id, @joe.id)
     end
   end
 
   def test_fetch_multi_max_stack_level
     cache_response = { @fred_blob_key => cache_response_for(@fred) }
-    IdentityCache.cache.stubs(:read_multi).returns(cache_response)
+    fetcher.stubs(:fetch_multi).returns(cache_response)
     assert_nothing_raised { Item.fetch_multi([@fred.id] * 200_000) }
   end
 
@@ -182,6 +187,18 @@ class FetchMultiTest < IdentityCache::TestCase
     assert_equal [fixture], KeyedRecord.fetch_multi(123, 456)
   end
 
+  def test_fetch_multi_after_expiring_a_record
+    Item.fetch_multi(@joe.id, @fred.id)
+    @bob.send(:expire_cache)
+    assert_equal IdentityCache::DELETED, backend.read(@bob.primary_cache_index_key)
+
+    add = Spy.on(IdentityCache.cache.cache_fetcher, :add).and_call_through
+
+    assert_equal [@bob, @joe, @fred], Item.fetch_multi(@bob.id, @joe.id, @fred.id)
+    refute add.has_been_called?
+    assert_equal cache_response_for(Item.find(@bob.id)), backend.read(@bob.primary_cache_index_key)
+  end
+
   private
 
   def populate_only_fred
@@ -207,4 +224,11 @@ class FetchMultiTest < IdentityCache::TestCase
     IdentityCache.send(:remove_const, :BATCH_SIZE)
     IdentityCache.const_set(:BATCH_SIZE, previous_batch_size)
   end
+
+  def fetch_multi_stub(cache_response)
+    Spy.on(IdentityCache.cache, :fetch_multi).and_return do |*args, &block|
+      nil_keys = cache_response.select {|_, v| v.nil? }.keys
+      cache_response.merge(Hash[nil_keys.zip(block.call(nil_keys))])
+    end
+  end
 end

data/test/fetch_test.rb

@@ -26,7 +26,7 @@ class FetchTest < IdentityCache::TestCase
   end
 
   def test_fetch_cache_hit
-    IdentityCache.cache.expects(:read).with(@blob_key).returns(@cached_value)
+    IdentityCache.cache.expects(:fetch).with(@blob_key).returns(@cached_value)
 
     assert_equal @record, Item.fetch(1)
   end
@@ -36,7 +36,7 @@ class FetchTest < IdentityCache::TestCase
     IdentityCache.cache_namespace = proc { |model| "#{model.table_name}:#{old_ns}" }
 
     new_blob_key = "items:#{@blob_key}"
-    IdentityCache.cache.expects(:read).with(new_blob_key).returns(@cached_value)
+    IdentityCache.cache.expects(:fetch).with(new_blob_key).returns(@cached_value)
 
     assert_equal @record, Item.fetch(1)
   ensure
@@ -44,32 +44,36 @@ class FetchTest < IdentityCache::TestCase
   end
 
   def test_exists_with_identity_cache_when_cache_hit
-    IdentityCache.cache.expects(:read).with(@blob_key).returns(@cached_value)
+    IdentityCache.cache.expects(:fetch).with(@blob_key).returns(@cached_value)
 
     assert Item.exists_with_identity_cache?(1)
   end
 
   def test_exists_with_identity_cache_when_cache_miss_and_in_db
-    IdentityCache.cache.expects(:read).with(@blob_key).returns(nil)
+    fetch = Spy.on(IdentityCache.cache, :fetch).and_call_through
     Item.expects(:resolve_cache_miss).with(1).once.returns(@record)
 
     assert Item.exists_with_identity_cache?(1)
+    assert fetch.has_been_called_with?(@blob_key)
   end
 
   def test_exists_with_identity_cache_when_cache_miss_and_not_in_db
-    IdentityCache.cache.expects(:read).with(@blob_key).returns(nil)
+    fetch = Spy.on(IdentityCache.cache, :fetch).and_call_through
     Item.expects(:resolve_cache_miss).with(1).once.returns(nil)
 
     assert !Item.exists_with_identity_cache?(1)
+    assert fetch.has_been_called_with?(@blob_key)
   end
 
   def test_fetch_miss
     Item.expects(:resolve_cache_miss).with(1).once.returns(@record)
 
-    IdentityCache.cache.expects(:read).with(@blob_key).returns(nil)
-    IdentityCache.cache.expects(:write).with(@blob_key, @cached_value)
+    results = []
+    fetch = Spy.on(IdentityCache.cache, :fetch).and_return {|_, &block| block.call.tap {|result| results << result}}
 
     assert_equal @record, Item.fetch(1)
+    assert fetch.has_been_called_with?(@blob_key)
+    assert_equal [@cached_value], results
   end
 
   def test_fetch_miss_with_non_id_primary_key
@@ -78,16 +82,45 @@ class FetchTest < IdentityCache::TestCase
     assert_equal fixture, KeyedRecord.fetch(hashed_key)
   end
 
+  def test_fetch_conflict
+    resolve_cache_miss = Spy.on(Item, :resolve_cache_miss).and_return do
+      @record.send(:expire_cache)
+      @record
+    end
+    add = Spy.on(fetcher, :add).and_call_through
+
+    assert_equal @record, Item.fetch(1)
+    assert resolve_cache_miss.has_been_called_with?(1)
+    assert add.has_been_called_with?(@blob_key, @cached_value)
+    assert_equal IdentityCache::DELETED, backend.read(@record.primary_cache_index_key)
+  end
+
+  def test_fetch_conflict_after_delete
+    @record.send(:expire_cache)
+    assert_equal IdentityCache::DELETED, backend.read(@record.primary_cache_index_key)
+
+    resolve_cache_miss = Spy.on(Item, :resolve_cache_miss).and_return do
+      @record.send(:expire_cache)
+      @record
+    end
+    add = Spy.on(IdentityCache.cache.cache_fetcher, :add).and_call_through
+
+    assert_equal @record, Item.fetch(1)
+    assert resolve_cache_miss.has_been_called_with?(1)
+    refute add.has_been_called?
+    assert_equal IdentityCache::DELETED, backend.read(@record.primary_cache_index_key)
+  end
+
   def test_fetch_by_id_not_found_should_return_nil
     nonexistent_record_id = 10
-    IdentityCache.cache.expects(:write).with(@blob_key + '0', IdentityCache::CACHED_NIL)
+    fetcher.expects(:add).with(@blob_key + '0', IdentityCache::CACHED_NIL)
 
     assert_equal nil, Item.fetch_by_id(nonexistent_record_id)
   end
 
   def test_fetch_not_found_should_raise
     nonexistent_record_id = 10
-    IdentityCache.cache.expects(:write).with(@blob_key + '0', IdentityCache::CACHED_NIL)
+    fetcher.expects(:add).with(@blob_key + '0', IdentityCache::CACHED_NIL)
 
     assert_raises(ActiveRecord::RecordNotFound) { Item.fetch(nonexistent_record_id) }
   end
@@ -96,44 +129,51 @@ class FetchTest < IdentityCache::TestCase
     key = @record.primary_cache_index_key
 
     assert_equal nil, Item.fetch_by_id(@record.id)
-    assert_equal IdentityCache::CACHED_NIL, IdentityCache.cache.read(key)
+    assert_equal IdentityCache::CACHED_NIL, backend.read(key)
 
     @record.save!
-    assert_nil IdentityCache.cache.read(key)
+    assert_equal IdentityCache::DELETED, backend.read(key)
   end
 
   def test_fetch_by_title_hit
-    # Read record with title bob
-    IdentityCache.cache.expects(:read).with(@index_key).returns(nil)
+    values = []
+    fetch = Spy.on(IdentityCache.cache, :fetch).and_return do |key, &block|
+      case key
+      # Read record with title bob
+      when @index_key then block.call.tap {|val| values << val}
+      # got id, do memcache lookup on that, hit -> done
+      when @blob_key then @cached_value
+      end
+    end
 
-    # - not found, use sql, SELECT id FROM records WHERE title = '...' LIMIT 1"
+    # Id not found, use sql, SELECT id FROM records WHERE title = '...' LIMIT 1"
     Item.connection.expects(:exec_query).returns(ActiveRecord::Result.new(['id'], [[1]]))
 
-    # cache sql result
-    IdentityCache.cache.expects(:write).with(@index_key, 1)
-
-    # got id, do memcache lookup on that, hit -> done
-    IdentityCache.cache.expects(:read).with(@blob_key).returns(@cached_value)
-
     assert_equal @record, Item.fetch_by_title('bob')
+    assert_equal [1], values
+    assert fetch.has_been_called_with?(@index_key)
+    assert fetch.has_been_called_with?(@blob_key)
   end
 
   def test_fetch_by_title_cache_namespace
     Item.send(:include, SwitchNamespace)
-    IdentityCache.cache.expects(:read).with("ns:#{@index_key}").returns(1)
-    IdentityCache.cache.expects(:read).with("ns:#{@blob_key}").returns(@cached_value)
+    IdentityCache.cache.expects(:fetch).with("ns:#{@index_key}").returns(1)
+    IdentityCache.cache.expects(:fetch).with("ns:#{@blob_key}").returns(@cached_value)
 
     assert_equal @record, Item.fetch_by_title('bob')
   end
 
   def test_fetch_by_title_stores_idcnil
     Item.connection.expects(:exec_query).once.returns(ActiveRecord::Result.new([], []))
-    IdentityCache.cache.expects(:write).with(@index_key, IdentityCache::CACHED_NIL)
-    IdentityCache.cache.expects(:read).with(@index_key).times(3).returns(nil, IdentityCache::CACHED_NIL, IdentityCache::CACHED_NIL)
+    add = Spy.on(fetcher, :add).and_call_through
+    fetch = Spy.on(fetcher, :fetch).and_call_through
     assert_equal nil, Item.fetch_by_title('bob') # exec_query => nil
 
     assert_equal nil, Item.fetch_by_title('bob') # returns cached nil
     assert_equal nil, Item.fetch_by_title('bob') # returns cached nil
+
+    assert add.has_been_called_with?(@index_key, IdentityCache::CACHED_NIL)
+    assert_equal 3, fetch.calls.length
   end
 
   def test_fetch_by_bang_method
@@ -144,8 +184,8 @@ class FetchTest < IdentityCache::TestCase
   end
 
   def test_fetch_does_not_communicate_to_cache_with_nil_id
-    IdentityCache.cache.expects(:read).never
-    IdentityCache.cache.expects(:write).never
+    fetcher.expects(:fetch).never
+    fetcher.expects(:add).never
     assert_raises(ActiveRecord::RecordNotFound) { Item.fetch(nil) }
   end
 end

data/test/helpers/update_serialization_format.rb

@@ -1,20 +1,16 @@
 $LOAD_PATH.unshift File.expand_path("../../../lib", __FILE__)
 
+require 'logger'
 require 'active_record'
 require 'memcached_store'
+require 'active_support/cache/memcached_store'
 require_relative 'serialization_format'
-require_relative 'cache'
 require_relative 'database_connection'
 require_relative 'active_record_objects'
 require 'identity_cache'
 
-if ENV['BOXEN_HOME'].present?
-  $memcached_port = 21211
-  $mysql_port = 13306
-else
-  $memcached_port = 11211
-  $mysql_port = 3306
-end
+$memcached_port = 11211
+$mysql_port = 3306
 
 include SerializationFormat
 include ActiveRecordObjects
@@ -22,6 +18,8 @@ include ActiveRecordObjects
 DatabaseConnection.setup
 DatabaseConnection.drop_tables
 DatabaseConnection.create_tables
+IdentityCache.logger = Logger.new(nil)
+IdentityCache.cache_backend = ActiveSupport::Cache::MemcachedStore.new("localhost:#{$memcached_port}", :support_cas => true)
 setup_models
 File.open(serialized_record_file, 'w') {|file| serialize(serialized_record, file) }
 puts "Serialized record to #{serialized_record_file}"

data/test/index_cache_test.rb

@@ -34,21 +34,21 @@ class IndexCacheTest < IdentityCache::TestCase
   def test_unique_index_caches_nil
     Item.cache_index :title, :unique => true
     assert_equal nil, Item.fetch_by_title('bob')
-    assert_equal IdentityCache::CACHED_NIL, IdentityCache.cache.read(@cache_key)
+    assert_equal IdentityCache::CACHED_NIL, backend.read(@cache_key)
   end
 
   def test_unique_index_expired_by_new_record
     Item.cache_index :title, :unique => true
     IdentityCache.cache.write(@cache_key, IdentityCache::CACHED_NIL)
     @record.save!
-    assert_equal nil, IdentityCache.cache.read(@cache_key)
+    assert_equal IdentityCache::DELETED, backend.read(@cache_key)
   end
 
   def test_unique_index_filled_on_fetch_by
     Item.cache_index :title, :unique => true
     @record.save!
     assert_equal @record, Item.fetch_by_title('bob')
-    assert_equal @record.id, IdentityCache.cache.read(@cache_key)
+    assert_equal @record.id, backend.read(@cache_key)
   end
 
   def test_unique_index_expired_by_updated_record
@@ -60,28 +60,28 @@ class IndexCacheTest < IdentityCache::TestCase
     new_cache_key = "#{NAMESPACE}index:Item:title:#{cache_hash(@record.title)}"
     IdentityCache.cache.write(new_cache_key, IdentityCache::CACHED_NIL)
     @record.save!
-    assert_equal nil, IdentityCache.cache.read(@cache_key)
-    assert_equal nil, IdentityCache.cache.read(new_cache_key)
+    assert_equal IdentityCache::DELETED, backend.read(@cache_key)
+    assert_equal IdentityCache::DELETED, backend.read(new_cache_key)
   end
 
   def test_non_unique_index_caches_empty_result
     Item.cache_index :title
     assert_equal [], Item.fetch_by_title('bob')
-    assert_equal [], IdentityCache.cache.read(@cache_key)
+    assert_equal [], backend.read(@cache_key)
   end
 
   def test_non_unique_index_expired_by_new_record
     Item.cache_index :title
     IdentityCache.cache.write(@cache_key, [])
     @record.save!
-    assert_equal nil, IdentityCache.cache.read(@cache_key)
+    assert_equal IdentityCache::DELETED, backend.read(@cache_key)
   end
 
   def test_non_unique_index_filled_on_fetch_by
     Item.cache_index :title
     @record.save!
     assert_equal [@record], Item.fetch_by_title('bob')
-    assert_equal [@record.id], IdentityCache.cache.read(@cache_key)
+    assert_equal [@record.id], backend.read(@cache_key)
   end
 
   def test_non_unique_index_fetches_multiple_records
@@ -90,7 +90,7 @@ class IndexCacheTest < IdentityCache::TestCase
     record2 = Item.create(:id => 2, :title => 'bob')
 
     assert_equal [@record, record2], Item.fetch_by_title('bob')
-    assert_equal [1, 2], IdentityCache.cache.read(@cache_key)
+    assert_equal [1, 2], backend.read(@cache_key)
   end
 
   def test_non_unique_index_expired_by_updating_record
@@ -102,8 +102,8 @@ class IndexCacheTest < IdentityCache::TestCase
     new_cache_key = "#{NAMESPACE}index:Item:title:#{cache_hash(@record.title)}"
     IdentityCache.cache.write(new_cache_key, [])
     @record.save!
-    assert_equal nil, IdentityCache.cache.read(@cache_key)
-    assert_equal nil, IdentityCache.cache.read(new_cache_key)
+    assert_equal IdentityCache::DELETED, backend.read(@cache_key)
+    assert_equal IdentityCache::DELETED, backend.read(new_cache_key)
   end
 
   def test_non_unique_index_expired_by_destroying_record
@@ -111,7 +111,7 @@ class IndexCacheTest < IdentityCache::TestCase
     @record.save!
     IdentityCache.cache.write(@cache_key, [@record.id])
     @record.destroy
-    assert_equal nil, IdentityCache.cache.read(@cache_key)
+    assert_equal IdentityCache::DELETED, backend.read(@cache_key)
   end
 
   def test_set_table_name_cache_fetch
@@ -119,6 +119,6 @@ class IndexCacheTest < IdentityCache::TestCase
     Item.table_name = 'items2'
     @record.save!
     assert_equal [@record], Item.fetch_by_title('bob')
-    assert_equal [@record.id], IdentityCache.cache.read(@cache_key)
+    assert_equal [@record.id], backend.read(@cache_key)
   end
 end

data/test/memoized_cache_proxy_test.rb

@@ -1,95 +1,91 @@
 require "test_helper"
 
 class MemoizedCacheProxyTest < IdentityCache::TestCase
-  def setup
-    super
-    @backend = IdentityCache.cache.cache_backend
-  end
-
   def test_changing_default_cache
     IdentityCache.cache_backend = ActiveSupport::Cache::MemoryStore.new
     IdentityCache.cache.write('foo', 'bar')
-    assert_equal 'bar', IdentityCache.cache.read('foo')
+    assert_raises(NoMethodError) { IdentityCache.cache.fetch('foo') }
   end
 
-  def test_read_should_short_circuit_on_memoized_values
-    @backend.expects(:read).never
+  def test_fetch_should_short_circuit_on_memoized_values
+    fetcher.expects(:fetch).never
 
     IdentityCache.cache.with_memoization do
       IdentityCache.cache.write('foo', 'bar')
-      assert_equal 'bar', IdentityCache.cache.read('foo')
+      assert_equal 'bar', IdentityCache.cache.fetch('foo')
     end
   end
 
-  def test_read_should_short_circuit_on_falsy_memoized_values
-    @backend.expects(:read).never
+  def test_fetch_should_short_circuit_on_falsy_memoized_values
+    fetcher.expects(:fetch).never
 
     IdentityCache.cache.with_memoization do
       IdentityCache.cache.write('foo', nil)
-      assert_equal nil, IdentityCache.cache.read('foo')
+      assert_equal nil, IdentityCache.cache.fetch('foo')
       IdentityCache.cache.write('bar', false)
-      assert_equal false, IdentityCache.cache.read('bar')
+      assert_equal false, IdentityCache.cache.fetch('bar')
     end
   end
 
-  def test_read_should_try_memcached_on_not_memoized_values
-    @backend.expects(:read).with('foo').returns('bar')
+  def test_fetch_should_try_memcached_on_not_memoized_values
+    fetcher.expects(:fetch).with('foo').returns('bar')
 
     IdentityCache.cache.with_memoization do
-      assert_equal 'bar', IdentityCache.cache.read('foo')
+      assert_equal 'bar', IdentityCache.cache.fetch('foo')
     end
   end
 
   def test_write_should_memoize_values
-    @backend.expects(:read).never
-    @backend.expects(:write).with('foo', 'bar')
+    fetcher.expects(:fetch).never
+    fetcher.expects(:write).with('foo', 'bar')
 
     IdentityCache.cache.with_memoization do
       IdentityCache.cache.write('foo', 'bar')
-      assert_equal 'bar', IdentityCache.cache.read('foo')
+      assert_equal 'bar', IdentityCache.cache.fetch('foo')
     end
   end
 
-  def test_read_should_memoize_values
-    IdentityCache.cache_backend = backend = ActiveSupport::Cache::MemoryStore.new
+  def test_fetch_should_memoize_values
     backend.write('foo', 'bar')
 
     IdentityCache.cache.with_memoization do
-      assert_equal 'bar', IdentityCache.cache.read('foo')
+      assert_equal 'bar', IdentityCache.cache.fetch('foo')
       backend.delete('foo')
-      assert_equal 'bar', IdentityCache.cache.read('foo')
+      assert_equal 'bar', IdentityCache.cache.fetch('foo')
     end
   end
 
-  def test_read_multi_should_memoize_values
-    IdentityCache.cache_backend = backend = ActiveSupport::Cache::MemoryStore.new
+  def test_fetch_multi_should_memoize_values
+    expected_hash = {'foo' => 'bar', 'fooz' => IdentityCache::CACHED_NIL}
+
     backend.write('foo', 'bar')
 
     IdentityCache.cache.with_memoization do
-      assert_equal({'foo' => 'bar'}, IdentityCache.cache.read_multi('foo', 'fooz'))
+      assert_equal(expected_hash, IdentityCache.cache.fetch_multi('foo', 'fooz') {|_| [IdentityCache::CACHED_NIL] })
+      assert_equal(expected_hash, IdentityCache.cache.memoized_key_values)
       backend.delete('foo')
       backend.write('fooz', 'baz')
-      assert_equal({'foo' => 'bar'}, IdentityCache.cache.read_multi('foo', 'fooz'))
+      assert_equal(expected_hash, IdentityCache.cache.fetch_multi('foo', 'fooz'))
     end
   end
 
-  def test_read_multi_with_partially_memoized_should_read_missing_keys_from_memcache
+  def test_fetch_multi_with_partially_memoized_should_read_missing_keys_from_memcache
     IdentityCache.cache.write('foo', 'bar')
     @backend.write('fooz', 'baz')
 
     IdentityCache.cache.with_memoization do
-      assert_equal({'foo' => 'bar', 'fooz' => 'baz'}, IdentityCache.cache.read_multi('foo', 'fooz'))
+      assert_equal({'foo' => 'bar', 'fooz' => 'baz'}, IdentityCache.cache.fetch_multi('foo', 'fooz'))
     end
   end
 
-  def test_read_multi_with_blank_values_should_not_hit_the_cache_engine
-    @backend.expects(:read_multi).never
+  def test_fetch_multi_with_blank_values_should_not_hit_the_cache_engine
+    @backend.expects(:fetch_multi).never
 
     IdentityCache.cache.with_memoization do
       IdentityCache.cache.write('foo', [])
       IdentityCache.cache.write('bar', false)
       IdentityCache.cache.write('baz', {})
-      assert_equal({'foo' => [], 'bar' => false, 'baz' => {}}, IdentityCache.cache.read_multi('foo', 'bar', 'baz'))
+      assert_equal({'foo' => [], 'bar' => false, 'baz' => {}}, IdentityCache.cache.fetch_multi('foo', 'bar', 'baz'))
     end
   end
 
@@ -97,6 +93,6 @@ class MemoizedCacheProxyTest < IdentityCache::TestCase
     IdentityCache.cache.with_memoization do
       IdentityCache.cache.write('foo', 'bar')
     end
-    assert_equal 'bar', @backend.read('foo')
+    assert_equal 'bar', @backend.fetch('foo')
   end
 end

data/test/test_helper.rb

@@ -4,19 +4,14 @@ require 'mocha/setup'
 require 'active_record'
 require 'helpers/database_connection'
 require 'helpers/active_record_objects'
-require 'spy'
+require 'spy/integration'
 require 'memcached_store'
 require 'active_support/cache/memcached_store'
 
 require File.dirname(__FILE__) + '/../lib/identity_cache'
 
-if ENV['BOXEN_HOME'].present?
-  $memcached_port = 21211
-  $mysql_port = 13306
-else
-  $memcached_port = 11211
-  $mysql_port = 3306
-end
+$memcached_port = 11211
+$mysql_port = 3306
 
 DatabaseConnection.setup
 ActiveSupport::Cache::Store.instrument = true
@@ -34,13 +29,15 @@ end
 
 class IdentityCache::TestCase < MiniTest::Unit::TestCase
   include ActiveRecordObjects
+  attr_reader :backend, :fetcher
 
   def setup
     DatabaseConnection.drop_tables
     DatabaseConnection.create_tables
 
     IdentityCache.logger = Logger.new(nil)
-    IdentityCache.cache_backend = ActiveSupport::Cache::MemcachedStore.new("localhost:#{$memcached_port}")
+    IdentityCache.cache_backend = @backend = ActiveSupport::Cache::MemcachedStore.new("localhost:#{$memcached_port}", :support_cas => true)
+    @fetcher = IdentityCache.cache.cache_fetcher
 
     setup_models
   end
@@ -129,6 +126,6 @@ class CacheCounter
   end
 
   def call(name, start, finish, message_id, values)
-    self.log << (values[:keys].try(:join, ', ') || values[:key])
+    self.log << "#{name} #{(values[:keys].try(:join, ', ') || values[:key])}"
   end
 end

data.tar.gz.sig

@@ -0,0 +1 @@
+�W�~k�#��V�����ѻ?en`��g�t\˦������̃b�!�;��m�+���:F���".A�v��ex�R��S�$�=�����u�!�-�)Ie�^������[h0˨}.Q���>���]#