paper_trail-rails 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6aa5868c6142fc4fe53860a3d2419e4f8f564ecc6f885b35a2c2378b414c39ca
-  data.tar.gz: b6ea9745e16cbb603de44aaae7a8f25fd75c3953d7c8a5bb55467dd6d3434008
+  metadata.gz: 9cbd2f0eda94258a20e3a294ed155191773c27af3d91bcbd66c63971084e37e8
+  data.tar.gz: d59ed0df5959182a653556c3583e963ef9df5d2669821f15b4ae06c2deade834
 SHA512:
-  metadata.gz: 6eb0038d9fb7de316971d81955f430fc24c43146f176dc491d6641b5346b4102e2d2ed5150cf85cdcea7a9239485052129f519ffefc5df92e5609a3e779ec5e4
-  data.tar.gz: 9202e8d1e38fe06436a59f0ce2051867517297ed9b91f71aba5b640b74e8214ca18e068e1345e070bffeb908bc5f8e94747981f7aacf80e40408efa47c49382e
+  metadata.gz: fd93b66499033e9b62bb521bd0870f81fa4a4c4fbe3f4916a5359dbd5fa04279ce5a2ec8396e474062588f70db1170f0e8810293145914dd2f25539451ef298a
+  data.tar.gz: 2b5bd83ee674694032247fec1212dd4ce2a3f49cddaa1ce1380235e4ed3300d3eb0af7ce126942d7beee48c1213e7faf411aff4017565afce8b039206ec1af1d

data/Changelog.md

@@ -1,3 +1,9 @@
+## 0.6.1 (2023-06-15)
+- Add `PaperTrail.metadata`, `PaperTrail.reverse_update_metadata`
+- Change `set_default_metadata` to only set `command` to `default_command` if it hasn't been set yet. This
+  fixes bug where the command set by `RunnerCommandExtensions` got overwritten when the `whodunnit`
+  callback called `set_default_metadata` again.
+
 ## 0.6.0 (2023-06-14)
 - Include the rails subcommand (`'rails console'`, etc.) in the `command` metadata, not just `'rails'`
 - When using `rails runner`, include the full Ruby code/file that was run in the `command` metadata.

data/lib/paper_trail/rails/paper_trail_extensions.rb

@@ -1,5 +1,11 @@
 PaperTrail.class_eval do
 
+  unless methods.include?(:metadata)
+    def self.metadata
+      PaperTrail.request.controller_info
+    end
+  end
+
   unless methods.include?(:with_metadata)
     # Adds additional metadata to versions created within the given block.  This will be merged with
     # (and may override) any metadata already set by your controller's info_for_paper_trail.
@@ -27,4 +33,11 @@ PaperTrail.class_eval do
       PaperTrail.request.controller_info = merged_metadata
     end
   end
+
+  unless methods.include?(:reverse_update_metadata)
+    def self.reverse_update_metadata(metadata)
+      merged_metadata = (::PaperTrail.request.controller_info || {}).reverse_merge(metadata)
+      PaperTrail.request.controller_info = merged_metadata
+    end
+  end
 end

data/lib/paper_trail/rails/version.rb

@@ -1,7 +1,7 @@
 module PaperTrail
   module Rails
     def self.version
-      "0.6.0"
+      "0.6.1"
     end
   end
 end

data/lib/paper_trail/rails.rb

@@ -30,8 +30,10 @@ module PaperTrail
 
       # Store some metadata about where the change came from
       def set_default_metadata
-        PaperTrail.update_metadata(
+        PaperTrail.reverse_update_metadata(
           command: default_command,
+        )
+        PaperTrail.update_metadata(
           source_location: caller.find { |line|
             line.starts_with? ::Rails.root.to_s and
             config.source_location_filter.(line)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paper_trail-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Tyler Rick