goldiloader 4.2.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dad32fcba65c9784b6f3b21e8f477055d6511714173f0fe34ea9c61a7bb79b6
-  data.tar.gz: 8bf99537c6f893ebc042a416f4f77b522c854efc9250e89b45d0cda39099693f
+  metadata.gz: e5acb78ebf278d88e47a50d7f3c6c49f55bee48704eb115082b45d1421f84313
+  data.tar.gz: 4034b092560abca7b531f81485c850f366e79bb5f4996c0477dd1525921a2ef8
 SHA512:
-  metadata.gz: 411a75dea6931ffd45c3883cb6a8bffd6e5e69a7960763faea39bbb1deebe7ec8af961b0acc7c19dff01574b0507678d0359b19d88cbd50aa3bdaf98fb0bc05a
-  data.tar.gz: 67b0d0addd6bdef131cc8f5d0bad6f398653a61cdb91d7d3e18c8ef8b24bb91fac74c7c0d12e2755a87998e2e49ce55daa254671b8afd2c1a57e8611189caae0
+  metadata.gz: 433c75215165ab250d932c5e3307ec78777f45cb9a6c691dcb33386566ce211e65771808e81c95ab0d46fd0a786e41899fd418858c466503fe723828ba56858d
+  data.tar.gz: dc0947c73fd7c01697442dd717a0e43efe35fce6a87ab281d9b51f86ea6d1b192be53f6c25b975294d7896ac3d73f79701ea4ea1c8c0cfb1e01d39c31b6a8fd1

data/lib/goldiloader/active_record_patches.rb

@@ -114,8 +114,7 @@ module Goldiloader
     private
 
     def eager_loadable?
-      klass && reflection.eager_loadable?(klass) &&
-        (::Goldiloader::Compatibility.destroyed_model_associations_eager_loadable? || !owner.destroyed?)
+      klass && reflection.eager_loadable?(klass)
     end
 
     def load_with_auto_include
@@ -173,20 +172,7 @@ module Goldiloader
     def auto_include?
       # Only auto include through associations if the target association is auto-loadable
       through_association = owner.association(through_reflection.name)
-      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
+      through_association.auto_include? && super
     end
   end
   ::ActiveRecord::Associations::HasManyThroughAssociation.prepend(::Goldiloader::ThroughAssociationPatch)

data/lib/goldiloader/compatibility.rb

@@ -3,16 +3,11 @@
 module Goldiloader
   module Compatibility
     ACTIVE_RECORD_VERSION = ::Gem::Version.new(::ActiveRecord::VERSION::STRING).release
-    RAILS_5_2_0 = ACTIVE_RECORD_VERSION == ::Gem::Version.new('5.2.0')
 
     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
@@ -20,10 +15,5 @@ module Goldiloader
     def self.rails_6_1_or_greater?
       ::ActiveRecord::VERSION::MAJOR > 6 || rails_6_1?
     end
-
-    # See https://github.com/rails/rails/pull/32375
-    def self.destroyed_model_associations_eager_loadable?
-      !RAILS_5_2_0
-    end
   end
 end

data/lib/goldiloader/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldiloader
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Joel Turkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-30 00:00:00.000000000 Z
+date: 2023-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
@@ -112,7 +112,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
@@ -258,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="