identity_cache 0.3.1 → 0.3.2

data/test/{prefetch_normalized_associations_test.rb → prefetch_associations_test.rb}

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class PrefetchNormalizedAssociationsTest < IdentityCache::TestCase
+class PrefetchAssociationsTest < IdentityCache::TestCase
   NAMESPACE = IdentityCache.cache_namespace
 
   def setup
@@ -14,10 +14,120 @@ class PrefetchNormalizedAssociationsTest < IdentityCache::TestCase
     @tenth_blob_key = "#{NAMESPACE}blob:Item:#{cache_hash("created_at:datetime,id:integer,item_id:integer,title:string,updated_at:datetime")}:10"
   end
 
+  def test_prefetch_associations_on_fetched_records
+    Item.send(:cache_belongs_to, :item)
+    john = Item.create!(:title => 'john')
+    jim = Item.create!(:title => 'jim')
+    @bob.update_column(:item_id, john.id)
+    @joe.update_column(:item_id, jim.id)
+    items = Item.fetch_multi(@bob.id, @joe.id, @fred.id)
+
+    spy = Spy.on(Item, :fetch_multi).and_call_through
+
+    Item.prefetch_associations(:item, items)
+
+    assert spy.calls.one?{ |call| call.args == [[john.id, jim.id]] }
+  end
+
+  def test_prefetch_associations_on_db_records
+    Item.send(:cache_has_many, :associated_records, :embed => true)
+    AssociatedRecord.send(:cache_has_many, :deeply_associated_records, :embed => :ids)
+
+    setup_has_many_children_and_grandchildren(@bob)
+
+    item = Item.find(@bob.id)
+
+    assert_no_queries do
+      assert_memcache_operations(1) do
+        Item.prefetch_associations(:associated_records, [item])
+      end
+      assert_memcache_operations(0) do
+        item.fetch_associated_records.each(&:fetch_deeply_associated_record_ids)
+      end
+      assert_memcache_operations(1) do
+        Item.prefetch_associations({associated_records: :deeply_associated_records}, [item])
+      end
+      assert_memcache_operations(0) do
+        item.fetch_associated_records.each(&:fetch_deeply_associated_records)
+      end
+    end
+  end
+
+  def test_prefetch_associations_without_using_cache
+    Item.send(:cache_has_many, :associated_records, :embed => true)
+
+    associated1 = @bob.associated_records.create!(name: 'foo')
+    associated2 = @joe.associated_records.create!(name: 'bar')
+    items = [@bob, @joe].map(&:reload)
+
+    Item.transaction do
+      assert_memcache_operations(0) do
+        assert_queries(1) do
+          Item.prefetch_associations(:associated_records, items)
+        end
+        assert_no_queries do
+          assert_equal [[associated1], [associated2]], items.map(&:fetch_associated_records)
+        end
+      end
+    end
+  end
+
+  def test_prefetch_associations_cached_belongs_to
+    Item.send(:cache_belongs_to, :item)
+    @bob.update_attributes!(item_id: @joe.id)
+    @joe.update_attributes!(item_id: @fred.id)
+    @bob.fetch_item
+    @joe.fetch_item
+    items = [@bob, @joe].map(&:reload)
+
+    assert_no_queries do
+      assert_memcache_operations(1) do
+        Item.prefetch_associations(:item, items)
+      end
+      assert_memcache_operations(0) do
+        items.each { |item| item.fetch_item }
+      end
+      assert_memcache_operations(0) do
+        Item.prefetch_associations(:item, items)
+      end
+    end
+  end
+
+  def test_prefetch_associations_with_nil_cached_belongs_to
+    Item.send(:cache_belongs_to, :item)
+    @bob.update_attributes!(item_id: 1234)
+    assert_equal nil, @bob.fetch_item
+
+    assert_no_queries do
+      assert_memcache_operations(0) do
+        Item.prefetch_associations(:item, [@bob])
+      end
+    end
+  end
+
+  def test_prefetch_associations_on_association
+    AssociatedRecord.send(:cache_has_many, :deeply_associated_records, embed: true)
+
+    setup_has_many_children_and_grandchildren(@bob)
+
+    associated_records = @bob.associated_records
+
+    assert_queries(1) do
+      assert_memcache_operations(1) do
+        AssociatedRecord.prefetch_associations(:deeply_associated_records, associated_records)
+      end
+    end
+    assert_no_queries do
+      assert_memcache_operations(0) do
+        associated_records.each(&:fetch_deeply_associated_records)
+      end
+    end
+  end
+
   def test_fetch_with_includes_option
     Item.send(:cache_belongs_to, :item)
     john = Item.create!(title: 'john')
-    @bob.update_column(:item_id, john)
+    @bob.update_column(:item_id, john.id)
 
     spy = Spy.on(Item, :fetch_multi).and_call_through
 
@@ -30,8 +140,8 @@ class PrefetchNormalizedAssociationsTest < IdentityCache::TestCase
     Item.send(:cache_belongs_to, :item)
     john = Item.create!(:title => 'john')
     jim = Item.create!(:title => 'jim')
-    @bob.update_column(:item_id, john)
-    @joe.update_column(:item_id, jim)
+    @bob.update_column(:item_id, john.id)
+    @joe.update_column(:item_id, jim.id)
 
     spy = Spy.on(Item, :fetch_multi).and_call_through
 
@@ -78,7 +188,6 @@ class PrefetchNormalizedAssociationsTest < IdentityCache::TestCase
   end
 
   def test_fetch_multi_batch_fetches_first_level_associations_who_dont_include_identity_cache
-    Item.send(:has_many, :not_cached_records)
     Item.send(:cache_has_many, :not_cached_records, :embed => true)
 
     @bob_child  = @bob.not_cached_records.create!(:name => "bob child")
@@ -96,7 +205,7 @@ class PrefetchNormalizedAssociationsTest < IdentityCache::TestCase
     Item.send(:cache_has_many, :associated_records, :embed => :ids)
     AssociatedRecord.send(:cache_has_many, :deeply_associated_records, :embed => :ids)
 
-    child_records, grandchildren = setup_has_many_children_and_grandchildren(@bob, @joe)
+    _child_records, grandchildren = setup_has_many_children_and_grandchildren(@bob, @joe)
 
     assert_memcache_operations(3) do
       @cached_bob, @cached_joe = Item.fetch_multi(@bob.id, @joe.id, :includes => {:associated_records => :deeply_associated_records})
@@ -151,7 +260,7 @@ class PrefetchNormalizedAssociationsTest < IdentityCache::TestCase
     Item.send(:cache_has_many, :associated_records, :embed => true)
     AssociatedRecord.send(:cache_has_many, :deeply_associated_records, :embed => :ids)
 
-    child_records, grandchildren = setup_has_many_children_and_grandchildren(@bob, @joe)
+    _child_records, grandchildren = setup_has_many_children_and_grandchildren(@bob, @joe)
 
     assert_memcache_operations(2) do
       @cached_bob, @cached_joe = Item.fetch_multi(@bob.id, @joe.id, :includes => {:associated_records => :deeply_associated_records})
@@ -200,7 +309,7 @@ class PrefetchNormalizedAssociationsTest < IdentityCache::TestCase
     Item.send(:cache_belongs_to, :item)
     Item.cache_index :title
     john = Item.create!(title: 'john')
-    @bob.update_column(:item_id, john)
+    @bob.update_column(:item_id, john.id)
 
     spy = Spy.on(Item, :fetch_multi).and_call_through
 
@@ -213,7 +322,7 @@ class PrefetchNormalizedAssociationsTest < IdentityCache::TestCase
     Item.send(:cache_belongs_to, :item)
     Item.cache_index :title, :unique => true
     john = Item.create!(title: 'john')
-    @bob.update_column(:item_id, john)
+    @bob.update_column(:item_id, john.id)
 
     spy = Spy.on(Item, :fetch_multi).and_call_through
 

data/test/recursive_denormalized_has_many_test.rb

@@ -61,7 +61,7 @@ class RecursiveDenormalizedHasManyTest < IdentityCache::TestCase
       # one for the mid level has_one association
       # one for the deep level level has_many on the mid level has_many association
       # one for the deep level level has_many on the mid level has_one association
-      record_from_cache_miss = Item.fetch(@record.id)
+      Item.fetch(@record.id)
     end
   end
 
@@ -88,6 +88,22 @@ class RecursiveDenormalizedHasManyTest < IdentityCache::TestCase
     @deeply_associated_record.save!
   end
 
+  def test_set_inverse_associations
+    DeeplyAssociatedRecord.cache_belongs_to :associated_record
+    AssociatedRecord.cache_belongs_to :item
+    Item.fetch(@record.id) # warm cache
+
+    item = Item.fetch(@record.id)
+
+    assert_queries(0) do
+      assert_memcache_operations(0) do
+        associated_record = item.fetch_associated_records.to_a.first
+        deeply_associated_record = associated_record.fetch_deeply_associated_records.first
+        assert_equal item.id, deeply_associated_record.fetch_associated_record.fetch_item.id
+      end
+    end
+  end
+
 end
 
 class RecursiveNormalizedHasManyTest < IdentityCache::TestCase
@@ -103,7 +119,7 @@ class RecursiveNormalizedHasManyTest < IdentityCache::TestCase
 
   def test_cache_repopulation_should_not_fetch_non_embedded_associations
     Item.any_instance.expects(:fetch_associated_records).never
-    record_from_cache_miss = Item.fetch(@record.id)
+    Item.fetch(@record.id) # cache miss
   end
 end
 

data/test/schema_change_test.rb

@@ -89,10 +89,12 @@ class SchemaChangeTest < IdentityCache::TestCase
 
     record = Item.fetch(@record.id)
 
+    teardown_models
+    setup_models
+
     Item.cache_has_many :polymorphic_records, :inverse_name => :owner, :embed => true
     read_new_schema
 
-    Item.expects(:resolve_cache_miss).returns(@record)
     record = Item.fetch(@record.id)
   end
 
@@ -103,7 +105,6 @@ class SchemaChangeTest < IdentityCache::TestCase
     Item.cache_has_many :polymorphic_records, :inverse_name => :owner, :embed => :ids
     read_new_schema
 
-    Item.expects(:resolve_cache_miss).returns(@record)
     record = Item.fetch(@record.id)
   end
 end

data/test/test_helper.rb

@@ -11,7 +11,7 @@ require 'active_support/cache/memcached_store'
 require File.dirname(__FILE__) + '/../lib/identity_cache'
 
 DatabaseConnection.setup
-ActiveSupport::Cache::Store.instrument = true
+ActiveSupport::Cache::Store.instrument = true if ActiveSupport.version < Gem::Version.new("4.2.0")
 
 # This patches AR::MemcacheStore to notify AS::Notifications upon read_multis like the rest of rails does
 class ActiveSupport::Cache::MemcachedStore
@@ -38,7 +38,9 @@ class IdentityCache::TestCase < Minitest::Test
     DatabaseConnection.create_tables
 
     IdentityCache.logger = Logger.new(nil)
-    IdentityCache.cache_backend = @backend = ActiveSupport::Cache::MemcachedStore.new("localhost:11211", :support_cas => true)
+
+    memcached_host = ENV['MEMCACHED_HOST'] || "127.0.0.1"
+    IdentityCache.cache_backend = @backend = ActiveSupport::Cache::MemcachedStore.new("#{memcached_host}:11211", :support_cas => true)
 
     setup_models
   end

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: identity_cache
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Camilo Lopez
 - Tom Burns
 - Harry Brundage
-- Dylan Smith
+- Dylan Thacker-Smith
 - Tobias Lutke
 - Arthur Neves
 - Francis Bogsanyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ar_transaction_changes
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: memcached
   requirement: !ruby/object:Gem::Requirement
@@ -186,23 +186,22 @@ dependencies:
         version: '0'
 description: Opt in read through ActiveRecord caching.
 email:
-- harry.brundage@shopify.com
+- gems@shopify.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.rails40
-- Gemfile.rails41
 - Gemfile.rails42
+- Gemfile.rails50
 - LICENSE
 - README.md
 - Rakefile
+- dev.yml
 - identity_cache.gemspec
 - lib/identity_cache.rb
 - lib/identity_cache/belongs_to_caching.rb
@@ -238,11 +237,12 @@ files:
 - test/helpers/update_serialization_format.rb
 - test/identity_cache_test.rb
 - test/index_cache_test.rb
+- test/memoized_attributes_test.rb
 - test/memoized_cache_proxy_test.rb
 - test/normalized_belongs_to_test.rb
 - test/normalized_has_many_test.rb
 - test/normalized_has_one_test.rb
-- test/prefetch_normalized_associations_test.rb
+- test/prefetch_associations_test.rb
 - test/readonly_test.rb
 - test/recursive_denormalized_has_many_test.rb
 - test/save_test.rb
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: IdentityCache lets you specify how you want to cache your model objects,
@@ -293,11 +293,12 @@ test_files:
 - test/helpers/update_serialization_format.rb
 - test/identity_cache_test.rb
 - test/index_cache_test.rb
+- test/memoized_attributes_test.rb
 - test/memoized_cache_proxy_test.rb
 - test/normalized_belongs_to_test.rb
 - test/normalized_has_many_test.rb
 - test/normalized_has_one_test.rb
-- test/prefetch_normalized_associations_test.rb
+- test/prefetch_associations_test.rb
 - test/readonly_test.rb
 - test/recursive_denormalized_has_many_test.rb
 - test/save_test.rb

data/.ruby-version

@@ -1 +0,0 @@
-2.2.2

data/Gemfile.rails40

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'activerecord', '~> 4.0.4'
-gem 'activesupport', '~> 4.0.4'
-gem 'mysql2', '~> 0.3.13'

data/Gemfile.rails41

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'activerecord', '~> 4.1.0'
-gem 'activesupport', '~> 4.1.0'
-gem 'mysql2', '~> 0.3.13'