paper_trail 7.0.1 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e92a25394990bd883a845f051763e117abd5d35
-  data.tar.gz: bde729a85a1052106a116e930f3afafdde5ca319
+  metadata.gz: e949aeba5c6caa0c2dd12fac0e624106793788f5
+  data.tar.gz: f12931432b3ddec15f99fecd87fe1cbdab54cdbf
 SHA512:
-  metadata.gz: 7f2d6eba98c56942424310f2a3cc0c855c264eecc17fa0377dbb4bdad0ed0e15d66190e1043671af4c2f35c9605f0707565bdada142c1a5f8ce6b3eac203c8e3
-  data.tar.gz: 99b7dd59468398c88e7c15f4e8b4fa6a2ba274a1aa8794a2caa8351d54cf6abdc51908449d26e71382b0505f08bcd0cdfbaa8fa2a030f9a76a391e84daafc8db
+  metadata.gz: 058a480c470909dfafaceb561857146a1bd53b0eae9b72411f818a45ee6f32394bcf57c1cfda46640b677ea6a0dd8235eda6ff517693f03b6fa3b441830dfa60
+  data.tar.gz: b4b941c3218ed3d45450970088b42af0ddcae58af02a17a44eb578c0e11a18a6495d115459d4a87953e87e6359853e39fda3b5c9257c16bfd441447fe6842209

data/.github/CONTRIBUTING.md

@@ -147,7 +147,7 @@ Don't forget to commit changes to `schema.rb`.
   - Add a new "Unreleased" section
 1. In the readme, update references to version number, including
   - documentation links table
-  - compatability table
+  - compatability table (major versions only)
 1. Commit
 1. git tag -a -m "v5.0.0" "v5.0.0" # or whatever number
 1. git push --tags origin 5-stable # or whatever branch

data/CHANGELOG.md

@@ -17,6 +17,22 @@ recommendations of [keepachangelog.com](http://keepachangelog.com/).
 
 - None
 
+## 7.0.2 (2017-04-26)
+
+### Breaking Changes
+
+- None
+
+### Added
+
+- [#932](https://github.com/airblade/paper_trail/pull/932) -
+  `PaperTrail.whodunnit` now accepts a block.
+
+### Fixed
+
+- [#956](https://github.com/airblade/paper_trail/pull/956) -
+  Fix ActiveRecord >= 5.1 version check 
+
 ## 7.0.1 (2017-04-10)
 
 ### Breaking Changes

data/README.md

@@ -11,7 +11,7 @@ has been destroyed.
 | Version        | Documentation |
 | -------------- | ------------- |
 | Unreleased     | https://github.com/airblade/paper_trail/blob/master/README.md |
-| 7.0.1          | https://github.com/airblade/paper_trail/blob/v7.0.0/README.md |
+| 7.0.2          | https://github.com/airblade/paper_trail/blob/v7.0.2/README.md |
 | 6.0.2          | https://github.com/airblade/paper_trail/blob/v6.0.2/README.md |
 | 5.2.3          | https://github.com/airblade/paper_trail/blob/v5.2.3/README.md |
 | 4.2.0          | https://github.com/airblade/paper_trail/blob/v4.2.0/README.md |
@@ -708,6 +708,14 @@ widget.update_attributes :name => 'Wibble'
 widget.versions.last.whodunnit              # Andy Stewart
 ```
 
+`whodunnit` also accepts a block, a convenient way to temporarily set the value.
+
+```ruby
+PaperTrail.whodunnit("Dorian Marié") do
+  widget.update_attributes :name => 'Wibble'
+end
+```
+
 If your controller has a `current_user` method, PaperTrail provides a
 `before_action` that will assign `current_user.id` to `PaperTrail.whodunnit`.
 You can add this `before_action` to your `ApplicationController`.
@@ -890,9 +898,6 @@ issues, in order of descending importance.
 1. PaperTrail only reifies the first level of associations.
 1. [#542](https://github.com/airblade/paper_trail/issues/542) -
    Not compatible with [transactional tests][34], aka. transactional fixtures.
-1. [#841](https://github.com/airblade/paper_trail/issues/841) -
-   Without a workaround, reified records cannot be persisted if their associated
-   records have been deleted.
 1. Requires database timestamp columns with fractional second precision.
    - Sqlite and postgres timestamps have fractional second precision by default.
    [MySQL timestamps do not][35]. Furthermore, MySQL 5.5 and earlier do not

data/lib/paper_trail/record_trail.rb

@@ -1,7 +1,8 @@
 module PaperTrail
   # Represents the "paper trail" for a single record.
   class RecordTrail
-    RAILS_GTE_5_1 = ::ActiveRecord::VERSION::MAJOR >= 5 && ::ActiveRecord::VERSION::MINOR >= 1
+    RAILS_GTE_5_1 = ::ActiveRecord.respond_to?(:gem_version) &&
+      ::ActiveRecord.gem_version >= ::Gem::Version.new("5.1.0.beta1")
 
     def initialize(record)
       @record = record

data/lib/paper_trail/version_number.rb

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

data/lib/paper_trail.rb

@@ -87,10 +87,33 @@ module PaperTrail
       paper_trail_store[:whodunnit] = value
     end
 
-    # Returns who is reponsible for any changes that occur.
+    # If nothing passed, returns who is reponsible for any changes that occur.
+    #
+    #   PaperTrail.whodunnit = "someone"
+    #   PaperTrail.whodunnit # => "someone"
+    #
+    # If value and block passed, set this value as whodunnit for the duration of the block
+    #
+    #   PaperTrail.whodunnit("me") do
+    #     puts PaperTrail.whodunnit # => "me"
+    #   end
+    #
     # @api public
-    def whodunnit
-      paper_trail_store[:whodunnit]
+    def whodunnit(value = nil)
+      if value
+        raise ArgumentError, "no block given" unless block_given?
+
+        previous_whodunnit = paper_trail_store[:whodunnit]
+        paper_trail_store[:whodunnit] = value
+
+        begin
+          yield
+        ensure
+          paper_trail_store[:whodunnit] = previous_whodunnit
+        end
+      else
+        paper_trail_store[:whodunnit]
+      end
     end
 
     # Sets any information from the controller that you want PaperTrail to

data/spec/paper_trail_spec.rb

@@ -75,10 +75,31 @@ RSpec.describe PaperTrail do
   end
 
   describe ".whodunnit" do
-    before(:all) { described_class.whodunnit = "foobar" }
+    context "when set globally" do
+      before(:all) { described_class.whodunnit = "foobar" }
 
-    it "is nil by default" do
-      expect(described_class.whodunnit).to be_nil
+      it "is set to `nil` by default" do
+        expect(described_class.whodunnit).to be_nil
+      end
+    end
+
+    context "with block passed" do
+      it "sets whodunnit only for the block passed" do
+        described_class.whodunnit("foo") do
+          expect(described_class.whodunnit).to eq("foo")
+        end
+
+        expect(described_class.whodunnit).to be_nil
+      end
+
+      it "sets whodunnit only for the current thread" do
+        described_class.whodunnit("foo") do
+          expect(described_class.whodunnit).to eq("foo")
+          Thread.new { expect(described_class.whodunnit).to be_nil }.join
+        end
+
+        expect(described_class.whodunnit).to be_nil
+      end
     end
   end
 

data/test/unit/associations_test.rb

@@ -829,7 +829,7 @@ class AssociationsTest < ActiveSupport::TestCase
             @widget.destroy
           end
 
-          context "when reified" do
+          context "when reified with belongs_to: true" do
             setup { @wotsit2 = @wotsit.versions.last.reify(belongs_to: true) }
 
             should "see the associated as it was at the time" do
@@ -839,6 +839,22 @@ class AssociationsTest < ActiveSupport::TestCase
             should "not persist changes to the live association" do
               assert_nil @wotsit.reload.widget
             end
+
+            should "be able to persist the reified record" do
+              assert_nothing_raised { @wotsit2.save! }
+            end
+          end
+
+          context "when reified with belongs_to: false" do
+            setup do
+              @wotsit2 = @wotsit.versions.last.reify(belongs_to: false)
+            end
+
+            should "save should not re-create the widget record" do
+              # Save succeeds because Wotsit does not validate presence of widget
+              @wotsit2.save!
+              assert_nil ::Widget.find_by(id: @widget.id)
+            end
           end
 
           context "and then the model is updated" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paper_trail
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.2
 platform: ruby
 authors:
 - Andy Stewart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -487,7 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Track changes to your models.