Use ActiveRecord lazy load hooks (#141)

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 5.2.2
+- Fix [issue 140](https://github.com/salsify/goldiloader/issues/140) - Defer referencing ActiveRecord classes until 
+  it's been initialized to ensure the `Rails.application.config.filter_parameters` setting is applied properly.
+  **Thanks [GuillouuH](https://github.com/GuillouuH)**
+
 ## 5.2.1
 - Auto include associations when the through association has already been loaded. See
   [138](https://github.com/salsify/goldiloader/pull/138) for details.

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

lib/goldiloader/active_record_patches.rb

@@ -212,3 +212,5 @@ def exists?(*args)
   end
   ::ActiveRecord::Associations::CollectionProxy.prepend(::Goldiloader::CollectionProxyPatch)
 end
+
+Goldiloader::AssociationOptions.register

lib/goldiloader/association_options.rb

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

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

lib/goldiloader/version.rb

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