goldiloader 4.0.0 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b1702016efdeb47b12f583ff299bc46125714acc053b7c8594a9cf9a4fcba07
-  data.tar.gz: 6485555c4d71199683907813d9563fdecce3c8bada819d7ae1180f48ad5afadb
+  metadata.gz: 14cd0ebc332f63f4f019029af0c75254207ad6b3957d3204b458200ffe89aa61
+  data.tar.gz: 151fe68d70ebc800bd471204106d49e7208678b6f0d5e1495a08302859f8574d
 SHA512:
-  metadata.gz: 949fc36b600662dde9597b87c26430949bbdc12dff2d2eb9845405dcb273c2c9621edbb8d850f95dd602c892687dffc95849243bbd94c4e3473c31932f48464a
-  data.tar.gz: 5d645a33f703ad458096af205535efcd5cebb2ab802ae0af8203cc6236f388a73d79ec0c08681c447dbbe4b057a29a0bd373c001ce277dd34285447614f138a8
+  metadata.gz: 4b387491503a50e6108c0fb3df8419eaea1032a302908afbaa0302582e37819250eecf569fb53c7eb29f4d204fe2d799b4fd0e5f71f9afc026b104370e5132b6
+  data.tar.gz: 62554443b9814f9487f63a39e2cd6c0da8bd85fc0985fc87f078e21b812f91d453676c72db9794d8d40fb5d04edd3e7220cad9aaf2c7bb94c374604b6b8de815

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,11 +114,13 @@ module Goldiloader
     private
 
     def eager_loadable?
-      reflection.eager_loadable? &&
+      klass && reflection.eager_loadable?(klass) &&
         (::Goldiloader::Compatibility.destroyed_model_associations_eager_loadable? || !owner.destroyed?)
     end
 
     def load_with_auto_include
+      return yield unless Goldiloader.enabled?
+
       if loaded? && !stale_target?
         target
       elsif !auto_include?

data/lib/goldiloader/association_loader.rb

@@ -15,7 +15,7 @@ module Goldiloader
     private
 
     def eager_load(models, association_name)
-      if Goldiloader::Compatibility.pre_rails_6_2?
+      if Goldiloader::Compatibility.pre_rails_7?
         ::ActiveRecord::Associations::Preloader.new.preload(models, [association_name])
       else
         ::ActiveRecord::Associations::Preloader.new(records: models, associations: [association_name]).call

data/lib/goldiloader/auto_include_context.rb

@@ -37,7 +37,13 @@ module Goldiloader
     end
 
     def register_models(models)
-      Array.wrap(models).each do |model|
+      # Don't use Array() or Array.wrap() because they will check respond_to?(:to_ary)
+      # which for ActiveStorage::Attachment will delegate to the blob association which
+      # triggers an infinite eager loading loop on the association
+      models = [models] unless models.is_a?(Array)
+      models.each do |model|
+        next if model.nil?
+
         model.auto_include_context = self
         self.models << model
       end

data/lib/goldiloader/compatibility.rb

@@ -3,11 +3,22 @@
 module Goldiloader
   module Compatibility
     ACTIVE_RECORD_VERSION = ::Gem::Version.new(::ActiveRecord::VERSION::STRING).release
-    PRE_RAILS_6_2 = ACTIVE_RECORD_VERSION < ::Gem::Version.new('6.2.0')
     RAILS_5_2_0 = ACTIVE_RECORD_VERSION == ::Gem::Version.new('5.2.0')
 
-    def self.pre_rails_6_2?
-      PRE_RAILS_6_2
+    def self.pre_rails_7?
+      ::ActiveRecord::VERSION::MAJOR < 7
+    end
+
+    def self.rails_5_2?
+      ::ActiveRecord::VERSION::MAJOR == 5 && ::ActiveRecord::VERSION::MINOR == 2
+    end
+
+    def self.rails_6_1?
+      ::ActiveRecord::VERSION::MAJOR == 6 && ::ActiveRecord::VERSION::MINOR == 1
+    end
+
+    def self.rails_6_1_or_greater?
+      ::ActiveRecord::VERSION::MAJOR > 6 || rails_6_1?
     end
 
     # See https://github.com/rails/rails/pull/32375

data/lib/goldiloader/version.rb

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

data/lib/goldiloader.rb

@@ -8,3 +8,37 @@ require 'goldiloader/scope_info'
 require 'goldiloader/association_options'
 require 'goldiloader/association_loader'
 require 'goldiloader/active_record_patches'
+
+module Goldiloader
+  class << self
+
+    # Sets the process-wide enabled status
+    attr_accessor :globally_enabled
+
+    def enabled?
+      Thread.current.fetch(:goldiloader_enabled, globally_enabled)
+    end
+
+    def enabled=(val)
+      Thread.current[:goldiloader_enabled] = val
+    end
+
+    def enabled
+      old_enabled = Thread.current[:goldiloader_enabled]
+      self.enabled = true
+      yield
+    ensure
+      self.enabled = old_enabled
+    end
+
+    def disabled
+      old_enabled = Thread.current[:goldiloader_enabled]
+      self.enabled = false
+      yield
+    ensure
+      self.enabled = old_enabled
+    end
+  end
+
+  self.globally_enabled = true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldiloader
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.2
 platform: ruby
 authors:
 - Joel Turkel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -50,6 +50,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: activestorage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement