identity_cache 1.5.2 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25effde8c6f5f470a9e90f18a17b89ed2c12f4d3191e0c05110568acdcb2153c
-  data.tar.gz: ff299911448670f58000ca5f047d4a9bbd04fe00452392eb698232a40d244e74
+  metadata.gz: 8a7b8ac895d1bdef7695e310042d3699d5d9b279c12d538eb3a577b51cc27acd
+  data.tar.gz: a423c92964c108f8038202ac4ef996697023b39c2db445635d4365a7d81e19fb
 SHA512:
-  metadata.gz: 1b861f668ca23a245b16c6ac4d3a8a2b80d954386f67607bca8ce51507d7c3fcb8852d419e38e4c15f5999c8614fb7a5e2661d78687ea510b73f83d107a58c9e
-  data.tar.gz: dd2a1b9fa974aa139eb99b6e2bc718ee7725b15f54998a125bea2b552b4dfe7de537d9c216516ffb0419daecb40c762debff1c17fcbf973eb42b0344af7bb2ad
+  metadata.gz: 65487956cfd97f17abcf90bf6055283fe0b3840a5f01a82d69e570638c4f8cd10a75cda05a9b80c1eb0f6013d8f41a3f5b94a451417cd16c57e16b7ef4fa6081
+  data.tar.gz: aa8ec598d2854332aa7054be7c4af26ec7c85271f15cd26b9967a74493e5ec7f91e636369ff0f144699f0ab9f1c719477713c5f069b7379f224c1e67d0c7c561

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 1.5.4
+
+- Make `prefetch_associations` work as expected on associations that have been partially prefetched
+
+## 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.

data/lib/identity_cache/belongs_to_caching.rb

@@ -14,7 +14,7 @@ module IdentityCache
         ensure_base_model
 
         unless (reflection = reflect_on_association(association))
-          raise AssociationError, "Association named '#{association}' was not found on #{self.class}"
+          raise AssociationError, "Association named '#{association}' was not found on #{self}"
         end
 
         if reflection.scope

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
@@ -77,16 +77,20 @@ module IdentityCache
             end
           end
 
-          load_strategy.load_multi(
-            reflection.klass.cached_primary_index,
-            ids_to_owner_record.keys
-          ) do |associated_records_by_id|
-            associated_records_by_id.each do |id, associated_record|
-              owner_record = ids_to_owner_record.fetch(id)
-              write(owner_record, associated_record)
-            end
+          if ids_to_owner_record.any?
+            load_strategy.load_multi(
+              reflection.klass.cached_primary_index,
+              ids_to_owner_record.keys
+            ) do |associated_records_by_id|
+              associated_records_by_id.each do |id, associated_record|
+                owner_record = ids_to_owner_record.fetch(id)
+                write(owner_record, associated_record)
+              end
 
-            yield associated_records_by_id.values.compact
+              yield associated_records_by_id.values.compact
+            end
+          else
+            yield records.filter_map { |record| record.instance_variable_get(records_variable_name) }
           end
         end
       end

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/configuration_dsl.rb

@@ -143,7 +143,7 @@ module IdentityCache
 
       def check_association_for_caching(association)
         unless (association_reflection = reflect_on_association(association))
-          raise AssociationError, "Association named '#{association}' was not found on #{self.class}"
+          raise AssociationError, "Association named '#{association}' was not found on #{self}"
         end
         if association_reflection.options[:through]
           raise UnsupportedAssociationError, "caching through associations isn't supported"

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/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.2"
+  VERSION = "1.5.4"
   CACHE_VERSION = 8
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: identity_cache
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.4
 platform: ruby
 authors:
 - Camilo Lopez
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-15 00:00:00.000000000 Z
+date: 2024-02-20 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.22
+rubygems_version: 3.5.6
 signing_key: 
 specification_version: 4
 summary: IdentityCache lets you specify how you want to cache your model objects,