goldiloader 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 452d46a8d8dc72a51e686d522826ad8f80ad3e686ef03d61f34c8044458f1d3f
-  data.tar.gz: f4c428261a9d7d69858e065da735795b7be00bae3d6c4910b5e9d31064558e51
+  metadata.gz: 14cd0ebc332f63f4f019029af0c75254207ad6b3957d3204b458200ffe89aa61
+  data.tar.gz: 151fe68d70ebc800bd471204106d49e7208678b6f0d5e1495a08302859f8574d
 SHA512:
-  metadata.gz: ebf67521e4fed82d0d90b5f1597b296e0de04f53ab35b975c5e48383fa6392b0a4d0ed91225e16e471bfa87840144d68d590711e92353cd6138a637b94b5aa30
-  data.tar.gz: ee9fac3561f9e8c875f4bcbaca2fa9cbf7be9d3450f440e77eddcc3816da80fd4a38d534128e78fa154ce6ebaa83f99e502b838b7be106aa8bbe7db75466022e
+  metadata.gz: 4b387491503a50e6108c0fb3df8419eaea1032a302908afbaa0302582e37819250eecf569fb53c7eb29f4d204fe2d799b4fd0e5f71f9afc026b104370e5132b6
+  data.tar.gz: 62554443b9814f9487f63a39e2cd6c0da8bd85fc0985fc87f078e21b812f91d453676c72db9794d8d40fb5d04edd3e7220cad9aaf2c7bb94c374604b6b8de815

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.1.1'
+  VERSION = '4.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldiloader
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Joel Turkel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-10 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