Defer inclusion until after active record has fully loaded

Author: westonganger

lib/paper_trail-association_tracking.rb

@@ -7,14 +7,14 @@
 require "paper_trail_association_tracking/record_trail"
 require "paper_trail_association_tracking/request"
 require "paper_trail_association_tracking/paper_trail"
-require "paper_trail_association_tracking/version_concern"
 
 if defined?(Rails)
-  require "paper_trail/frameworks/active_record"
-  require "paper_trail_association_tracking/frameworks/rails"
-elsif defined?(ActiveRecord)
-  require "paper_trail/frameworks/active_record"
-  require "paper_trail_association_tracking/frameworks/active_record"
+  require "paper_trail_association_tracking/frameworks/rails/railtie"
+else
+  ActiveSupport.on_load(:active_record) do
+    require "paper_trail/frameworks/active_record"
+    require "paper_trail_association_tracking/frameworks/active_record"
+  end
 end
 
 module PaperTrailAssociationTracking

lib/paper_trail_association_tracking/frameworks/active_record.rb

@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 
 require "paper_trail_association_tracking/frameworks/active_record/models/paper_trail/version_association"
+
+require "paper_trail_association_tracking/version_concern"

lib/paper_trail_association_tracking/frameworks/rails.rb

@@ -5,13 +5,10 @@ class Railtie < ::Rails::Railtie
 
     initializer "paper_trail_association_tracking", after: "paper_trail" do
       ActiveSupport.on_load(:active_record) do
+        require "paper_trail/frameworks/active_record"
         require "paper_trail_association_tracking/frameworks/active_record"
       end
     end
 
-    config.to_prepare do
-      ::PaperTrail::Version.include(::PaperTrailAssociationTracking::VersionConcern)
-    end
-
   end
 end

lib/paper_trail_association_tracking/frameworks/rails/railtie.rb

@@ -16,3 +16,5 @@ module VersionConcern
     end
   end
 end
+
+PaperTrail::Version.include(PaperTrailAssociationTracking::VersionConcern)