identity_cache 0.2.5 → 0.3.0

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

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class FetchMultiWithBatchedAssociationsTest < IdentityCache::TestCase
+class PrefetchNormalizedAssociationsTest < IdentityCache::TestCase
   NAMESPACE = IdentityCache.cache_namespace
 
   def setup
@@ -14,7 +14,19 @@ class FetchMultiWithBatchedAssociationsTest < 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_fetch_multi_with_includes_option_preloads_associations
+  def test_fetch_with_includes_option
+    Item.send(:cache_belongs_to, :item)
+    john = Item.create!(title: 'john')
+    @bob.update_column(:item_id, john)
+
+    spy = Spy.on(Item, :fetch_multi).and_call_through
+
+    assert_equal @bob, Item.fetch(@bob.id, includes: :item)
+
+    assert spy.calls.one?{ |call| call.args == [[john.id]] }
+  end
+
+  def test_fetch_multi_with_includes_option
     Item.send(:cache_belongs_to, :item)
     john = Item.create!(:title => 'john')
     jim = Item.create!(:title => 'jim')
@@ -23,7 +35,7 @@ class FetchMultiWithBatchedAssociationsTest < IdentityCache::TestCase
 
     spy = Spy.on(Item, :fetch_multi).and_call_through
 
-    items = Item.fetch_multi(@bob.id, @joe.id, @fred.id, :includes => :item)
+    assert_equal [@bob, @joe, @fred], Item.fetch_multi(@bob.id, @joe.id, @fred.id, :includes => :item)
 
     assert spy.calls.one?{ |call| call.args == [[john.id, jim.id]] }
   end
@@ -184,6 +196,32 @@ class FetchMultiWithBatchedAssociationsTest < IdentityCache::TestCase
     Item.send(:find_batch, [@bob, @joe, @fred].map(&:id).map(&:to_s))
   end
 
+  def test_fetch_by_index_with_includes_option
+    Item.send(:cache_belongs_to, :item)
+    Item.cache_index :title
+    john = Item.create!(title: 'john')
+    @bob.update_column(:item_id, john)
+
+    spy = Spy.on(Item, :fetch_multi).and_call_through
+
+    assert_equal [@bob], Item.fetch_by_title('bob', includes: :item)
+
+    assert spy.calls.one?{ |call| call.args == [[john.id]] }
+  end
+
+  def test_fetch_by_unique_index_with_includes_option
+    Item.send(:cache_belongs_to, :item)
+    Item.cache_index :title, :unique => true
+    john = Item.create!(title: 'john')
+    @bob.update_column(:item_id, john)
+
+    spy = Spy.on(Item, :fetch_multi).and_call_through
+
+    assert_equal @bob, Item.fetch_by_title('bob', includes: :item)
+
+    assert spy.calls.one?{ |call| call.args == [[john.id]] }
+  end
+
   private
 
   def setup_has_many_children_and_grandchildren(*parents)

data/test/save_test.rb

@@ -16,21 +16,21 @@ class SaveTest < IdentityCache::TestCase
     @record = Item.new
     @record.title = 'bob'
 
-    expect_cache_delete("#{NAMESPACE}index:Item:id/title:#{cache_hash('2/bob')}")
-    expect_cache_delete("#{NAMESPACE}index:Item:title:#{cache_hash('bob')}")
+    expect_cache_delete("#{NAMESPACE}attr:Item:id:id/title:#{cache_hash('2/bob')}")
+    expect_cache_delete("#{NAMESPACE}attr:Item:id:title:#{cache_hash('bob')}")
     expect_cache_delete("#{NAMESPACE}blob:Item:#{cache_hash("created_at:datetime,id:integer,item_id:integer,title:string,updated_at:datetime")}:2").once
     @record.save
   end
 
   def test_update
     # Regular flow, write index id, write index id/tile, delete data blob since Record has changed
-    expect_cache_delete("#{NAMESPACE}index:Item:id/title:#{cache_hash('1/fred')}")
-    expect_cache_delete("#{NAMESPACE}index:Item:title:#{cache_hash('fred')}")
+    expect_cache_delete("#{NAMESPACE}attr:Item:id:id/title:#{cache_hash('1/fred')}")
+    expect_cache_delete("#{NAMESPACE}attr:Item:id:title:#{cache_hash('fred')}")
     expect_cache_delete(@blob_key)
 
     # Delete index id, delete index id/title
-    expect_cache_delete("#{NAMESPACE}index:Item:id/title:#{cache_hash('1/bob')}")
-    expect_cache_delete("#{NAMESPACE}index:Item:title:#{cache_hash('bob')}")
+    expect_cache_delete("#{NAMESPACE}attr:Item:id:id/title:#{cache_hash('1/bob')}")
+    expect_cache_delete("#{NAMESPACE}attr:Item:id:title:#{cache_hash('bob')}")
 
     @record.title = 'fred'
     @record.save
@@ -38,8 +38,8 @@ class SaveTest < IdentityCache::TestCase
 
   def test_destroy
     # Regular flow: delete data blob, delete index id, delete index id/tile
-    expect_cache_delete("#{NAMESPACE}index:Item:id/title:#{cache_hash('1/bob')}")
-    expect_cache_delete("#{NAMESPACE}index:Item:title:#{cache_hash('bob')}")
+    expect_cache_delete("#{NAMESPACE}attr:Item:id:id/title:#{cache_hash('1/bob')}")
+    expect_cache_delete("#{NAMESPACE}attr:Item:id:title:#{cache_hash('bob')}")
     expect_cache_delete(@blob_key)
 
     @record.destroy
@@ -47,8 +47,8 @@ class SaveTest < IdentityCache::TestCase
 
   def test_destroy_with_changed_attributes
     # Make sure to delete the old cache index key, since the new title never ended up in an index
-    expect_cache_delete("#{NAMESPACE}index:Item:id/title:#{cache_hash('1/bob')}")
-    expect_cache_delete("#{NAMESPACE}index:Item:title:#{cache_hash('bob')}")
+    expect_cache_delete("#{NAMESPACE}attr:Item:id:id/title:#{cache_hash('1/bob')}")
+    expect_cache_delete("#{NAMESPACE}attr:Item:id:title:#{cache_hash('bob')}")
     expect_cache_delete(@blob_key)
 
     @record.title = 'fred'
@@ -57,16 +57,16 @@ class SaveTest < IdentityCache::TestCase
 
   def test_touch_will_expire_the_caches
     # Regular flow: delete data blob, delete index id, delete index id/tile
-    expect_cache_delete("#{NAMESPACE}index:Item:id/title:#{cache_hash('1/bob')}")
-    expect_cache_delete("#{NAMESPACE}index:Item:title:#{cache_hash('bob')}")
+    expect_cache_delete("#{NAMESPACE}attr:Item:id:id/title:#{cache_hash('1/bob')}")
+    expect_cache_delete("#{NAMESPACE}attr:Item:id:title:#{cache_hash('bob')}")
     expect_cache_delete(@blob_key)
 
     @record.touch
   end
 
   def test_expire_cache_works_in_a_transaction
-    expect_cache_delete("#{NAMESPACE}index:Item:id/title:#{cache_hash('1/bob')}")
-    expect_cache_delete("#{NAMESPACE}index:Item:title:#{cache_hash('bob')}")
+    expect_cache_delete("#{NAMESPACE}attr:Item:id:id/title:#{cache_hash('1/bob')}")
+    expect_cache_delete("#{NAMESPACE}attr:Item:id:title:#{cache_hash('bob')}")
     expect_cache_delete(@blob_key)
 
     ActiveRecord::Base.transaction do

data/test/schema_change_test.rb

@@ -83,6 +83,7 @@ class SchemaChangeTest < IdentityCache::TestCase
   end
 
   def test_embed_existing_cache_has_many
+    PolymorphicRecord.include(IdentityCache)
     Item.cache_has_many :polymorphic_records, :inverse_name => :owner, :embed => :ids
     read_new_schema
 
@@ -96,6 +97,7 @@ class SchemaChangeTest < IdentityCache::TestCase
   end
 
   def test_add_non_embedded_cache_has_many
+    PolymorphicRecord.include(IdentityCache)
     record = Item.fetch(@record.id)
 
     Item.cache_has_many :polymorphic_records, :inverse_name => :owner, :embed => :ids

data/test/test_helper.rb

@@ -59,7 +59,7 @@ class IdentityCache::TestCase < Minitest::Test
   end
 
   def assert_not_nil(*args)
-    assert *args
+    assert(*args)
   end
 
   def assert_queries(num = 1)
@@ -67,7 +67,7 @@ class IdentityCache::TestCase < Minitest::Test
     subscriber = ActiveSupport::Notifications.subscribe('sql.active_record', counter)
     exception = false
     yield
-  rescue => e
+  rescue
     exception = true
     raise
   ensure
@@ -80,7 +80,7 @@ class IdentityCache::TestCase < Minitest::Test
     subscriber = ActiveSupport::Notifications.subscribe(/cache_.*\.active_support/, counter)
     exception = false
     yield
-  rescue => e
+  rescue
     exception = true
     raise
   ensure
@@ -101,7 +101,7 @@ end
 
 class SQLCounter
   cattr_accessor :ignored_sql
-  self.ignored_sql = [/^PRAGMA (?!(table_info))/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/]
+  self.ignored_sql = [/^PRAGMA (?!(table_info))/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/, /^SHOW /]
 
   # FIXME: this needs to be refactored so specific database can add their own
   # ignored SQL.  This ignored SQL is for Oracle.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: identity_cache
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Camilo Lopez
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2016-01-20 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: '3.2'
+        version: 4.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.0.4
 - !ruby/object:Gem::Dependency
   name: memcached
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +197,6 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.rails32
 - Gemfile.rails40
 - Gemfile.rails41
 - Gemfile.rails42
@@ -230,9 +229,9 @@ files:
 - test/denormalized_has_many_test.rb
 - test/denormalized_has_one_test.rb
 - test/fetch_multi_test.rb
-- test/fetch_multi_with_batched_associations_test.rb
 - test/fetch_test.rb
-- test/fixtures/serialized_record
+- test/fixtures/serialized_record.mysql2
+- test/fixtures/serialized_record.postgresql
 - test/helpers/active_record_objects.rb
 - test/helpers/database_connection.rb
 - test/helpers/serialization_format.rb
@@ -243,6 +242,7 @@ files:
 - 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/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.2.0
 signing_key: 
 specification_version: 4
 summary: IdentityCache lets you specify how you want to cache your model objects,
@@ -284,9 +284,9 @@ test_files:
 - test/denormalized_has_many_test.rb
 - test/denormalized_has_one_test.rb
 - test/fetch_multi_test.rb
-- test/fetch_multi_with_batched_associations_test.rb
 - test/fetch_test.rb
-- test/fixtures/serialized_record
+- test/fixtures/serialized_record.mysql2
+- test/fixtures/serialized_record.postgresql
 - test/helpers/active_record_objects.rb
 - test/helpers/database_connection.rb
 - test/helpers/serialization_format.rb
@@ -297,6 +297,7 @@ test_files:
 - 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/readonly_test.rb
 - test/recursive_denormalized_has_many_test.rb
 - test/save_test.rb

data/Gemfile.rails32

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'activerecord', '~> 3.2.16'
-gem 'activesupport', '~> 3.2.16'