identity_cache 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74ac4689e3399b1aa302326508b6098665ced3f516637901e87c0a3e12005680
-  data.tar.gz: e4e5a009cd8820ba6110a750de6069d3f4735673f22111a09a8e86d4f7a6fd85
+  metadata.gz: def26128f16258d40ae0aab05bff51da07f3e6290d7742562a968cb061b4e4fa
+  data.tar.gz: 5422730f52bed62f919d697c393fc2ead2de6b59edff35f6f6d02f032322c0a9
 SHA512:
-  metadata.gz: 8bbe844d4a663b8de0ae1d5231687c3113a13d6922287516d70db5a0dcc11556f3e0529c9353566c06edb6dbeff77cf3f675607440dbe5f266f44c2c72f49fee
-  data.tar.gz: 447b2c17d61f17012f7100bbee16e063adfc0d9957a4eae0a2b117f7b81a7f5b6083fdc6ecc53bddb7a4204317acbd1a17cc04c3a95f40916df7a16995060fe0
+  metadata.gz: 373cb5c7745fa34fd3b512a34ef8646fe3405082f2c174bdc23538827e024180a0275717a9ca7b3c82dd4dbb8ef1847d107a65ccecc5cb253a8608ab68507a60
+  data.tar.gz: d7764abbbeaee3b3d48f04d1c9ff2309a18a7eb7fbc3b4a5a2e868a3444ff8e9e2d81776a6f0e9d2d68814fa938de7dce35ab65c8538d7ac313f05bc86f28381

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 1.5.3
+
+- No longer call `should_use_cache?` on embedded/prefetched associations when reading values
+
+## 1.5.2
+
+- Add missing `should_use_cache?` to `fetch_multi` methods.
+
 ## 1.5.1
 
 - Fix parent cache invalidation for custom foreign key associations

data/lib/identity_cache/cache_fetcher.rb

@@ -65,9 +65,13 @@ module IdentityCache
     end
 
     def fetch_multi(keys, &block)
-      results = cas_multi(keys, &block)
-      results = add_multi(keys, &block) if results.nil?
-      results
+      if IdentityCache.should_use_cache?
+        results = cas_multi(keys, &block)
+        results = add_multi(keys, &block) if results.nil?
+        results
+      else
+        {}
+      end
     end
 
     def fetch(key, fill_lock_duration: nil, lock_wait_tries: 2, &block)

data/lib/identity_cache/cached/belongs_to.rb

@@ -9,7 +9,7 @@ module IdentityCache
         reflection.active_record.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
           def #{cached_accessor_name}
             association_klass = association(:#{name}).klass
-            if association_klass.should_use_cache? && #{reflection.foreign_key}.present? && !association(:#{name}).loaded?
+            if (loaded_by_idc? || association_klass.should_use_cache?) && #{reflection.foreign_key}.present? && !association(:#{name}).loaded?
               if defined?(#{records_variable_name})
                 #{records_variable_name}
               else

data/lib/identity_cache/cached/primary_index.rb

@@ -54,7 +54,10 @@ module IdentityCache
 
       def load_one_from_db(id)
         record = build_query(id).take
-        model.send(:setup_embedded_associations_on_miss, [record]) if record
+        if record
+          model.send(:setup_embedded_associations_on_miss, [record])
+          record.send(:mark_as_loaded_by_idc)
+        end
         record
       end
 
@@ -63,6 +66,7 @@ module IdentityCache
 
         records = build_query(ids).to_a
         model.send(:setup_embedded_associations_on_miss, records)
+        records.each { |record| record.send(:mark_as_loaded_by_idc) }
         records.index_by(&:id)
       end
 

data/lib/identity_cache/cached/recursive/association.rb

@@ -25,7 +25,7 @@ module IdentityCache
         def read(record)
           assoc = record.association(name)
 
-          if assoc.klass.should_use_cache? && !assoc.loaded? && assoc.target.blank?
+          if (record.send(:loaded_by_idc?) || assoc.klass.should_use_cache?) && !assoc.loaded? && assoc.target.blank?
             if record.instance_variable_defined?(records_variable_name)
               record.instance_variable_get(records_variable_name)
             elsif record.instance_variable_defined?(dehydrated_variable_name)

data/lib/identity_cache/cached/reference/has_many.rb

@@ -22,7 +22,7 @@ module IdentityCache
 
             def #{cached_accessor_name}
               assoc = association(:#{name})
-              if assoc.klass.should_use_cache? && !assoc.loaded? && assoc.target.blank?
+              if (loaded_by_idc? || assoc.klass.should_use_cache?) && !assoc.loaded? && assoc.target.blank?
                 #{records_variable_name} ||= #{reflection.class_name}.fetch_multi(#{cached_ids_name})
               else
                 #{name}.to_a

data/lib/identity_cache/encoder.rb

@@ -69,6 +69,7 @@ module IdentityCache
 
       def record_from_coder(coder, klass) # :nodoc:
         record = klass.instantiate(coder[:attributes].dup)
+        record.send(:mark_as_loaded_by_idc)
 
         if coder.key?(:associations)
           coder[:associations].each do |name, value|

data/lib/identity_cache/fallback_fetcher.rb

@@ -21,7 +21,11 @@ module IdentityCache
     end
 
     def fetch_multi(keys)
-      results = @cache_backend.read_multi(*keys)
+      results = if IdentityCache.should_use_cache?
+        @cache_backend.read_multi(*keys)
+      else
+        {}
+      end
       missed_keys = keys - results.keys
       unless missed_keys.empty?
         replacement_results = yield missed_keys

data/lib/identity_cache/should_use_cache.rb

@@ -9,5 +9,15 @@ module IdentityCache
         IdentityCache.should_use_cache?
       end
     end
+
+    private
+
+    def mark_as_loaded_by_idc
+      @loaded_by_idc = true
+    end
+
+    def loaded_by_idc?
+      defined?(@loaded_by_idc)
+    end
   end
 end

data/lib/identity_cache/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module IdentityCache
-  VERSION = "1.5.1"
+  VERSION = "1.5.3"
   CACHE_VERSION = 8
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: identity_cache
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Camilo Lopez
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-04 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.4
 signing_key: 
 specification_version: 4
 summary: IdentityCache lets you specify how you want to cache your model objects,