goldiloader 5.2.0 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e2c97d263d32b7fb6d2f2e9486f780c835ea50d63746983fb0eb6c39322b9db
-  data.tar.gz: 1b9e51a04b471e59b5e8900c14518c392d1d87e7530ec421cca53603d9df6939
+  metadata.gz: e922f46493ed724f6da746c0c940fda408a79bdf37a8213a63ff2d0a73782d16
+  data.tar.gz: d6a0e0bcb412979d4b07c0c2864ee2a7b3756079a6b6e2383af3b072a6290e44
 SHA512:
-  metadata.gz: 8ef1fc2b11be83c5f7557bf4ed7b30aa7b3eb1ecd71e710558b21591ce05bda8a09d51cc2ef1c2026817bd20bccbe6ede8c9a7636eda07b6945acb814b6cacdc
-  data.tar.gz: db3bf812806fad8e6c6d2c2afdbb2be6883e524a81a62447c8a04b5a2ac0ec9c80a67568a2a8ece2563172cbadaa7dac67e410217678041cbecf601e1da1292e
+  metadata.gz: f2b1bfd0f1e6677f701ebe92082932e8ba9dcef5f537631d08be9b20b1d4b453c66eab281116e998a93d5018d6ed529a25aee3ddf362fe92aad6cbed6423d8c2
+  data.tar.gz: 4a1a2e6ea0a9b34cfee1d24e43d3bdf1984b0388922b37943c06e29da41588f67df8d10622b9cc91515afa623dbe3a56070957d6b9b21f8e709ca74a01643c2d

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)
@@ -199,3 +212,5 @@ module Goldiloader
   end
   ::ActiveRecord::Associations::CollectionProxy.prepend(::Goldiloader::CollectionProxyPatch)
 end
+
+Goldiloader::AssociationOptions.register

data/lib/goldiloader/association_options.rb

@@ -22,5 +22,3 @@ module Goldiloader
     end
   end
 end
-
-Goldiloader::AssociationOptions.register

data/lib/goldiloader/compatibility.rb

@@ -2,8 +2,6 @@
 
 module Goldiloader
   module Compatibility
-    ACTIVE_RECORD_VERSION = ::Gem::Version.new(::ActiveRecord::VERSION::STRING).release
-
     def self.pre_rails_7?
       ::ActiveRecord::VERSION::MAJOR < 7
     end

data/lib/goldiloader/version.rb

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

data/lib/goldiloader.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
 
 require 'active_support/all'
-require 'active_record'
 require 'goldiloader/compatibility'
 require 'goldiloader/custom_preloads'
 require 'goldiloader/auto_include_context'
 require 'goldiloader/scope_info'
 require 'goldiloader/association_options'
 require 'goldiloader/association_loader'
-require 'goldiloader/active_record_patches'
+
+ActiveSupport.on_load(:active_record) do
+  # Defer referencing ActiveRecord class until it's loaded
+  # See https://github.com/rails/rails/issues/48704
+  require 'goldiloader/active_record_patches'
+end
 
 module Goldiloader
   class << self

metadata

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