Autoload models via the PaperTrail::Rails::Engine if the gem is being…

… used within Rails

lib/paper_trail.rb

@@ -1,10 +1,12 @@
-require 'paper_trail/config'
-require 'paper_trail/has_paper_trail'
-require 'paper_trail/cleaner'
-require 'paper_trail/version_number'
+# Require core library
+Dir[File.join(File.dirname(__FILE__), 'paper_trail', '*.rb')].each do |file|
+  require File.join('paper_trail', File.basename(file, '.rb'))
+end
 
 # Require serializers
-Dir[File.join(File.dirname(__FILE__), 'paper_trail', 'serializers', '*.rb')].each { |file| require file }
+Dir[File.join(File.dirname(__FILE__), 'paper_trail', 'serializers', '*.rb')].each do |file|
+  require File.join('paper_trail', 'serializers', File.basename(file, '.rb'))
+end
 
 module PaperTrail
   extend PaperTrail::Cleaner
@@ -118,14 +120,16 @@ def self.configure
   rescue LoadError; end # will rescue if `ProtectedAttributes` gem is not available
 end
 
-require 'paper_trail/version'
-
 ActiveSupport.on_load(:active_record) do
   include PaperTrail::Model
 end
 
 # Require frameworks
 require 'paper_trail/frameworks/sinatra'
-require 'paper_trail/frameworks/rails' if defined? Rails
+if defined? Rails
+  require 'paper_trail/frameworks/rails'
+else
+  require 'paper_trail/frameworks/active_record'
+end
 require 'paper_trail/frameworks/rspec' if defined? RSpec
 require 'paper_trail/frameworks/cucumber' if defined? World

lib/paper_trail/frameworks/active_record.rb

@@ -0,0 +1,5 @@
+# This file only needs to be loaded if the gem is being used outside of Rails, since otherwise
+# the model(s) will get loaded in via the `Rails::Engine`
+Dir[File.join(File.dirname(__FILE__), 'active_record', 'models', 'paper_trail', '*.rb')].each do |file|
+  require "paper_trail/frameworks/active_record/models/paper_trail/#{File.basename(file, '.rb')}"
+end

lib/paper_trail/frameworks/rails/engine.rb

@@ -1,6 +1,7 @@
 module PaperTrail
   module Rails
     class Engine < ::Rails::Engine
+      paths['app/models'] << 'lib/paper_trail/frameworks/active_record/models'
     end
   end
 end