goldiloader 5.2.2 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e922f46493ed724f6da746c0c940fda408a79bdf37a8213a63ff2d0a73782d16
-  data.tar.gz: d6a0e0bcb412979d4b07c0c2864ee2a7b3756079a6b6e2383af3b072a6290e44
+  metadata.gz: 1f884bb718c29de33bdabce3826ecd6f8551ce9cdbb4089ce604ee7c7ac49b49
+  data.tar.gz: 32edcdf13f8a4027f2803e6ed485f441b0e2e8589f4f9db9bff914dd237069ef
 SHA512:
-  metadata.gz: f2b1bfd0f1e6677f701ebe92082932e8ba9dcef5f537631d08be9b20b1d4b453c66eab281116e998a93d5018d6ed529a25aee3ddf362fe92aad6cbed6423d8c2
-  data.tar.gz: 4a1a2e6ea0a9b34cfee1d24e43d3bdf1984b0388922b37943c06e29da41588f67df8d10622b9cc91515afa623dbe3a56070957d6b9b21f8e709ca74a01643c2d
+  metadata.gz: 55682f49532c821dc4b0658e05d2aadc4922d38492fe240510fcb1f0c87fdc2dff3bd4eab8a4de398f12ee34032e6648e39b17e28d938a74f5c617184a59e0e4
+  data.tar.gz: a42db8caf9b803b6ef2f6dc11e74018e212e06cb24d1b644760e03b325224a63ad63393f348071319a4970de219e42e93d93a483249ec350faa432d85a14d6e4

data/lib/goldiloader/active_record_patches.rb

@@ -56,7 +56,11 @@ module Goldiloader
     end
 
     def auto_include_value=(value)
-      assert_mutability!
+      if ::Goldiloader::Compatibility.pre_rails_7_2?
+        assert_mutability!
+      else
+        assert_modifiable!
+      end
       @values[:auto_include] = value
     end
   end
@@ -148,7 +152,7 @@ module Goldiloader
   module SingularAssociationPatch
     private
 
-    def find_target(*args)
+    def find_target(...)
       load_with_auto_include { super }
     end
   end
@@ -157,13 +161,13 @@ module Goldiloader
   module CollectionAssociationPatch
     # Force these methods to load the entire association for fully_load associations
     [:size, :ids_reader, :empty?].each do |method|
-      define_method(method) do |*args, &block|
+      define_method(method) do |*args, **kwargs, &block|
         load_target if fully_load?
-        super(*args, &block)
+        super(*args, **kwargs, &block)
       end
     end
 
-    def load_target(*args)
+    def load_target(...)
       load_with_auto_include { super }
     end
 
@@ -199,14 +203,14 @@ module Goldiloader
   module CollectionProxyPatch
     # The CollectionProxy just forwards exists? to the underlying scope so we need to intercept this and
     # force it to use size which handles fully_load properly.
-    def exists?(*args)
+    def exists?(*args, **kwargs)
       # We don't fully_load the association when arguments are passed to exists? since Rails always
       # pushes this query into the database without any caching (and it likely not a common
       # scenario worth optimizing).
-      if args.empty? && @association.fully_load?
+      if args.empty? && kwargs.empty? && @association.fully_load?
         size > 0
       else
-        scope.exists?(*args)
+        scope.exists?(*args, **kwargs)
       end
     end
   end

data/lib/goldiloader/compatibility.rb

@@ -13,5 +13,10 @@ module Goldiloader
     def self.rails_6_1_or_greater?
       ::ActiveRecord::VERSION::MAJOR > 6 || rails_6_1?
     end
+
+    def self.pre_rails_7_2?
+      ::ActiveRecord::VERSION::MAJOR < 7 ||
+        (::ActiveRecord::VERSION::MAJOR == 7 && ::ActiveRecord::VERSION::MINOR < 2)
+    end
   end
 end

data/lib/goldiloader/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldiloader
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.3.1
 platform: ruby
 authors:
 - Joel Turkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-10 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -214,16 +214,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: Automatically eager loads Rails associations as associations are traversed
 email:
 - jturkel@salsify.com