identity_cache 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 953d802de951edde24a15f5d1c073bebdaebe477
-  data.tar.gz: 8a329ec724a1b9a9dba8435a47de9df84c7e8715
+  metadata.gz: e1ebdc0142ea9597f6053f9d07ef1c43bfbd5434
+  data.tar.gz: 4aacba1f352ff488dc13cf4eadb136369c5cb767
 SHA512:
-  metadata.gz: 89fe603c343ad1fcd8c92d1bd12a7375a52b82a12c4c016256e1940ddbd0a1d66d1248b033640b661b8d30f21020cc29b5b5600a9a36591b5e03cac9238d0ca9
-  data.tar.gz: 252d8f5066cc625fb799d490c3a4e5736283e82adf8817179c35697dbbb76ac07d28feeda32ad6e1d84db2440f820277578f3b9ea253997d64f3b1735e5fa74c
+  metadata.gz: a46686540738897cc446dda713c3d99dcb8c7fd513351894d7ac3ae3ee43c46baac0648eb0876cb1db1e5b2bfacf1ee2e8586b3aeb055d6126479794fd797dfa
+  data.tar.gz: 40af995454fc23abaddcab686808a62972758d586f6a4514314a0b30730fac71accbfd83cd671a9e90553dc5daa45a30ab162c21680e76b9691697e9bb8f7707

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # IdentityCache changelog
 
+#### 0.4.0
+
+- Return an array from fetched association to prevent chaining. Up to now, a relation was returned by default. (#287)
+
 #### 0.3.2
 
 - Deprecate returning non read-only records when cache is used. Set IdentityCache.fetch_readonly_records to true to avoid this. (#282)

data/dev.yml

@@ -52,3 +52,6 @@ railgun:
     postgresql: 5432
     memcached: 11211
 
+packages:
+  - git@github.com:Shopify/dev-shopify.git
+

data/lib/identity_cache.rb

@@ -42,22 +42,17 @@ module IdentityCache
 
     version = Gem::Version.new(IdentityCache::VERSION)
 
-    # fetch_#{association} for a cache_has_many association returns a relation
-    # when fetch_returns_relation is set to true and an array when set to false.
-    mattr_accessor :fetch_returns_relation
-    self.fetch_returns_relation = version < Gem::Version.new("0.4")
-
     # Inverse active record associations are set when loading embedded
     # cache_has_many associations from the cache when never_set_inverse_association
     # is false. When set to true, it will only set the inverse cached association.
     mattr_accessor :never_set_inverse_association
-    self.never_set_inverse_association = version >= Gem::Version.new("0.4")
+    self.never_set_inverse_association = version >= Gem::Version.new("0.5")
 
     # Fetched records are not read-only and this could sometimes prevent IDC from
     # reflecting what's truly in the database when fetch_read_only_records is false.
     # When set to true, it will only return read-only records when cache is used.
     mattr_accessor :fetch_read_only_records
-    self.fetch_read_only_records = version >= Gem::Version.new("0.4")
+    self.fetch_read_only_records = version >= Gem::Version.new("0.5")
 
     def included(base) #:nodoc:
       raise AlreadyIncludedError if base.include?(IdentityCache::ConfigurationDSL)
@@ -150,14 +145,6 @@ module IdentityCache
       result
     end
 
-    def with_fetch_returns_relation(value = true)
-      previous_value = self.fetch_returns_relation
-      self.fetch_returns_relation = value
-      yield
-    ensure
-      self.fetch_returns_relation = previous_value
-    end
-
     def with_never_set_inverse_association(value = true)
       old_value = self.never_set_inverse_association
       self.never_set_inverse_association = value

data/lib/identity_cache/configuration_dsl.rb

@@ -236,11 +236,7 @@ module IdentityCache
             if IdentityCache.should_use_cache? && !#{association}.loaded?
               @#{options[:records_variable_name]} ||= #{options[:association_reflection].klass}.fetch_multi(#{options[:cached_ids_name]})
             else
-              if IdentityCache.fetch_returns_relation
-                #{association}
-              else
-                #{association}.to_a
-              end
+              #{association}.to_a
             end
           end
 

data/lib/identity_cache/query_api.rb

@@ -435,7 +435,7 @@ module IdentityCache
       else
         send(association_name.to_sym)
       end
-      assoc = assoc.to_ary if assoc.respond_to?(:to_ary) && !IdentityCache.fetch_returns_relation
+      assoc = assoc.to_ary if assoc.respond_to?(:to_ary)
       assoc
     end
 

data/lib/identity_cache/version.rb

@@ -1,4 +1,4 @@
 module IdentityCache
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
   CACHE_VERSION = 6
 end

data/test/denormalized_has_many_test.rb

@@ -12,12 +12,9 @@ class DenormalizedHasManyTest < IdentityCache::TestCase
     @record.reload
   end
 
-  def test_uncached_record_from_the_db_should_come_back_with_association_array_when_fetch_returns_array
-    IdentityCache.with_fetch_returns_relation(false) do    
-      assert_equal IdentityCache.fetch_returns_relation, false
-      record_from_db = Item.find(@record.id)
-      assert_equal Array, record_from_db.fetch_associated_records.class
-    end
+  def test_uncached_record_from_the_db_should_come_back_with_association_array
+    record_from_db = Item.find(@record.id)
+    assert_equal Array, record_from_db.fetch_associated_records.class
   end
 
   def test_uncached_record_from_the_db_will_use_normal_association
@@ -30,15 +27,12 @@ class DenormalizedHasManyTest < IdentityCache::TestCase
     assert_equal expected, record_from_db.fetch_associated_records
   end
 
-  def test_on_cache_hit_record_should_come_back_with_cached_association_array_when_fetch_returns_array
-    IdentityCache.with_fetch_returns_relation(false) do  
-      assert_equal IdentityCache.fetch_returns_relation, false
-      Item.fetch(@record.id) # warm cache
+  def test_on_cache_hit_record_should_come_back_with_cached_association_array
+    Item.fetch(@record.id) # warm cache
 
-      record_from_cache_hit = Item.fetch(@record.id)
-      assert_equal @record, record_from_cache_hit
-      assert_equal Array, record_from_cache_hit.fetch_associated_records.class
-    end
+    record_from_cache_hit = Item.fetch(@record.id)
+    assert_equal @record, record_from_cache_hit
+    assert_equal Array, record_from_cache_hit.fetch_associated_records.class
   end
 
   def test_on_cache_hit_record_should_come_back_with_cached_association
@@ -113,12 +107,10 @@ class DenormalizedHasManyTest < IdentityCache::TestCase
     child.save!
   end
 
-  def test_fetch_association_does_not_allow_chaining_when_fetch_returns_array
-    IdentityCache.with_fetch_returns_relation(false) do
-      check = proc { assert_equal false, Item.fetch(@record.id).fetch_associated_records.respond_to?(:where) }
-      2.times { check.call } # for miss and hit
-      Item.transaction { check.call }
-    end
+  def test_fetch_association_does_not_allow_chaining
+    check = proc { assert_equal false, Item.fetch(@record.id).fetch_associated_records.respond_to?(:where) }
+    2.times { check.call } # for miss and hit
+    Item.transaction { check.call }
   end
 
   def test_never_set_inverse_association_on_cache_hit

data/test/normalized_has_many_test.rb

@@ -197,12 +197,10 @@ class NormalizedHasManyTest < IdentityCache::TestCase
     @not_cached.save!
   end
 
-  def test_fetch_association_does_not_allow_chaining_when_fetch_returns_array
-    IdentityCache.with_fetch_returns_relation(false) do
-      check = proc { assert_equal false, Item.fetch(@record.id).fetch_associated_records.respond_to?(:where) }
-      2.times { check.call } # for miss and hit
-      Item.transaction { check.call }
-    end
+  def test_fetch_association_does_not_allow_chaining
+    check = proc { assert_equal false, Item.fetch(@record.id).fetch_associated_records.respond_to?(:where) }
+    2.times { check.call } # for miss and hit
+    Item.transaction { check.call }
   end
 
   def test_returned_records_should_be_readonly_on_cache_hit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: identity_cache
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Camilo Lopez
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ar_transaction_changes