Fix bug in AR integration

[Fixes paper-trail-gem#789]
devonestes · May 9, 2016 · 4495e88 · 4495e88
1 parent 99ccfd7
commit 4495e88
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/lib/paper_trail.rb b/lib/paper_trail.rb
@@ -176,6 +176,10 @@ def version
   end
 end
 
+ActiveSupport.on_load(:active_record) do
+  include PaperTrail::Model
+end
+
 # Require frameworks
 require "paper_trail/frameworks/sinatra"
 if defined?(::Rails) && ActiveRecord::VERSION::STRING >= "3.2"

diff --git a/lib/paper_trail/frameworks/active_record.rb b/lib/paper_trail/frameworks/active_record.rb
@@ -2,7 +2,3 @@
 # since otherwise the model(s) will get loaded in via the `Rails::Engine`.
 require "paper_trail/frameworks/active_record/models/paper_trail/version_association"
 require "paper_trail/frameworks/active_record/models/paper_trail/version"
-
-ActiveSupport.on_load(:active_record) do
-  include PaperTrail::Model
-end
diff --git a/lib/paper_trail/frameworks/rails/engine.rb b/lib/paper_trail/frameworks/rails/engine.rb
@@ -5,7 +5,6 @@ class Engine < ::Rails::Engine
       paths["app/models"] << "lib/paper_trail/frameworks/active_record/models"
       config.paper_trail = ActiveSupport::OrderedOptions.new
       initializer "paper_trail.initialisation" do |app|
-        ActiveRecord::Base.send :include, PaperTrail::Model
         PaperTrail.enabled = app.config.paper_trail.fetch(:enabled, true)
       end
     end