paper_trail 2.7.2 → 3.0.0.beta1

data/lib/paper_trail/cleaner.rb

@@ -0,0 +1,34 @@
+module PaperTrail
+  module Cleaner
+    # Destroys all but the most recent version(s) for items on a given date (or on all dates). Useful for deleting drafts.
+    #
+    # Options:
+    # :keeping      An `integer` indicating the number of versions to be kept for each item per date.
+    #               Defaults to `1`.
+    # :date         Should either be a `Date` object specifying which date to destroy versions for or `:all`,
+    #               which will specify that all dates should be cleaned. Defaults to `:all`.
+    # :item_id      The `id` for the item to be cleaned on, or `nil`, which causes all items to be cleaned.
+    #               Defaults to `nil`.
+    def clean_versions!(options = {})
+      options = {:keeping => 1, :date => :all}.merge(options)
+      gather_versions(options[:item_id], options[:date]).each do |item_id, versions|
+        versions.group_by { |v| v.created_at.to_date }.each do |date, versions| # now group the versions by date and iterate through those
+          versions.pop(options[:keeping]) # remove the number of versions we wish to keep from the collection of versions prior to destruction
+          versions.map(&:destroy)
+        end
+      end
+    end
+
+    private
+
+    # Returns a hash of versions grouped by the `item_id` attribute formatted like this: {:item_id => PaperTrail::Version}.
+    # If `item_id` or `date` is set, versions will be narrowed to those pointing at items with those ids that were created on specified date.
+    def gather_versions(item_id = nil, date = :all)
+      raise "`date` argument must receive a Timestamp or `:all`" unless date == :all || date.respond_to?(:to_date)
+      versions = item_id ? PaperTrail::Version.where(:item_id => item_id) : PaperTrail::Version
+      versions = versions.between(date.to_date, date.to_date + 1.day) unless date == :all
+      versions = PaperTrail::Version.all if versions == PaperTrail::Version # if versions has not been converted to an ActiveRecord::Relation yet, do so now
+      versions.group_by(&:item_id)
+    end
+  end
+end

data/lib/paper_trail/frameworks/cucumber.rb

@@ -0,0 +1,31 @@
+if defined? World
+  # before hook for Cucumber
+  before do
+    ::PaperTrail.enabled = false
+    ::PaperTrail.whodunnit = nil
+    ::PaperTrail.controller_info = {} if defined? ::Rails
+  end
+
+  module PaperTrail
+    module Cucumber
+      module Extensions
+        # :call-seq:
+        # with_versioning
+        #
+        # enable versioning for specific blocks
+
+        def with_versioning
+          was_enabled = ::PaperTrail.enabled?
+          ::PaperTrail.enabled = true
+          begin
+            yield
+          ensure
+            ::PaperTrail.enabled = was_enabled
+          end
+        end
+      end
+    end
+  end
+
+  World PaperTrail::Cucumber::Extensions
+end

data/lib/paper_trail/frameworks/rails.rb

@@ -0,0 +1,79 @@
+module PaperTrail
+  module Rails
+    module Controller
+
+      def self.included(base)
+        if defined?(ActionController) && base == ActionController::Base
+          base.before_filter :set_paper_trail_enabled_for_controller
+          base.before_filter :set_paper_trail_whodunnit, :set_paper_trail_controller_info
+        end
+      end
+
+      protected
+
+      # Returns the user who is responsible for any changes that occur.
+      # By default this calls `current_user` and returns the result.
+      #
+      # Override this method in your controller to call a different
+      # method, e.g. `current_person`, or anything you like.
+      def user_for_paper_trail
+        current_user if defined?(current_user)
+      end
+
+      # Returns any information about the controller or request that you
+      # want PaperTrail to store alongside any changes that occur.  By
+      # default this returns an empty hash.
+      #
+      # Override this method in your controller to return a hash of any
+      # information you need.  The hash's keys must correspond to columns
+      # in your `versions` table, so don't forget to add any new columns
+      # you need.
+      #
+      # For example:
+      #
+      #     {:ip => request.remote_ip, :user_agent => request.user_agent}
+      #
+      # The columns `ip` and `user_agent` must exist in your `versions` # table.
+      #
+      # Use the `:meta` option to `PaperTrail::Model::ClassMethods.has_paper_trail`
+      # to store any extra model-level data you need.
+      def info_for_paper_trail
+        {}
+      end
+
+      # Returns `true` (default) or `false` depending on whether PaperTrail should
+      # be active for the current request.
+      #
+      # Override this method in your controller to specify when PaperTrail should
+      # be off.
+      def paper_trail_enabled_for_controller
+        true
+      end
+
+      private
+
+      # Tells PaperTrail whether versions should be saved in the current request.
+      def set_paper_trail_enabled_for_controller
+        ::PaperTrail.enabled_for_controller = paper_trail_enabled_for_controller
+      end
+
+      # Tells PaperTrail who is responsible for any changes that occur.
+      def set_paper_trail_whodunnit
+        ::PaperTrail.whodunnit = user_for_paper_trail if paper_trail_enabled_for_controller
+      end
+
+      # DEPRECATED: please use `set_paper_trail_whodunnit` instead.
+      def set_whodunnit
+        logger.warn '[PaperTrail]: the `set_whodunnit` controller method has been deprecated.  Please rename to `set_paper_trail_whodunnit`.'
+        set_paper_trail_whodunnit
+      end
+
+      # Tells PaperTrail any information from the controller you want
+      # to store alongside any changes that occur.
+      def set_paper_trail_controller_info
+        ::PaperTrail.controller_info = info_for_paper_trail if paper_trail_enabled_for_controller
+      end
+
+    end
+  end
+end

data/lib/paper_trail/frameworks/rspec.rb

@@ -0,0 +1,24 @@
+if defined? RSpec
+  require 'rspec/core'
+  require 'rspec/matchers'
+  require File.expand_path('../rspec/extensions', __FILE__)
+
+  RSpec.configure do |config|
+    config.include ::PaperTrail::RSpec::Extensions
+
+    config.before(:each) do
+      ::PaperTrail.enabled = false
+      ::PaperTrail.whodunnit = nil
+      ::PaperTrail.controller_info = {} if defined?(::Rails) && defined?(::RSpec::Rails)
+    end
+
+    config.before(:each, :versioning => true) do
+      ::PaperTrail.enabled = true
+    end
+  end
+
+  RSpec::Matchers.define :be_versioned do
+    # check to see if the model has `has_paper_trail` declared on it
+    match { |actual| actual.kind_of?(::PaperTrail::Model::InstanceMethods) }
+  end
+end

data/lib/paper_trail/frameworks/rspec/extensions.rb

@@ -0,0 +1,20 @@
+module PaperTrail
+  module RSpec
+    module Extensions
+      # :call-seq:
+      # with_versioning
+      #
+      # enable versioning for specific blocks
+
+      def with_versioning
+        was_enabled = ::PaperTrail.enabled?
+        ::PaperTrail.enabled = true
+        begin
+          yield
+        ensure
+          ::PaperTrail.enabled = was_enabled
+        end
+      end
+    end
+  end
+end

data/lib/paper_trail/frameworks/sinatra.rb

@@ -0,0 +1,31 @@
+module Sinatra
+  module PaperTrail
+
+    # Register this module inside your Sinatra application to gain access to controller-level methods used by PaperTrail
+    def self.registered(app)
+      app.helpers Sinatra::PaperTrail
+      app.before { set_paper_trail_whodunnit }
+    end
+
+    protected
+
+    # Returns the user who is responsible for any changes that occur.
+    # By default this calls `current_user` and returns the result.
+    #
+    # Override this method in your controller to call a different
+    # method, e.g. `current_person`, or anything you like.
+    def user_for_paper_trail
+      current_user if defined?(current_user)
+    end
+
+    private
+
+    # Tells PaperTrail who is responsible for any changes that occur.
+    def set_paper_trail_whodunnit
+      ::PaperTrail.whodunnit = user_for_paper_trail if ::PaperTrail.enabled?
+    end
+
+  end
+
+  register Sinatra::PaperTrail if defined?(register)
+end

data/lib/paper_trail/has_paper_trail.rb

@@ -39,7 +39,7 @@ module PaperTrail
         attr_accessor self.version_association_name
 
         class_attribute :version_class_name
-        self.version_class_name = options[:class_name] || '::Version'
+        self.version_class_name = options[:class_name] || 'PaperTrail::Version'
 
         class_attribute :paper_trail_options
         self.paper_trail_options = options.dup
@@ -59,18 +59,21 @@ module PaperTrail
 
         attr_accessor :paper_trail_event
 
-        has_many self.versions_association_name,
-                 :class_name => version_class_name,
-                 :as         => :item,
-                 :order      => "#{PaperTrail.timestamp_field} ASC, #{self.version_key} ASC"
-
-        after_create  :record_create, :if => :save_version? if !options[:on] || options[:on].include?(:create)
-        before_update :record_update, :if => :save_version? if !options[:on] || options[:on].include?(:update)
-        after_destroy :record_destroy, :if => :save_version? if !options[:on] || options[:on].include?(:destroy)
-      end
+        if ActiveRecord::VERSION::STRING.to_f >= 4.0 # `has_many` syntax for specifying order uses a lambda in Rails 4
+          has_many self.versions_association_name,
+            lambda { order("#{PaperTrail.timestamp_field} ASC") },
+            :class_name => self.version_class_name, :as => :item
+        else
+          has_many self.versions_association_name,
+            :class_name => version_class_name,
+            :as         => :item,
+            :order      => "#{PaperTrail.timestamp_field} ASC"
+        end
 
-      def version_key
-        self.version_class_name.constantize.primary_key
+        options_on = Array(options[:on]) # so that a single symbol can be passed in without wrapping it in an `Array`
+        after_create  :record_create, :if => :save_version? if options_on.empty? || options_on.include?(:create)
+        before_update :record_update, :if => :save_version? if options_on.empty? || options_on.include?(:update)
+        after_destroy :record_destroy, :if => :save_version? if options_on.empty? || options_on.include?(:destroy)
       end
 
       # Switches PaperTrail off for this class.
@@ -190,7 +193,7 @@ module PaperTrail
       end
 
       def record_create
-        if switched_on?
+        if paper_trail_switched_on?
           data = {
             :event     => paper_trail_event || 'create',
             :whodunnit => PaperTrail.whodunnit
@@ -199,13 +202,12 @@ module PaperTrail
           if changed_notably? and version_class.column_names.include?('object_changes')
             data[:object_changes] = PaperTrail.serializer.dump(changes_for_paper_trail)
           end
-
-          send(self.class.versions_association_name).create merge_metadata(data)
+          send(self.class.versions_association_name).create! merge_metadata(data)
         end
       end
 
       def record_update
-        if switched_on? && changed_notably?
+        if paper_trail_switched_on? && changed_notably?
           data = {
             :event     => paper_trail_event || 'update',
             :object    => object_to_string(item_before_change),
@@ -227,14 +229,14 @@ module PaperTrail
       end
 
       def record_destroy
-        if switched_on? and not new_record?
+        if paper_trail_switched_on? and not new_record?
           version_class.create merge_metadata(:item_id   => self.id,
                                               :item_type => self.class.base_class.name,
                                               :event     => paper_trail_event || 'destroy',
                                               :object    => object_to_string(item_before_change),
                                               :whodunnit => PaperTrail.whodunnit)
+          send(self.class.versions_association_name).send :load_target
         end
-        send(self.class.versions_association_name).send :load_target
       end
 
       def merge_metadata(data)
@@ -266,7 +268,7 @@ module PaperTrail
         end
         previous.tap do |prev|
           prev.id = id
-          changed_attributes.each { |attr, before| prev[attr] = before }
+          changed_attributes.select { |k,v| self.class.column_names.include?(k) }.each { |attr, before| prev[attr] = before }
         end
       end
 
@@ -292,7 +294,7 @@ module PaperTrail
         changed - ignore - skip
       end
 
-      def switched_on?
+      def paper_trail_switched_on?
         PaperTrail.enabled? && PaperTrail.enabled_for_controller? && self.class.paper_trail_enabled_for_model
       end
 

data/lib/paper_trail/version.rb

@@ -1,198 +1,225 @@
-class Version < ActiveRecord::Base
-  belongs_to :item, :polymorphic => true
-  validates_presence_of :event
-  attr_accessible :item_type, :item_id, :event, :whodunnit, :object, :object_changes
+module PaperTrail
+  class Version < ActiveRecord::Base
+    belongs_to :item, :polymorphic => true
+    validates_presence_of :event
+    attr_accessible :item_type, :item_id, :event, :whodunnit, :object, :object_changes if PaperTrail.active_record_protected_attributes?
 
-  after_create :enforce_version_limit!
+    after_create :enforce_version_limit!
 
-  def self.with_item_keys(item_type, item_id)
-    where :item_type => item_type, :item_id => item_id
-  end
+    def self.with_item_keys(item_type, item_id)
+      where :item_type => item_type, :item_id => item_id
+    end
 
-  def self.creates
-    where :event => 'create'
-  end
+    def self.creates
+      where :event => 'create'
+    end
 
-  def self.updates
-    where :event => 'update'
-  end
+    def self.updates
+      where :event => 'update'
+    end
 
-  def self.destroys
-    where :event => 'destroy'
-  end
+    def self.destroys
+      where :event => 'destroy'
+    end
 
-  def self.not_creates
-    where 'event <> ?', 'create'
-  end
+    def self.not_creates
+      where 'event <> ?', 'create'
+    end
 
-  scope :subsequent, lambda { |version|
-    where("#{self.primary_key} > ?", version).order("#{self.primary_key} ASC")
-  }
-
-  scope :preceding, lambda { |version|
-    where("#{self.primary_key} < ?", version).order("#{self.primary_key} DESC")
-  }
-
-  scope :following, lambda { |timestamp|
-    # TODO: is this :order necessary, considering its presence on the has_many :versions association?
-    where("#{PaperTrail.timestamp_field} > ?", timestamp).
-      order("#{PaperTrail.timestamp_field} ASC, #{self.primary_key} ASC")
-  }
-
-  scope :between, lambda { |start_time, end_time|
-    where("#{PaperTrail.timestamp_field} > ? AND #{PaperTrail.timestamp_field} < ?", start_time, end_time).
-      order("#{PaperTrail.timestamp_field} ASC, #{self.primary_key} ASC")
-  }
-
-  # Restore the item from this version.
-  #
-  # This will automatically restore all :has_one associations as they were "at the time",
-  # if they are also being versioned by PaperTrail.  NOTE: this isn't always guaranteed
-  # to work so you can either change the lookback period (from the default 3 seconds) or
-  # opt out.
-  #
-  # Options:
-  # +:has_one+   set to `false` to opt out of has_one reification.
-  #              set to a float to change the lookback time (check whether your db supports
-  #              sub-second datetimes if you want them).
-  def reify(options = {})
-    without_identity_map do
-      options[:has_one] = 3 if options[:has_one] == true
-      options.reverse_merge! :has_one => false
-
-      unless object.nil?
-        attrs = PaperTrail.serializer.load object
-
-        # Normally a polymorphic belongs_to relationship allows us
-        # to get the object we belong to by calling, in this case,
-        # +item+.  However this returns nil if +item+ has been
-        # destroyed, and we need to be able to retrieve destroyed
-        # objects.
-        #
-        # In this situation we constantize the +item_type+ to get hold of
-        # the class...except when the stored object's attributes
-        # include a +type+ key.  If this is the case, the object
-        # we belong to is using single table inheritance and the
-        # +item_type+ will be the base class, not the actual subclass.
-        # If +type+ is present but empty, the class is the base class.
-
-        if item
-          model = item
-          # Look for attributes that exist in the model and not in this version. These attributes should be set to nil.
-          (model.attribute_names - attrs.keys).each { |k| attrs[k] = nil }
-        else
-          inheritance_column_name = item_type.constantize.inheritance_column
-          class_name = attrs[inheritance_column_name].blank? ? item_type : attrs[inheritance_column_name]
-          klass = class_name.constantize
-          model = klass.new
-        end
+    scope :subsequent, lambda { |version|
+      where("#{self.primary_key} > ?", version).order("#{self.primary_key} ASC")
+    }
+
+    scope :preceding, lambda { |version|
+      where("#{self.primary_key} < ?", version).order("#{self.primary_key} DESC")
+    }
+
+    scope :following, lambda { |timestamp|
+      # TODO: is this :order necessary, considering its presence on the has_many :versions association?
+      where("#{PaperTrail.timestamp_field} > ?", timestamp).
+        order("#{PaperTrail.timestamp_field} ASC, #{self.primary_key} ASC")
+    }
+
+    scope :between, lambda { |start_time, end_time|
+      where("#{PaperTrail.timestamp_field} > ? AND #{PaperTrail.timestamp_field} < ?", start_time, end_time).
+        order("#{PaperTrail.timestamp_field} ASC, #{self.primary_key} ASC")
+    }
+
+    # Restore the item from this version.
+    #
+    # This will automatically restore all :has_one associations as they were "at the time",
+    # if they are also being versioned by PaperTrail.  NOTE: this isn't always guaranteed
+    # to work so you can either change the lookback period (from the default 3 seconds) or
+    # opt out.
+    #
+    # Options:
+    # +:has_one+   set to `false` to opt out of has_one reification.
+    #              set to a float to change the lookback time (check whether your db supports
+    #              sub-second datetimes if you want them).
+    def reify(options = {})
+      without_identity_map do
+        options[:has_one] = 3 if options[:has_one] == true
+        options.reverse_merge! :has_one => false
+
+        unless object.nil?
+          attrs = PaperTrail.serializer.load object
+
+          # Normally a polymorphic belongs_to relationship allows us
+          # to get the object we belong to by calling, in this case,
+          # +item+.  However this returns nil if +item+ has been
+          # destroyed, and we need to be able to retrieve destroyed
+          # objects.
+          #
+          # In this situation we constantize the +item_type+ to get hold of
+          # the class...except when the stored object's attributes
+          # include a +type+ key.  If this is the case, the object
+          # we belong to is using single table inheritance and the
+          # +item_type+ will be the base class, not the actual subclass.
+          # If +type+ is present but empty, the class is the base class.
+
+          if item
+            model = item
+            # Look for attributes that exist in the model and not in this version. These attributes should be set to nil.
+            (model.attribute_names - attrs.keys).each { |k| attrs[k] = nil }
+          else
+            inheritance_column_name = item_type.constantize.inheritance_column
+            class_name = attrs[inheritance_column_name].blank? ? item_type : attrs[inheritance_column_name]
+            klass = class_name.constantize
+            model = klass.new
+          end
 
-        model.class.unserialize_attributes_for_paper_trail attrs
+          model.class.unserialize_attributes_for_paper_trail attrs
 
-        # Set all the attributes in this version on the model
-        attrs.each do |k, v|
-          if model.respond_to?("#{k}=")
-            model[k.to_sym] = v
-          else
-            logger.warn "Attribute #{k} does not exist on #{item_type} (Version id: #{id})."
+          # Set all the attributes in this version on the model
+          attrs.each do |k, v|
+            if model.respond_to?("#{k}=")
+              model[k.to_sym] = v
+            else
+              logger.warn "Attribute #{k} does not exist on #{item_type} (Version id: #{id})."
+            end
           end
-        end
 
-        model.send "#{model.class.version_association_name}=", self
+          model.send "#{model.class.version_association_name}=", self
 
-        unless options[:has_one] == false
-          reify_has_ones model, options[:has_one]
-        end
+          unless options[:has_one] == false
+            reify_has_ones model, options[:has_one]
+          end
 
-        model
+          model
+        end
       end
     end
-  end
 
-  # Returns what changed in this version of the item.  Cf. `ActiveModel::Dirty#changes`.
-  # Returns nil if your `versions` table does not have an `object_changes` text column.
-  def changeset
-    return nil unless self.class.column_names.include? 'object_changes'
+    # Returns what changed in this version of the item.  Cf. `ActiveModel::Dirty#changes`.
+    # Returns nil if your `versions` table does not have an `object_changes` text column.
+    def changeset
+      return nil unless self.class.column_names.include? 'object_changes'
 
-    HashWithIndifferentAccess.new(PaperTrail.serializer.load(object_changes)).tap do |changes|
-      item_type.constantize.unserialize_attribute_changes(changes)
+      HashWithIndifferentAccess.new(PaperTrail.serializer.load(object_changes)).tap do |changes|
+        item_type.constantize.unserialize_attribute_changes(changes)
+      end
+    rescue
+      {}
     end
-  rescue
-    {}
-  end
 
-  # Returns who put the item into the state stored in this version.
-  def originator
-    previous.try :whodunnit
-  end
+    # Returns who put the item into the state stored in this version.
+    def originator
+      previous.try :whodunnit
+    end
 
-  # Returns who changed the item from the state it had in this version.
-  # This is an alias for `whodunnit`.
-  def terminator
-    whodunnit
-  end
+    # Returns who changed the item from the state it had in this version.
+    # This is an alias for `whodunnit`.
+    def terminator
+      whodunnit
+    end
 
-  def sibling_versions
-    self.class.with_item_keys(item_type, item_id)
-  end
+    def sibling_versions
+      self.class.with_item_keys(item_type, item_id)
+    end
 
-  def next
-    sibling_versions.subsequent(self).first
-  end
+    def next
+      sibling_versions.subsequent(self).first
+    end
 
-  def previous
-    sibling_versions.preceding(self).first
-  end
+    def previous
+      sibling_versions.preceding(self).first
+    end
 
-  def index
-    id_column = self.class.primary_key.to_sym
-    sibling_versions.select(id_column).order("#{id_column} ASC").map(&id_column).index(self.send(id_column))
-  end
+    def index
+      id_column = self.class.primary_key.to_sym
+      sibling_versions.select(id_column).order("#{id_column} ASC").map(&id_column).index(self.send(id_column))
+    end
 
-  private
+    private
 
-  # In Rails 3.1+, calling reify on a previous version confuses the
-  # IdentityMap, if enabled. This prevents insertion into the map.
-  def without_identity_map(&block)
-    if defined?(ActiveRecord::IdentityMap) && ActiveRecord::IdentityMap.respond_to?(:without)
-      ActiveRecord::IdentityMap.without(&block)
-    else
-      block.call
+    # In Rails 3.1+, calling reify on a previous version confuses the
+    # IdentityMap, if enabled. This prevents insertion into the map.
+    def without_identity_map(&block)
+      if defined?(ActiveRecord::IdentityMap) && ActiveRecord::IdentityMap.respond_to?(:without)
+        ActiveRecord::IdentityMap.without(&block)
+      else
+        block.call
+      end
     end
-  end
 
-  # Restore the `model`'s has_one associations as they were when this version was
-  # superseded by the next (because that's what the user was looking at when they
-  # made the change).
-  #
-  # The `lookback` sets how many seconds before the model's change we go.
-  def reify_has_ones(model, lookback)
-    model.class.reflect_on_all_associations(:has_one).each do |assoc|
-      child = model.send assoc.name
-      if child.respond_to? :version_at
-        # N.B. we use version of the child as it was `lookback` seconds before the parent was updated.
-        # Ideally we want the version of the child as it was just before the parent was updated...
-        # but until PaperTrail knows which updates are "together" (e.g. parent and child being
-        # updated on the same form), it's impossible to tell when the overall update started;
-        # and therefore impossible to know when "just before" was.
-        if (child_as_it_was = child.version_at(send(PaperTrail.timestamp_field) - lookback.seconds))
-          child_as_it_was.attributes.each do |k,v|
-            model.send(assoc.name).send :write_attribute, k.to_sym, v rescue nil
+    # Restore the `model`'s has_one associations as they were when this version was
+    # superseded by the next (because that's what the user was looking at when they
+    # made the change).
+    #
+    # The `lookback` sets how many seconds before the model's change we go.
+    def reify_has_ones(model, lookback)
+      model.class.reflect_on_all_associations(:has_one).each do |assoc|
+        child = model.send assoc.name
+        if child.respond_to? :version_at
+          # N.B. we use version of the child as it was `lookback` seconds before the parent was updated.
+          # Ideally we want the version of the child as it was just before the parent was updated...
+          # but until PaperTrail knows which updates are "together" (e.g. parent and child being
+          # updated on the same form), it's impossible to tell when the overall update started;
+          # and therefore impossible to know when "just before" was.
+          if (child_as_it_was = child.version_at(send(PaperTrail.timestamp_field) - lookback.seconds))
+            child_as_it_was.attributes.each do |k,v|
+              model.send(assoc.name).send :write_attribute, k.to_sym, v rescue nil
+            end
+          else
+            model.send "#{assoc.name}=", nil
           end
-        else
-          model.send "#{assoc.name}=", nil
         end
       end
     end
+
+    # checks to see if a value has been set for the `version_limit` config option, and if so enforces it
+    def enforce_version_limit!
+      return unless PaperTrail.config.version_limit.is_a? Numeric
+      previous_versions = sibling_versions.not_creates
+      return unless previous_versions.size > PaperTrail.config.version_limit
+      excess_previous_versions = previous_versions - previous_versions.last(PaperTrail.config.version_limit)
+      excess_previous_versions.map(&:destroy)
+    end
+
   end
+end
 
-  # checks to see if a value has been set for the `version_limit` config option, and if so enforces it
-  def enforce_version_limit!
-    return unless PaperTrail.config.version_limit.is_a? Numeric
-    previous_versions = sibling_versions.not_creates
-    return unless previous_versions.size > PaperTrail.config.version_limit
-    excess_previous_versions = previous_versions - previous_versions.last(PaperTrail.config.version_limit)
-    excess_previous_versions.map(&:destroy)
+# Legacy support for old applications using the original non-namespaced `Version` class
+class Version < PaperTrail::Version
+  def initialize(*args)
+    warn "DEPRECATED: Please use the namespaced `PaperTrail::Version` class instead. Support for the non-namespaced `Version` class will be removed in PaperTrail 3.1."
+    super
   end
 
+  class << self
+    def find(*args)
+      warn "DEPRECATED: Please use the namespaced `PaperTrail::Version` class instead. Support for the non-namespaced `Version` class will be removed in PaperTrail 3.1."
+      super
+    end
+
+    def first(*args)
+      warn "DEPRECATED: Please use the namespaced `PaperTrail::Version` class instead. Support for the non-namespaced `Version` class will be removed in PaperTrail 3.1."
+      super
+    end
+
+    def last(*args)
+      warn "DEPRECATED: Please use the namespaced `PaperTrail::Version` class instead. Support for the non-namespaced `Version` class will be removed in PaperTrail 3.1."
+      super
+    end
+  end
 end