goldiloader 4.0.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3da0240495233f97f9762b4c81249b24fc6b9fb39e46801243e865ae2ed4d50d
-  data.tar.gz: d5bc7704557c4a9cdaf4e8d8e31d7d066444a964faf31812ce34117f845ccbeb
+  metadata.gz: 60dd6e4947b269049f3a3348487771468d5dd5d9dc3a1029022ddbe88cc8ec37
+  data.tar.gz: 4b064ab04a026f86e68cda4d196b128b175b4fa85ce16c2bcc6026a87f52aa62
 SHA512:
-  metadata.gz: 73ab77e3c22b3e80dc903079dfe65245fceae13ab8b4fa1870705df1d1302eac82982523fad9cf7b9c2f4576022894ff16c8cd83b72d966ede5cd88ffb2b56d0
-  data.tar.gz: 402c5bfe96112e1a697af866205c3a16cb85966566adcac722deefc4ce4d487b4df10e335d1ce057cb2ddcf5ce4c8d490998c46b3e20feca4d98f334f2719534
+  metadata.gz: 7da14e3c1d7c8c2ce7d824bb3af676b7edd0dd5399889242c3cab874d26e957b8d9a3bcd6b2f29a6fb0aa88498d447538e1a5620f691a38b1dfa78b69dd6837a
+  data.tar.gz: a124830cd0f6a34def8d4d59daabce9889d89da6840eeb5adff5b4f6266b159cb2b785c949c31a6f96d407319fdee3b777d96ddaba1b26e04094dc8e843dd642

data/lib/goldiloader/active_record_patches.rb

@@ -119,6 +119,8 @@ module Goldiloader
     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.1'
+  VERSION = '4.2.0'
 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.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Joel Turkel
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,27 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
+- !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.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -228,7 +248,9 @@ metadata:
   changelog_uri: https://github.com/salsify/goldiloader/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/salsify/goldiloader/
   bug_tracker_uri: https://github.com/salsify/goldiloader/issues
-post_install_message:
+  allowed_push_host: https://rubygems.org
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -243,8 +265,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.2.22
+signing_key: 
 specification_version: 4
 summary: Automatic Rails association eager loading
 test_files: []