goldiloader 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b1702016efdeb47b12f583ff299bc46125714acc053b7c8594a9cf9a4fcba07
-  data.tar.gz: 6485555c4d71199683907813d9563fdecce3c8bada819d7ae1180f48ad5afadb
+  metadata.gz: 3da0240495233f97f9762b4c81249b24fc6b9fb39e46801243e865ae2ed4d50d
+  data.tar.gz: d5bc7704557c4a9cdaf4e8d8e31d7d066444a964faf31812ce34117f845ccbeb
 SHA512:
-  metadata.gz: 949fc36b600662dde9597b87c26430949bbdc12dff2d2eb9845405dcb273c2c9621edbb8d850f95dd602c892687dffc95849243bbd94c4e3473c31932f48464a
-  data.tar.gz: 5d645a33f703ad458096af205535efcd5cebb2ab802ae0af8203cc6236f388a73d79ec0c08681c447dbbe4b057a29a0bd373c001ce277dd34285447614f138a8
+  metadata.gz: 73ab77e3c22b3e80dc903079dfe65245fceae13ab8b4fa1870705df1d1302eac82982523fad9cf7b9c2f4576022894ff16c8cd83b72d966ede5cd88ffb2b56d0
+  data.tar.gz: 402c5bfe96112e1a697af866205c3a16cb85966566adcac722deefc4ce4d487b4df10e335d1ce057cb2ddcf5ce4c8d490998c46b3e20feca4d98f334f2719534

data/lib/goldiloader/active_record_patches.rb

@@ -68,23 +68,26 @@ module Goldiloader
   ActiveRecord::Relation::Merger.prepend(::Goldiloader::MergerPatch)
 
   module AssociationReflectionPatch
-    def eager_loadable?
-      return @eager_loadable if instance_variable_defined?(:@eager_loadable)
-
-      @eager_loadable = if scope.nil?
-                          # Associations without any scoping options are eager loadable
-                          true
-                        elsif scope.arity > 0
-                          # The scope will be evaluated for every model instance so it can't
-                          # be eager loaded
-                          false
-                        else
-                          scope_info = Goldiloader::ScopeInfo.new(scope_for(klass.unscoped))
-                          scope_info.auto_include? &&
-                            !scope_info.limit? &&
-                            !scope_info.offset? &&
-                            (!has_one? || !scope_info.order?)
-                        end
+    # Note we need to pass the association's target class as an argument since it won't be known
+    # outside the context of an association instance for polymorphic associations.
+    def eager_loadable?(target_klass)
+      @eager_loadable_cache ||= Hash.new do |cache, target_klass_key|
+        cache[target_klass_key] = if scope.nil?
+                                    # Associations without any scoping options are eager loadable
+                                    true
+                                  elsif scope.arity > 0
+                                    # The scope will be evaluated for every model instance so it can't
+                                    # be eager loaded
+                                    false
+                                  else
+                                    scope_info = Goldiloader::ScopeInfo.new(scope_for(target_klass_key.unscoped))
+                                    scope_info.auto_include? &&
+                                      !scope_info.limit? &&
+                                      !scope_info.offset? &&
+                                      (!has_one? || !scope_info.order?)
+                                  end
+      end
+      @eager_loadable_cache[target_klass]
     end
   end
   ActiveRecord::Reflection::AssociationReflection.include(::Goldiloader::AssociationReflectionPatch)
@@ -111,7 +114,7 @@ module Goldiloader
     private
 
     def eager_loadable?
-      reflection.eager_loadable? &&
+      klass && reflection.eager_loadable?(klass) &&
         (::Goldiloader::Compatibility.destroyed_model_associations_eager_loadable? || !owner.destroyed?)
     end
 

data/lib/goldiloader/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldiloader
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Joel Turkel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord