paper_trail 9.0.1 → 9.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c8b21b88ed51a36003e6df11297955cfba569f71d3c6de6be11715a94ec63c9
-  data.tar.gz: 11b1b625dd80e75f3218a047d9caf69ead79e18bf79dc7f7b5e597b0f4b7f7a4
+  metadata.gz: 72cf4448b84e8e0f78e7be203e482f5c00b66801faa4a7ca518eb5e9676d97a7
+  data.tar.gz: e884a18e85ac0ff2acc31f1a568c4c9b9356b0ae48c7d9eee138ff98ae02a25d
 SHA512:
-  metadata.gz: 6e024e2ad10466f53e07edc2d0683de403034cdedf49b2f6440c3fe8c59b37f90a46ec1f6ddcf1412b21dfa4c0369e3caefe701eb05c4c30e9701a2c6666d1ff
-  data.tar.gz: 6c98b6f10cc6a4e4e0b8d0b516d3d89eec54243624a544b4b7bea7963400b38c944bdbe2d438ead507bc43f57b71fada18b7fd0f5caa51338c6c357c59e66345
+  metadata.gz: cab08ca6b72ae854eaf85e901f3c2ca090d70e04f32e65eb6f41fc6ee7699414ee5d7c889332b7d37f6a8f1ca82fa90394bee51f5d6ad7e25e9c7a440f5f3f00
+  data.tar.gz: cda3a9f844b20d635f0bb1317a528301ed754f2ae8d45bcc4f8461d2abb8eda5b4e87b6298a0bfb873407195c9d427959267a161a5d0cd0ddf396270973f5d30

data/lib/generators/paper_trail/install_generator.rb

@@ -73,7 +73,7 @@ module PaperTrail
     private
 
     # MySQL 5.6 utf8mb4 limit is 191 chars for keys used in indexes.
-    # See https://github.com/airblade/paper_trail/issues/651
+    # See https://github.com/paper-trail-gem/paper_trail/issues/651
     def item_type_options
       opt = { null: false }
       opt[:limit] = 191 if mysql?

data/lib/paper_trail.rb

@@ -110,6 +110,9 @@ module PaperTrail
 
     # Returns PaperTrail's `::Gem::Version`, convenient for comparisons. This is
     # recommended over `::PaperTrail::VERSION::STRING`.
+    #
+    # Added in 7.0.0
+    #
     # @api public
     def gem_version
       ::Gem::Version.new(VERSION::STRING)

data/lib/paper_trail/config.rb

@@ -11,13 +11,13 @@ module PaperTrail
       Association tracking is an endangered feature. For the past three or four
       years it has been an experimental feature, not recommended for production.
       It has a long list of known issues
-      (https://github.com/airblade/paper_trail#4b1-known-issues) and has no
+      (https://github.com/paper-trail-gem/paper_trail#4b1-known-issues) and has no
       regular volunteers caring for it.
 
       If you don't use this feature, I strongly recommend disabling it.
 
       If you do use this feature, please head over to
-      https://github.com/airblade/paper_trail/issues/1070 and volunteer to work
+      https://github.com/paper-trail-gem/paper_trail/issues/1070 and volunteer to work
       on the known issues.
 
       If we can't make a serious dent in the list of known issues over the next

data/lib/paper_trail/model_config.rb

@@ -106,7 +106,11 @@ module PaperTrail
       }
       @model_class.after_update { |r|
         if r.paper_trail.save_version?
-          r.paper_trail.record_update(force: false, in_after_callback: true)
+          r.paper_trail.record_update(
+            force: false,
+            in_after_callback: true,
+            is_touch: false
+          )
         end
       }
       @model_class.after_update { |r|
@@ -120,7 +124,11 @@ module PaperTrail
     # @api public
     def on_touch
       @model_class.after_touch { |r|
-        r.paper_trail.record_update(force: true, in_after_callback: true)
+        r.paper_trail.record_update(
+          force: true,
+          in_after_callback: true,
+          is_touch: true
+        )
       }
     end
 

data/lib/paper_trail/record_trail.rb

@@ -56,7 +56,7 @@ module PaperTrail
     # > something) from running. By also stubbing out persisted? we can
     # > actually prevent those. A more stable option might be to use suppress
     # > instead, similar to the other branch in reify_has_one.
-    # > -Sean Griffin (https://github.com/airblade/paper_trail/pull/899)
+    # > -Sean Griffin (https://github.com/paper-trail-gem/paper_trail/pull/899)
     #
     # @api private
     def appear_as_new_record
@@ -73,10 +73,10 @@ module PaperTrail
       }
     end
 
-    def attributes_before_change
+    def attributes_before_change(is_touch)
       Hash[@record.attributes.map do |k, v|
         if @record.class.column_names.include?(k)
-          [k, attribute_in_previous_version(k)]
+          [k, attribute_in_previous_version(k, is_touch)]
         else
           [k, v]
         end
@@ -204,7 +204,7 @@ module PaperTrail
         if event != "create" &&
             @record.has_attribute?(value) &&
             attribute_changed_in_latest_version?(value)
-          attribute_in_previous_version(value)
+          attribute_in_previous_version(value, false)
         else
           @record.send(value)
         end
@@ -240,8 +240,9 @@ module PaperTrail
     # omitting attributes to be skipped.
     #
     # @api private
-    def object_attrs_for_paper_trail
-      attrs = attributes_before_change.except(*@record.paper_trail_options[:skip])
+    def object_attrs_for_paper_trail(is_touch)
+      attrs = attributes_before_change(is_touch).
+        except(*@record.paper_trail_options[:skip])
       AttributeSerializers::ObjectAttribute.new(@record.class).serialize(attrs)
       attrs
     end
@@ -315,7 +316,7 @@ module PaperTrail
         item_id: @record.id,
         item_type: @record.class.base_class.name,
         event: @record.paper_trail_event || "destroy",
-        object: recordable_object,
+        object: recordable_object(false),
         whodunnit: PaperTrail.request.whodunnit
       }
       add_transaction_id_to(data)
@@ -330,11 +331,11 @@ module PaperTrail
         @record.class.paper_trail.version_class.column_names.include?("object_changes")
     end
 
-    def record_update(force:, in_after_callback:)
+    def record_update(force:, in_after_callback:, is_touch:)
       @in_after_callback = in_after_callback
       if enabled? && (force || changed_notably?)
         versions_assoc = @record.send(@record.class.versions_association_name)
-        version = versions_assoc.create(data_for_update)
+        version = versions_assoc.create(data_for_update(is_touch))
         if version.errors.any?
           log_version_errors(version, :update)
         else
@@ -350,10 +351,10 @@ module PaperTrail
     # `create`. That is, all the attributes of the nascent `Version` record.
     #
     # @api private
-    def data_for_update
+    def data_for_update(is_touch)
       data = {
         event: @record.paper_trail_event || "update",
-        object: recordable_object,
+        object: recordable_object(is_touch),
         whodunnit: PaperTrail.request.whodunnit
       }
       if @record.respond_to?(:updated_at)
@@ -384,7 +385,7 @@ module PaperTrail
     def data_for_update_columns(changes)
       data = {
         event: @record.paper_trail_event || "update",
-        object: recordable_object,
+        object: recordable_object(false),
         whodunnit: PaperTrail.request.whodunnit
       }
       if record_object_changes?
@@ -401,11 +402,11 @@ module PaperTrail
     # `PaperTrail.serializer`.
     #
     # @api private
-    def recordable_object
+    def recordable_object(is_touch)
       if @record.class.paper_trail.version_class.object_col_is_json?
-        object_attrs_for_paper_trail
+        object_attrs_for_paper_trail(is_touch)
       else
-        PaperTrail.serializer.dump(object_attrs_for_paper_trail)
+        PaperTrail.serializer.dump(object_attrs_for_paper_trail(is_touch))
       end
     end
 
@@ -507,7 +508,7 @@ module PaperTrail
       ::PaperTrail.request(enabled: false) do
         @record.save!(validate: false)
       end
-      record_update(force: true, in_after_callback: false)
+      record_update(force: true, in_after_callback: false, is_touch: false)
     end
 
     # Save, and create a version record regardless of options such as `:on`,
@@ -527,7 +528,7 @@ module PaperTrail
       ::PaperTrail.request(enabled: false) do
         @record.save(*args)
       end
-      record_update(force: true, in_after_callback: false)
+      record_update(force: true, in_after_callback: false, is_touch: false)
     end
 
     # Like the `update_column` method from `ActiveRecord::Persistence`, but also
@@ -603,7 +604,7 @@ module PaperTrail
     end
 
     # Rails 5.1 changed the API of `ActiveRecord::Dirty`. See
-    # https://github.com/airblade/paper_trail/pull/899
+    # https://github.com/paper-trail-gem/paper_trail/pull/899
     #
     # @api private
     def attribute_changed_in_latest_version?(attr_name)
@@ -615,18 +616,20 @@ module PaperTrail
     end
 
     # Rails 5.1 changed the API of `ActiveRecord::Dirty`. See
-    # https://github.com/airblade/paper_trail/pull/899
+    # https://github.com/paper-trail-gem/paper_trail/pull/899
     #
     # Event can be any of the three (create, update, destroy).
     #
     # @api private
-    def attribute_in_previous_version(attr_name)
+    def attribute_in_previous_version(attr_name, is_touch)
       if RAILS_GTE_5_1
-        if @in_after_callback
+        if @in_after_callback && !is_touch
+          # For most events, we want the original value of the attribute, before
+          # the last save.
           @record.attribute_before_last_save(attr_name.to_s)
         else
-          # We are performing a `record_destroy`. Other events,
-          # like `record_create`, can only be done in an after-callback.
+          # We are either performing a `record_destroy` or a
+          # `record_update(is_touch: true)`.
           @record.attribute_in_database(attr_name.to_s)
         end
       else
@@ -635,7 +638,7 @@ module PaperTrail
     end
 
     # Rails 5.1 changed the API of `ActiveRecord::Dirty`. See
-    # https://github.com/airblade/paper_trail/pull/899
+    # https://github.com/paper-trail-gem/paper_trail/pull/899
     #
     # @api private
     def changed_in_latest_version
@@ -647,7 +650,7 @@ module PaperTrail
     end
 
     # Rails 5.1 changed the API of `ActiveRecord::Dirty`. See
-    # https://github.com/airblade/paper_trail/pull/899
+    # https://github.com/paper-trail-gem/paper_trail/pull/899
     #
     # @api private
     def changes_in_latest_version

data/lib/paper_trail/reifiers/has_one.rb

@@ -23,7 +23,7 @@ module PaperTrail
           and Bicycle are both Vehicles and the FK for both is owner_id)
 
           If you'd like to help fix this error, please read
-          https://github.com/airblade/paper_trail/issues/594
+          https://github.com/paper-trail-gem/paper_trail/issues/594
           and see spec/models/person_spec.rb
         STR
 

data/lib/paper_trail/serializers/json.rb

@@ -38,7 +38,7 @@ module PaperTrail
           column. The old implementation was inaccurate, returning more records
           than you wanted. This feature was deprecated in 7.1.0 and removed in
           8.0.0. The json and jsonb datatypes are still supported. See the
-          discussion at https://github.com/airblade/paper_trail/issues/803
+          discussion at https://github.com/paper-trail-gem/paper_trail/issues/803
         STR
       end
     end

data/lib/paper_trail/serializers/yaml.rb

@@ -30,7 +30,7 @@ module PaperTrail
           column. The old implementation was inaccurate, returning more records
           than you wanted. This feature was deprecated in 8.1.0 and removed in
           9.0.0. The json and jsonb datatypes are still supported. See
-          discussion at https://github.com/airblade/paper_trail/pull/997
+          discussion at https://github.com/paper-trail-gem/paper_trail/pull/997
         STR
       end
     end

data/lib/paper_trail/version_number.rb

@@ -9,7 +9,7 @@ module PaperTrail
   module VERSION
     MAJOR = 9
     MINOR = 0
-    TINY = 1
+    TINY = 2
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".").freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paper_trail
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 9.0.2
 platform: ruby
 authors:
 - Andy Stewart
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -265,7 +265,7 @@ files:
 - lib/paper_trail/version_association_concern.rb
 - lib/paper_trail/version_concern.rb
 - lib/paper_trail/version_number.rb
-homepage: https://github.com/airblade/paper_trail
+homepage: https://github.com/paper-trail-gem/paper_trail
 licenses:
 - MIT
 metadata: {}