identity_cache 0.0.7 → 0.1.0

data/test/index_cache_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class ExpirationTest < IdentityCache::TestCase
+class IndexCacheTest < IdentityCache::TestCase
   NAMESPACE = IdentityCache::CacheKeyGeneration::DEFAULT_NAMESPACE
 
   def setup
@@ -11,6 +11,26 @@ class ExpirationTest < IdentityCache::TestCase
     @cache_key = "#{NAMESPACE}index:Item:title:#{cache_hash(@record.title)}"
   end
 
+  def test_fetch_with_garbage_input_should_use_properly_typed_sql
+    Item.cache_index :title, :id
+
+    Item.connection.expects(:exec_query)
+      .with(regexp_matches(/ WHERE `items`\.`title` = 'garbage' AND `items`\.`id` = 0\z/i), anything)
+      .returns(ActiveRecord::Result.new([], []))
+
+    assert_equal [], Item.fetch_by_title_and_id('garbage', 'garbage')
+  end
+
+  def test_fetch_with_unique_adds_limit_clause
+    Item.cache_index :title, :id, :unique => true
+
+    Item.connection.expects(:exec_query)
+      .with(regexp_matches(/ LIMIT 1\Z/i), anything)
+      .returns(ActiveRecord::Result.new([], []))
+
+    assert_equal nil, Item.fetch_by_title_and_id('title', '2')
+  end
+
   def test_unique_index_caches_nil
     Item.cache_index :title, :unique => true
     assert_equal nil, Item.fetch_by_title('bob')

data/test/memoized_cache_proxy_test.rb

@@ -3,7 +3,7 @@ require "test_helper"
 class MemoizedCacheProxyTest < IdentityCache::TestCase
   def setup
     super
-    IdentityCache.cache_backend = Rails.cache
+    @backend = IdentityCache.cache.cache_backend
   end
 
   def test_changing_default_cache
@@ -13,7 +13,7 @@ class MemoizedCacheProxyTest < IdentityCache::TestCase
   end
 
   def test_read_should_short_circuit_on_memoized_values
-    Rails.cache.expects(:read).never
+    @backend.expects(:read).never
 
     IdentityCache.cache.with_memoization do
       IdentityCache.cache.write('foo', 'bar')
@@ -22,7 +22,7 @@ class MemoizedCacheProxyTest < IdentityCache::TestCase
   end
 
   def test_read_should_short_circuit_on_falsy_memoized_values
-    Rails.cache.expects(:read).never
+    @backend.expects(:read).never
 
     IdentityCache.cache.with_memoization do
       IdentityCache.cache.write('foo', nil)
@@ -33,7 +33,7 @@ class MemoizedCacheProxyTest < IdentityCache::TestCase
   end
 
   def test_read_should_try_memcached_on_not_memoized_values
-    Rails.cache.expects(:read).with('foo').returns('bar')
+    @backend.expects(:read).with('foo').returns('bar')
 
     IdentityCache.cache.with_memoization do
       assert_equal 'bar', IdentityCache.cache.read('foo')
@@ -41,9 +41,8 @@ class MemoizedCacheProxyTest < IdentityCache::TestCase
   end
 
   def test_write_should_memoize_values
-    Rails.cache.expects(:read).never
-    Rails.cache.expects(:write).with('foo', 'bar')
-
+    @backend.expects(:read).never
+    @backend.expects(:write).with('foo', 'bar')
 
     IdentityCache.cache.with_memoization do
       IdentityCache.cache.write('foo', 'bar')
@@ -76,7 +75,7 @@ class MemoizedCacheProxyTest < IdentityCache::TestCase
 
   def test_read_multi_with_partially_memoized_should_read_missing_keys_from_memcache
     IdentityCache.cache.write('foo', 'bar')
-    Rails.cache.write('fooz', 'baz')
+    @backend.write('fooz', 'baz')
 
     IdentityCache.cache.with_memoization do
       assert_equal({'foo' => 'bar', 'fooz' => 'baz'}, IdentityCache.cache.read_multi('foo', 'fooz'))
@@ -84,7 +83,7 @@ class MemoizedCacheProxyTest < IdentityCache::TestCase
   end
 
   def test_read_multi_with_blank_values_should_not_hit_the_cache_engine
-    Rails.cache.expects(:read_multi).never
+    @backend.expects(:read_multi).never
 
     IdentityCache.cache.with_memoization do
       IdentityCache.cache.write('foo', [])
@@ -98,13 +97,6 @@ class MemoizedCacheProxyTest < IdentityCache::TestCase
     IdentityCache.cache.with_memoization do
       IdentityCache.cache.write('foo', 'bar')
     end
-
-    assert_equal 'bar', Rails.cache.read('foo')
-  end
-
-  def test_set_backend_should_not_touch_rails
-    Rails.expects(:cache).never
-    IdentityCache.instance_variable_set(:@cache, nil)
-    IdentityCache.cache_backend = Rails::Cache.new
+    assert_equal 'bar', @backend.read('foo')
   end
 end

data/test/normalized_belongs_to_test.rb

@@ -10,6 +10,8 @@ class NormalizedBelongsToTest < IdentityCache::TestCase
     @parent_record.save
     @parent_record.reload
     @record = @parent_record.associated_records.first
+    # Reset association cache, so we remove the inverse of in memory reference
+    @record.association(:item).reset
   end
 
   def test_fetching_the_association_should_delegate_to_the_normal_association_fetcher_if_any_transactions_are_open

data/test/normalized_has_many_test.rb

@@ -3,7 +3,7 @@ require "test_helper"
 class NormalizedHasManyTest < IdentityCache::TestCase
   def setup
     super
-    Item.cache_has_many :associated_records, :embed => false
+    Item.cache_has_many :associated_records, :embed => :ids
 
     @record = Item.new(:title => 'foo')
     @record.not_cached_records << NotCachedRecord.new(:name => 'NoCache')
@@ -99,7 +99,7 @@ class NormalizedHasManyTest < IdentityCache::TestCase
 
   def test_saving_a_child_record_should_expire_the_new_and_old_parents_cache_blob
     @new_record = Item.create
-    @baz.item_id = @new_record.id
+    @baz.item = @new_record
 
     IdentityCache.cache.expects(:delete).with(@record.primary_cache_index_key).once
     IdentityCache.cache.expects(:delete).with(@new_record.primary_cache_index_key).once
@@ -135,9 +135,9 @@ class NormalizedHasManyTest < IdentityCache::TestCase
     assert_equal [@bar], @record.reload.fetch_associated_records
   end
 
-  def test_touching_a_child_record_should_expire_only_itself
+  def test_saving_a_child_record_should_expire_only_itself
     IdentityCache.cache.expects(:delete).with(@baz.primary_cache_index_key).once
-    @baz.touch
+    @baz.save!
   end
 
   def test_touching_child_with_touch_true_on_parent_expires_parent

data/test/recursive_denormalized_has_many_test.rb

@@ -94,7 +94,7 @@ class RecursiveNormalizedHasManyTest < IdentityCache::TestCase
   def setup
     super
     AssociatedRecord.cache_has_many :deeply_associated_records, :embed => true
-    Item.cache_has_many :associated_records, :embed => false
+    Item.cache_has_many :associated_records, :embed => :ids
 
     @record = Item.new(:title => 'foo')
     @record.save

data/test/schema_change_test.rb

@@ -83,7 +83,7 @@ class SchemaChangeTest < IdentityCache::TestCase
   end
 
   def test_embed_existing_cache_has_many
-    Item.cache_has_many :polymorphic_records, :inverse_name => :owner, :embed => false
+    Item.cache_has_many :polymorphic_records, :inverse_name => :owner, :embed => :ids
     read_new_schema
 
     record = Item.fetch(@record.id)
@@ -98,7 +98,7 @@ class SchemaChangeTest < IdentityCache::TestCase
   def test_add_non_embedded_cache_has_many
     record = Item.fetch(@record.id)
 
-    Item.cache_has_many :polymorphic_records, :inverse_name => :owner, :embed => false
+    Item.cache_has_many :polymorphic_records, :inverse_name => :owner, :embed => :ids
     read_new_schema
 
     Item.expects(:resolve_cache_miss).returns(@record)

data/test/test_helper.rb

@@ -1,11 +1,12 @@
+require 'logger'
 require 'minitest/autorun'
 require 'mocha/setup'
 require 'active_record'
-require 'memcached_store'
-require 'active_support/cache/memcached_store'
-require 'helpers/cache'
 require 'helpers/database_connection'
 require 'helpers/active_record_objects'
+require 'spy'
+require 'memcached_store'
+require 'active_support/cache/memcached_store'
 
 require File.dirname(__FILE__) + '/../lib/identity_cache'
 
@@ -38,6 +39,9 @@ class IdentityCache::TestCase < MiniTest::Unit::TestCase
     DatabaseConnection.drop_tables
     DatabaseConnection.create_tables
 
+    IdentityCache.logger = Logger.new(nil)
+    IdentityCache.cache_backend = ActiveSupport::Cache::MemcachedStore.new("localhost:#{$memcached_port}")
+
     setup_models
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: identity_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Camilo Lopez
@@ -13,22 +13,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ar_transaction_changes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -36,9 +36,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -46,9 +43,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: memcached_store
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +85,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.14.0
+- !ruby/object:Gem::Dependency
+  name: spy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cityhash
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +153,8 @@ files:
 - ".travis.yml"
 - CHANGELOG
 - Gemfile
-- Gemfile.rails4
+- Gemfile.rails41
+- Gemfile32
 - LICENSE
 - README.md
 - Rakefile
@@ -153,6 +162,7 @@ files:
 - lib/identity_cache.rb
 - lib/identity_cache/belongs_to_caching.rb
 - lib/identity_cache/cache_hash.rb
+- lib/identity_cache/cache_invalidation.rb
 - lib/identity_cache/cache_key_generation.rb
 - lib/identity_cache/configuration_dsl.rb
 - lib/identity_cache/memoized_cache_proxy.rb
@@ -166,6 +176,7 @@ files:
 - test/attribute_cache_test.rb
 - test/cache_fetch_includes_test.rb
 - test/cache_hash_test.rb
+- test/cache_invalidation_test.rb
 - test/denormalized_has_many_test.rb
 - test/denormalized_has_one_test.rb
 - test/fetch_multi_test.rb
@@ -173,7 +184,6 @@ files:
 - test/fetch_test.rb
 - test/fixtures/serialized_record
 - test/helpers/active_record_objects.rb
-- test/helpers/cache.rb
 - test/helpers/database_connection.rb
 - test/helpers/serialization_format.rb
 - test/helpers/update_serialization_format.rb
@@ -207,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: IdentityCache lets you specify how you want to cache your model objects,
@@ -218,6 +228,7 @@ test_files:
 - test/attribute_cache_test.rb
 - test/cache_fetch_includes_test.rb
 - test/cache_hash_test.rb
+- test/cache_invalidation_test.rb
 - test/denormalized_has_many_test.rb
 - test/denormalized_has_one_test.rb
 - test/fetch_multi_test.rb
@@ -225,7 +236,6 @@ test_files:
 - test/fetch_test.rb
 - test/fixtures/serialized_record
 - test/helpers/active_record_objects.rb
-- test/helpers/cache.rb
 - test/helpers/database_connection.rb
 - test/helpers/serialization_format.rb
 - test/helpers/update_serialization_format.rb
@@ -240,4 +250,3 @@ test_files:
 - test/schema_change_test.rb
 - test/serialization_format_change_test.rb
 - test/test_helper.rb
-has_rdoc: 

data/test/helpers/cache.rb

@@ -1,15 +0,0 @@
-require 'logger'
-
-module Rails
-
-  class Cache < ActiveSupport::Cache::MemcachedStore
-  end
-
-  def self.cache
-    @@cache ||= Cache.new("localhost:#{$memcached_port}")
-  end
-
-  def self.logger
-    @logger ||= Logger.new(nil)
-  end
-end