goldiloader 5.2.1 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ef809faf0ae768be18614302b3095863c0dce6ad5bdead11429a8968f39fef8
-  data.tar.gz: 7f4343a5a6065412c374c86c101dae7ed794b48bdfa8b5ff1765c7f9e2445c5f
+  metadata.gz: 3faf77c5a49c5d76b36f9bb124bf470d6f936b9e8a8df225e049967659f4f19b
+  data.tar.gz: 45e0492000d0fffc306b7f06c2f34b65d11f0a80323b394d320664ab96046f56
 SHA512:
-  metadata.gz: 4747e4da90b4bb33bf8533d6101f0906e069085cc6987d178204f69afe23a55d5f81c387ee32757e6ba4d12479744a2bd121b8e0306a1774ba92f6451535fc2c
-  data.tar.gz: beaffcdef50baad23534537413a6217ad815d4cec10eb196713a27a83d59b68ed0a2a09b65aa5452fc76018f0e19c5b9136c4e260597655f72e0bc917ee519a0
+  metadata.gz: 41a1b471723660aaacd9cf55e3f1f0de1289c44f89dd70a7f0876b8a2d076ab24c123be2907a52b33f932942b717ac9977178dbc3a95a01f0538474dad802eed
+  data.tar.gz: c9a4ddd6375a7d56020b163a8d0f0c9a4541e1cfc1c9ef78014a136b6611375b7a945ab952f3993948cb77c6b004837f7a8c91ab5ce8c4f8c69f993379ac7114

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
@@ -212,3 +216,5 @@ module Goldiloader
   end
   ::ActiveRecord::Associations::CollectionProxy.prepend(::Goldiloader::CollectionProxyPatch)
 end
+
+Goldiloader::AssociationOptions.register

data/lib/goldiloader/association_options.rb

@@ -22,5 +22,3 @@ module Goldiloader
     end
   end
 end
-
-Goldiloader::AssociationOptions.register

data/lib/goldiloader/compatibility.rb

@@ -2,8 +2,6 @@
 
 module Goldiloader
   module Compatibility
-    ACTIVE_RECORD_VERSION = ::Gem::Version.new(::ActiveRecord::VERSION::STRING).release
-
     def self.pre_rails_7?
       ::ActiveRecord::VERSION::MAJOR < 7
     end
@@ -15,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.1'
+  VERSION = '5.3.0'
 end

data/lib/goldiloader.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
 
 require 'active_support/all'
-require 'active_record'
 require 'goldiloader/compatibility'
 require 'goldiloader/custom_preloads'
 require 'goldiloader/auto_include_context'
 require 'goldiloader/scope_info'
 require 'goldiloader/association_options'
 require 'goldiloader/association_loader'
-require 'goldiloader/active_record_patches'
+
+ActiveSupport.on_load(:active_record) do
+  # Defer referencing ActiveRecord class until it's loaded
+  # See https://github.com/rails/rails/issues/48704
+  require 'goldiloader/active_record_patches'
+end
 
 module Goldiloader
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldiloader
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.3.0
 platform: ruby
 authors:
 - Joel Turkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2024-08-15 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: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 description: Automatically eager loads Rails associations as associations are traversed
 email:
 - jturkel@salsify.com