paper_trail 4.2.0 → 5.0.0

data/lib/paper_trail/frameworks/sinatra.rb

@@ -1,8 +1,8 @@
-require 'active_support/core_ext/object' # provides the `try` method
+require "active_support/core_ext/object" # provides the `try` method
 
 module PaperTrail
+  # Extensions to `Sinatra`.
   module Sinatra
-
     # Register this module inside your Sinatra application to gain access to
     # controller-level methods used by PaperTrail.
     def self.registered(app)
@@ -29,10 +29,12 @@ module PaperTrail
 
     # Tells PaperTrail who is responsible for any changes that occur.
     def set_paper_trail_whodunnit
+      @set_paper_trail_whodunnit_called = true
       ::PaperTrail.whodunnit = user_for_paper_trail if ::PaperTrail.enabled?
     end
-
   end
+end
 
-  ::Sinatra.register PaperTrail::Sinatra if defined?(::Sinatra)
+if defined?(::Sinatra)
+  ::Sinatra.register(::PaperTrail::Sinatra)
 end

data/lib/paper_trail/has_paper_trail.rb

@@ -1,13 +1,15 @@
-require 'active_support/core_ext/object' # provides the `try` method
-require 'paper_trail/attributes_serialization'
+require "active_support/core_ext/object" # provides the `try` method
+require "paper_trail/attributes_serialization"
 
 module PaperTrail
+  # Extensions to `ActiveRecord::Base`.  See `frameworks/active_record.rb`.
   module Model
-
     def self.included(base)
       base.send :extend, ClassMethods
+      base.send :attr_accessor, :paper_trail_habtm
     end
 
+    # :nodoc:
     module ClassMethods
       # Declare this in your model to track every create, update, and destroy.
       # Each version of the model is available in the `versions` association.
@@ -45,7 +47,14 @@ module PaperTrail
       #   the instance was reified from. Default is `:version`.
       # - :save_changes - Whether or not to save changes to the object_changes
       #   column if it exists. Default is true
+      # - :join_tables - If the model has a has_and_belongs_to_many relation
+      #   with an unpapertrailed model, passing the name of the association to
+      #   the join_tables option will paper trail the join table but not save
+      #   the other model, allowing reification of the association but with the
+      #   other models latest state (if the other model is paper trailed, this
+      #   option does nothing)
       #
+      # @api public
       def has_paper_trail(options = {})
         options[:on] ||= [:create, :update, :destroy]
 
@@ -56,8 +65,47 @@ module PaperTrail
         setup_model_for_paper_trail(options)
 
         setup_callbacks_from_options options[:on]
+
+        setup_callbacks_for_habtm options[:join_tables]
+      end
+
+      def update_for_callback(name, callback, model, assoc)
+        model.paper_trail_habtm ||= {}
+        model.paper_trail_habtm.reverse_merge!(name => { removed: [], added: [] })
+        case callback
+        when :before_add
+          model.paper_trail_habtm[name][:added] |= [assoc.id]
+          model.paper_trail_habtm[name][:removed] -= [assoc.id]
+        when :before_remove
+          model.paper_trail_habtm[name][:removed] |= [assoc.id]
+          model.paper_trail_habtm[name][:added] -= [assoc.id]
+        end
+      end
+
+      attr_reader :paper_trail_save_join_tables
+
+      def setup_callbacks_for_habtm(join_tables)
+        @paper_trail_save_join_tables = Array.wrap(join_tables)
+        # Adds callbacks to record changes to habtm associations such that on
+        # save the previous version of the association (if changed) can be
+        # interpreted
+        reflect_on_all_associations(:has_and_belongs_to_many).
+          reject { |a| paper_trail_options[:skip].include?(a.name.to_s) }.
+          each do |a|
+            added_callback = lambda do |*args|
+              update_for_callback(a.name, :before_add, args[-2], args.last)
+            end
+            removed_callback = lambda do |*args|
+              update_for_callback(a.name, :before_remove, args[-2], args.last)
+            end
+            send(:"before_add_for_#{a.name}").send(:<<, added_callback)
+            send(:"before_remove_for_#{a.name}").send(:<<, removed_callback)
+          end
       end
 
+      # Installs callbacks, associations, "class attributes", and more.
+      # For details of how "class attributes" work, see the activesupport docs.
+      # @api private
       def setup_model_for_paper_trail(options = {})
         # Lazily include the instance methods so we don't clutter up
         # any more ActiveRecord models than we have to.
@@ -68,22 +116,12 @@ module PaperTrail
         self.version_association_name = options[:version] || :version
 
         # The version this instance was reified from.
-        attr_accessor self.version_association_name
+        attr_accessor version_association_name
 
         class_attribute :version_class_name
-        self.version_class_name = options[:class_name] || 'PaperTrail::Version'
+        self.version_class_name = options[:class_name] || "PaperTrail::Version"
 
-        class_attribute :paper_trail_options
-
-        self.paper_trail_options = options.dup
-
-        [:ignore, :skip, :only].each do |k|
-          paper_trail_options[k] =
-            [paper_trail_options[k]].flatten.compact.map { |attr| attr.is_a?(Hash) ? attr.stringify_keys : attr.to_s }
-        end
-
-        paper_trail_options[:meta] ||= {}
-        paper_trail_options[:save_changes] = true if paper_trail_options[:save_changes].nil?
+        setup_paper_trail_options(options)
 
         class_attribute :versions_association_name
         self.versions_association_name = options[:versions] || :versions
@@ -92,14 +130,14 @@ module PaperTrail
 
         # `has_many` syntax for specifying order uses a lambda in Rails 4
         if ::ActiveRecord::VERSION::MAJOR >= 4
-          has_many self.versions_association_name,
-            lambda { order(model.timestamp_sort_order) },
-            :class_name => self.version_class_name, :as => :item
+          has_many versions_association_name,
+            -> { order(model.timestamp_sort_order) },
+            class_name: version_class_name, as: :item
         else
-          has_many self.versions_association_name,
-            :class_name => self.version_class_name,
-            :as         => :item,
-            :order      => self.paper_trail_version_class.timestamp_sort_order
+          has_many versions_association_name,
+            class_name: version_class_name,
+            as: :item,
+            order: paper_trail_version_class.timestamp_sort_order
         end
 
         # Reset the transaction id when the transaction is closed.
@@ -108,6 +146,22 @@ module PaperTrail
         after_rollback :clear_rolled_back_versions
       end
 
+      # Given `options`, populates `paper_trail_options`.
+      # @api private
+      def setup_paper_trail_options(options)
+        class_attribute :paper_trail_options
+        self.paper_trail_options = options.dup
+        [:ignore, :skip, :only].each do |k|
+          paper_trail_options[k] = [paper_trail_options[k]].flatten.compact.map { |attr|
+            attr.is_a?(Hash) ? attr.stringify_keys : attr.to_s
+          }
+        end
+        paper_trail_options[:meta] ||= {}
+        if paper_trail_options[:save_changes].nil?
+          paper_trail_options[:save_changes] = true
+        end
+      end
+
       def setup_callbacks_from_options(options_on = [])
         options_on.each do |option|
           send "paper_trail_on_#{option}"
@@ -115,13 +169,13 @@ module PaperTrail
       end
 
       # Record version before or after "destroy" event
-      def paper_trail_on_destroy(recording_order = 'after')
-        unless %w[after before].include?(recording_order.to_s)
-          fail ArgumentError, 'recording order can only be "after" or "before"'
+      def paper_trail_on_destroy(recording_order = "before")
+        unless %w(after before).include?(recording_order.to_s)
+          raise ArgumentError, 'recording order can only be "after" or "before"'
         end
 
-        if recording_order.to_s == 'after' and
-          Gem::Version.new(ActiveRecord::VERSION::STRING).release >= Gem::Version.new("5")
+        if recording_order == "after" &&
+            Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("5")
           if ::ActiveRecord::Base.belongs_to_required_by_default
             ::ActiveSupport::Deprecation.warn(
               "paper_trail_on_destroy(:after) is incompatible with ActiveRecord " +
@@ -131,7 +185,7 @@ module PaperTrail
           end
         end
 
-        send "#{recording_order}_destroy", :record_destroy, :if => :save_version?
+        send "#{recording_order}_destroy", :record_destroy, if: :save_version?
 
         return if paper_trail_options[:on].include?(:destroy)
         paper_trail_options[:on] << :destroy
@@ -139,10 +193,8 @@ module PaperTrail
 
       # Record version after "update" event
       def paper_trail_on_update
-        before_save  :reset_timestamp_attrs_for_update_if_needed!,
-                     :on => :update
-        after_update :record_update,
-                     :if => :save_version?
+        before_save :reset_timestamp_attrs_for_update_if_needed!, on: :update
+        after_update :record_update, if: :save_version?
         after_update :clear_version_instance!
 
         return if paper_trail_options[:on].include?(:update)
@@ -151,8 +203,7 @@ module PaperTrail
 
       # Record version after "create" event
       def paper_trail_on_create
-        after_create :record_create,
-                     :if => :save_version?
+        after_create :record_create, if: :save_version?
 
         return if paper_trail_options[:on].include?(:create)
         paper_trail_options[:on] << :create
@@ -169,7 +220,7 @@ module PaperTrail
       end
 
       def paper_trail_enabled_for_model?
-        return false unless self.include?(PaperTrail::Model::InstanceMethods)
+        return false unless include?(PaperTrail::Model::InstanceMethods)
         PaperTrail.enabled_for_model?(self)
       end
 
@@ -194,34 +245,43 @@ module PaperTrail
 
       def originator
         ::ActiveSupport::Deprecation.warn "Use paper_trail_originator instead of originator."
-        self.paper_trail_originator
+        paper_trail_originator
       end
 
       # Invoked after rollbacks to ensure versions records are not created
-      # for changes that never actually took place
+      # for changes that never actually took place.
+      # Optimization: Use lazy `reset` instead of eager `reload` because, in
+      # many use cases, the association will not be used.
       def clear_rolled_back_versions
-        send(self.class.versions_association_name).reload
+        send(self.class.versions_association_name).reset
       end
 
       # Returns the object (not a Version) as it was at the given timestamp.
-      def version_at(timestamp, reify_options={})
+      def version_at(timestamp, reify_options = {})
         # Because a version stores how its object looked *before* the change,
         # we need to look for the first version created *after* the timestamp.
         v = send(self.class.versions_association_name).subsequent(timestamp, true).first
         return v.reify(reify_options) if v
-        self unless self.destroyed?
+        self unless destroyed?
       end
 
       # Returns the objects (not Versions) as they were between the given times.
-      def versions_between(start_time, end_time, reify_options={})
+      # TODO: Either add support for the third argument, `_reify_options`, or
+      # add a deprecation warning if someone tries to use it.
+      def versions_between(start_time, end_time, _reify_options = {})
         versions = send(self.class.versions_association_name).between(start_time, end_time)
-        versions.collect { |version| version_at(version.send PaperTrail.timestamp_field) }
+        versions.collect { |version| version_at(version.send(PaperTrail.timestamp_field)) }
       end
 
       # Returns the object (not a Version) as it was most recently.
       def previous_version
-        preceding_version = source_version ? source_version.previous : send(self.class.versions_association_name).last
-        preceding_version.reify if preceding_version
+        previous =
+          if source_version
+            source_version.previous
+          else
+            send(self.class.versions_association_name).last
+          end
+        previous.try(:reify)
       end
 
       # Returns the object (not a Version) as it became next.
@@ -229,7 +289,7 @@ module PaperTrail
       #  "live" item, we return nil.  Perhaps we should return self instead?
       def next_version
         subsequent_version = source_version.next
-        subsequent_version ? subsequent_version.reify : self.class.find(self.id)
+        subsequent_version ? subsequent_version.reify : self.class.find(id)
       rescue
         nil
       end
@@ -240,7 +300,7 @@ module PaperTrail
 
       # Executes the given method or block without creating a new version.
       def without_versioning(method = nil)
-        paper_trail_was_enabled = self.paper_trail_enabled_for_model?
+        paper_trail_was_enabled = paper_trail_enabled_for_model?
         self.class.paper_trail_off!
         method ? method.to_proc.call(self) : yield(self)
       ensure
@@ -249,6 +309,7 @@ module PaperTrail
 
       # Utility method for reifying. Anything executed inside the block will
       # appear like a new record.
+      # rubocop: disable Style/Alias
       def appear_as_new_record
         instance_eval {
           alias :old_new_record? :new_record?
@@ -257,11 +318,12 @@ module PaperTrail
         yield
         instance_eval { alias :new_record? :old_new_record? }
       end
+      # rubocop: enable Style/Alias
 
       # Temporarily overwrites the value of whodunnit and then executes the
       # provided block.
       def whodunnit(value)
-        raise ArgumentError, 'expected to receive a block' unless block_given?
+        raise ArgumentError, "expected to receive a block" unless block_given?
         current_whodunnit = PaperTrail.whodunnit
         PaperTrail.whodunnit = value
         yield self
@@ -287,7 +349,7 @@ module PaperTrail
         attributes.each { |column| write_attribute(column, current_time) }
 
         record_update(true) unless will_record_after_update?
-        save!(:validate => false)
+        save!(validate: false)
       end
 
       private
@@ -306,8 +368,8 @@ module PaperTrail
       def record_create
         if paper_trail_switched_on?
           data = {
-            :event     => paper_trail_event || 'create',
-            :whodunnit => PaperTrail.whodunnit
+            event: paper_trail_event || "create",
+            whodunnit: PaperTrail.whodunnit
           }
           if respond_to?(:updated_at)
             data[PaperTrail.timestamp_field] = updated_at
@@ -315,11 +377,11 @@ module PaperTrail
           if pt_record_object_changes? && changed_notably?
             data[:object_changes] = pt_recordable_object_changes
           end
-          if self.class.paper_trail_version_class.column_names.include?('transaction_id')
+          if self.class.paper_trail_version_class.column_names.include?("transaction_id")
             data[:transaction_id] = PaperTrail.transaction_id
           end
           version = send(self.class.versions_association_name).create! merge_metadata(data)
-          set_transaction_id(version)
+          update_transaction_id(version)
           save_associations(version)
         end
       end
@@ -327,9 +389,9 @@ module PaperTrail
       def record_update(force = nil)
         if paper_trail_switched_on? && (force || changed_notably?)
           data = {
-            :event     => paper_trail_event || 'update',
-            :object    => pt_recordable_object,
-            :whodunnit => PaperTrail.whodunnit
+            event: paper_trail_event || "update",
+            object: pt_recordable_object,
+            whodunnit: PaperTrail.whodunnit
           }
           if respond_to?(:updated_at)
             data[PaperTrail.timestamp_field] = updated_at
@@ -337,11 +399,11 @@ module PaperTrail
           if pt_record_object_changes?
             data[:object_changes] = pt_recordable_object_changes
           end
-          if self.class.paper_trail_version_class.column_names.include?('transaction_id')
+          if self.class.paper_trail_version_class.column_names.include?("transaction_id")
             data[:transaction_id] = PaperTrail.transaction_id
           end
           version = send(self.class.versions_association_name).create merge_metadata(data)
-          set_transaction_id(version)
+          update_transaction_id(version)
           save_associations(version)
         end
       end
@@ -351,7 +413,7 @@ module PaperTrail
       # @api private
       def pt_record_object_changes?
         paper_trail_options[:save_changes] &&
-          self.class.paper_trail_version_class.column_names.include?('object_changes')
+          self.class.paper_trail_version_class.column_names.include?("object_changes")
       end
 
       # Returns an object which can be assigned to the `object` attribute of a
@@ -361,11 +423,10 @@ module PaperTrail
       # `PaperTrail.serializer`.
       # @api private
       def pt_recordable_object
-        object_attrs = object_attrs_for_paper_trail(attributes_before_change)
         if self.class.paper_trail_version_class.object_col_is_json?
-          object_attrs
+          object_attrs_for_paper_trail
         else
-          PaperTrail.serializer.dump(object_attrs)
+          PaperTrail.serializer.dump(object_attrs_for_paper_trail)
         end
       end
 
@@ -384,9 +445,9 @@ module PaperTrail
       end
 
       def changes_for_paper_trail
-        _changes = changes.delete_if { |k,v| !notably_changed.include?(k) }
-        self.class.serialize_attribute_changes_for_paper_trail!(_changes)
-        _changes.to_hash
+        notable_changes = changes.delete_if { |k, _v| !notably_changed.include?(k) }
+        self.class.serialize_attribute_changes_for_paper_trail!(notable_changes)
+        notable_changes.to_hash
       end
 
       # Invoked via`after_update` callback for when a previous version is
@@ -398,7 +459,7 @@ module PaperTrail
       # Invoked via callback when a user attempts to persist a reified
       # `Version`.
       def reset_timestamp_attrs_for_update_if_needed!
-        return if self.live?
+        return if live?
         timestamp_attributes_for_update_in_model.each do |column|
           # ActiveRecord 4.2 deprecated `reset_column!` in favor of
           # `restore_column!`.
@@ -411,21 +472,21 @@ module PaperTrail
       end
 
       def record_destroy
-        if paper_trail_switched_on? and not new_record?
+        if paper_trail_switched_on? && !new_record?
           data = {
-            :item_id   => self.id,
-            :item_type => self.class.base_class.name,
-            :event     => paper_trail_event || 'destroy',
-            :object    => pt_recordable_object,
-            :whodunnit => PaperTrail.whodunnit
+            item_id: id,
+            item_type: self.class.base_class.name,
+            event: paper_trail_event || "destroy",
+            object: pt_recordable_object,
+            whodunnit: PaperTrail.whodunnit
           }
-          if self.class.paper_trail_version_class.column_names.include?('transaction_id')
+          if self.class.paper_trail_version_class.column_names.include?("transaction_id")
             data[:transaction_id] = PaperTrail.transaction_id
           end
           version = self.class.paper_trail_version_class.create(merge_metadata(data))
           send("#{self.class.version_association_name}=", version)
           send(self.class.versions_association_name).send :load_target
-          set_transaction_id(version)
+          update_transaction_id(version)
           save_associations(version)
         end
       end
@@ -433,31 +494,50 @@ module PaperTrail
       # Saves associations if the join table for `VersionAssociation` exists.
       def save_associations(version)
         return unless PaperTrail.config.track_associations?
+        save_associations_belongs_to(version)
+        save_associations_has_and_belongs_to_many(version)
+      end
+
+      def save_associations_belongs_to(version)
         self.class.reflect_on_all_associations(:belongs_to).each do |assoc|
           assoc_version_args = {
-              :version_id => version.id,
-              :foreign_key_name => assoc.foreign_key
+            version_id: version.id,
+            foreign_key_name: assoc.foreign_key
           }
 
           if assoc.options[:polymorphic]
             associated_record = send(assoc.name) if send(assoc.foreign_type)
             if associated_record && associated_record.class.paper_trail_enabled_for_model?
-              assoc_version_args.merge!(:foreign_key_id => associated_record.id)
+              assoc_version_args[:foreign_key_id] = associated_record.id
             end
           elsif assoc.klass.paper_trail_enabled_for_model?
-            assoc_version_args.merge!(:foreign_key_id => send(assoc.foreign_key))
+            assoc_version_args[:foreign_key_id] = send(assoc.foreign_key)
           end
 
-          PaperTrail::VersionAssociation.create(assoc_version_args) if assoc_version_args.has_key?(:foreign_key_id)
+          if assoc_version_args.key?(:foreign_key_id)
+            PaperTrail::VersionAssociation.create(assoc_version_args)
+          end
         end
       end
 
-      def set_transaction_id(version)
-        return unless self.class.paper_trail_version_class.column_names.include?('transaction_id')
-        if PaperTrail.transaction? && PaperTrail.transaction_id.nil?
-           PaperTrail.transaction_id = version.id
-           version.transaction_id = version.id
-           version.save
+      def save_associations_has_and_belongs_to_many(version)
+        # Use the :added and :removed keys to extrapolate the HABTM associations
+        # to before any changes were made
+        self.class.reflect_on_all_associations(:has_and_belongs_to_many).each do |a|
+          next unless
+            self.class.paper_trail_save_join_tables.include?(a.name) ||
+                a.klass.paper_trail_enabled_for_model?
+          assoc_version_args = {
+            version_id: version.id,
+            foreign_key_name: a.name
+          }
+          assoc_ids =
+            send(a.name).to_a.map(&:id) +
+            (@paper_trail_habtm.try(:[], a.name).try(:[], :removed) || []) -
+            (@paper_trail_habtm.try(:[], a.name).try(:[], :added) || [])
+          assoc_ids.each do |id|
+            PaperTrail::VersionAssociation.create(assoc_version_args.merge(foreign_key_id: id))
+          end
         end
       end
 
@@ -467,14 +547,14 @@ module PaperTrail
 
       def merge_metadata(data)
         # First we merge the model-level metadata in `meta`.
-        paper_trail_options[:meta].each do |k,v|
+        paper_trail_options[:meta].each do |k, v|
           data[k] =
             if v.respond_to?(:call)
               v.call(self)
-            elsif v.is_a?(Symbol) && respond_to?(v)
+            elsif v.is_a?(Symbol) && respond_to?(v, true)
               # If it is an attribute that is changing in an existing object,
               # be sure to grab the current version.
-              if has_attribute?(v) && send("#{v}_changed?".to_sym) && data[:event] != 'create'
+              if has_attribute?(v) && send("#{v}_changed?".to_sym) && data[:event] != "create"
                 send("#{v}_was".to_sym)
               else
                 send(v)
@@ -489,19 +569,14 @@ module PaperTrail
       end
 
       def attributes_before_change
-        attributes.tap do |prev|
-          enums = self.respond_to?(:defined_enums) ? self.defined_enums : {}
-          changed_attributes.select { |k,v| self.class.column_names.include?(k) }.each do |attr, before|
-            before = enums[attr][before] if enums[attr]
-            prev[attr] = before
-          end
-        end
+        changed = changed_attributes.select { |k, _v| self.class.column_names.include?(k) }
+        attributes.merge(changed)
       end
 
       # Returns hash of attributes (with appropriate attributes serialized),
       # ommitting attributes to be skipped.
-      def object_attrs_for_paper_trail(attributes_hash)
-        attrs = attributes_hash.except(*self.paper_trail_options[:skip])
+      def object_attrs_for_paper_trail
+        attrs = attributes_before_change.except(*paper_trail_options[:skip])
         self.class.serialize_attributes_for_paper_trail!(attrs)
         attrs
       end
@@ -522,40 +597,58 @@ module PaperTrail
       # and/or the `:skip` option.  Returns true if an ignored attribute has
       # changed.
       def ignored_attr_has_changed?
-        ignored = self.paper_trail_options[:ignore] + self.paper_trail_options[:skip]
+        ignored = paper_trail_options[:ignore] + paper_trail_options[:skip]
         ignored.any? && (changed & ignored).any?
       end
 
       def notably_changed
-        only = self.paper_trail_options[:only].dup
+        only = paper_trail_options[:only].dup
         # Remove Hash arguments and then evaluate whether the attributes (the
         # keys of the hash) should also get pushed into the collection.
         only.delete_if do |obj|
-          obj.is_a?(Hash) && obj.each { |attr, condition| only << attr if condition.respond_to?(:call) && condition.call(self) }
+          obj.is_a?(Hash) &&
+            obj.each { |attr, condition|
+              only << attr if condition.respond_to?(:call) && condition.call(self)
+            }
         end
         only.empty? ? changed_and_not_ignored : (changed_and_not_ignored & only)
       end
 
       def changed_and_not_ignored
-        ignore = self.paper_trail_options[:ignore].dup
+        ignore = paper_trail_options[:ignore].dup
         # Remove Hash arguments and then evaluate whether the attributes (the
         # keys of the hash) should also get pushed into the collection.
         ignore.delete_if do |obj|
-          obj.is_a?(Hash) && obj.each { |attr, condition| ignore << attr if condition.respond_to?(:call) && condition.call(self) }
+          obj.is_a?(Hash) &&
+            obj.each { |attr, condition|
+              ignore << attr if condition.respond_to?(:call) && condition.call(self)
+            }
         end
-        skip = self.paper_trail_options[:skip]
+        skip = paper_trail_options[:skip]
         changed - ignore - skip
       end
 
       def paper_trail_switched_on?
-        PaperTrail.enabled? && PaperTrail.enabled_for_controller? && self.paper_trail_enabled_for_model?
+        PaperTrail.enabled? &&
+          PaperTrail.enabled_for_controller? &&
+          paper_trail_enabled_for_model?
       end
 
       def save_version?
-        if_condition     = self.paper_trail_options[:if]
-        unless_condition = self.paper_trail_options[:unless]
+        if_condition = paper_trail_options[:if]
+        unless_condition = paper_trail_options[:unless]
         (if_condition.blank? || if_condition.call(self)) && !unless_condition.try(:call, self)
       end
+
+      # @api private
+      def update_transaction_id(version)
+        return unless self.class.paper_trail_version_class.column_names.include?("transaction_id")
+        if PaperTrail.transaction? && PaperTrail.transaction_id.nil?
+          PaperTrail.transaction_id = version.id
+          version.transaction_id = version.id
+          version.save
+        end
+      end
     end
   end
 end