goldiloader 5.1.0 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b14210a0559e4703e779410d7381cd84f4e25d808107ea4558bff158320ad66
-  data.tar.gz: 74bd3fc10220916fe12e8394731f0e4846ae157bd24922ca434f83800ee56cfc
+  metadata.gz: 7ef809faf0ae768be18614302b3095863c0dce6ad5bdead11429a8968f39fef8
+  data.tar.gz: 7f4343a5a6065412c374c86c101dae7ed794b48bdfa8b5ff1765c7f9e2445c5f
 SHA512:
-  metadata.gz: b8c6f697034dab771dec9391aba56c647631f96f942165adae988803f74c59a7dca7515360349d0193f0d66a60f8fc9d19da1288613562de8b13b6f23b329961
-  data.tar.gz: ed6feff242aedac8add87e36d0863f34e3d6dcc00405f0a98dc6cb803b3d75451f228839e2cff251b5d9a58d0fa1b019e55f73d5d2689f957e11a4d517843389
+  metadata.gz: 4747e4da90b4bb33bf8533d6101f0906e069085cc6987d178204f69afe23a55d5f81c387ee32757e6ba4d12479744a2bd121b8e0306a1774ba92f6451535fc2c
+  data.tar.gz: beaffcdef50baad23534537413a6217ad815d4cec10eb196713a27a83d59b68ed0a2a09b65aa5452fc76018f0e19c5b9136c4e260597655f72e0bc917ee519a0

data/lib/goldiloader/active_record_patches.rb

@@ -177,7 +177,20 @@ module Goldiloader
     def auto_include?
       # Only auto include through associations if the target association is auto-loadable
       through_association = owner.association(through_reflection.name)
-      through_association.auto_include? && super
+      auto_include_self = super
+
+      # If the current association cannot be auto-included there is nothing we can do
+      return false unless auto_include_self
+
+      # If the through association can just be auto-included we're good
+      return true if through_association.auto_include?
+
+      # If the through association was already loaded and does not contain new, changed, or destroyed records
+      # we are also able to auto-include the association. It means it has only already been read or changes are
+      # already persisted.
+      through_association.loaded? && Array.wrap(through_association.target).none? do |record|
+        record.new_record? || record.changed? || record.destroyed?
+      end
     end
   end
   ::ActiveRecord::Associations::HasManyThroughAssociation.prepend(::Goldiloader::ThroughAssociationPatch)

data/lib/goldiloader/custom_preloads.rb

@@ -10,7 +10,7 @@ module Goldiloader
     def preloaded(model, cache_name:, key:, &block)
       unless preloaded?(cache_name)
         ids = models.map do |record|
-          record.public_send(key)
+          key_from_record(record, key)
         end
 
         # We're using instance_exec instead of a simple yield to make sure that the
@@ -26,13 +26,24 @@ module Goldiloader
 
     private
 
+    def key_from_record(record, key_or_key_list)
+      if key_or_key_list.is_a?(Array)
+        # allow passing an array of keys that will be collected from the record
+        key_or_key_list.map do |key|
+          record.public_send(key)
+        end
+      else
+        record.public_send(key_or_key_list)
+      end
+    end
+
     def store_preloaded(cache_name, preloaded_hash)
       @custom_preloads ||= {}
       @custom_preloads[cache_name] = preloaded_hash
     end
 
     def fetch_preloaded(cache_name, instance, key:)
-      @custom_preloads&.dig(cache_name, instance.public_send(key))
+      @custom_preloads&.dig(cache_name, key_from_record(instance, key))
     end
 
     def preloaded?(cache_name)

data/lib/goldiloader/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Goldiloader
-  VERSION = '5.1.0'
+  VERSION = '5.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldiloader
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.1
 platform: ruby
 authors:
 - Joel Turkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-04 00:00:00.000000000 Z
+date: 2024-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord