paper_trail 5.1.1 → 5.2.0

data/test/functional/thread_safety_test.rb

@@ -26,9 +26,9 @@ class ThreadSafetyTest < ActionController::TestCase
     enabled = nil
 
     slow_thread = Thread.new do
-      Widget.new.without_versioning do
+      Widget.new.paper_trail.without_versioning do
         sleep(0.01)
-        enabled = Widget.paper_trail_enabled_for_model?
+        enabled = Widget.paper_trail.enabled?
         sleep(0.01)
       end
       enabled
@@ -36,11 +36,11 @@ class ThreadSafetyTest < ActionController::TestCase
 
     fast_thread = Thread.new do
       sleep(0.005)
-      Widget.paper_trail_enabled_for_model?
+      Widget.paper_trail.enabled?
     end
 
     assert_not_equal slow_thread.value, fast_thread.value
-    assert Widget.paper_trail_enabled_for_model?
+    assert Widget.paper_trail.enabled?
     assert PaperTrail.enabled_for_model?(Widget)
   end
 end

data/test/unit/cleaner_test.rb

@@ -53,7 +53,7 @@ class PaperTrailCleanerTest < ActiveSupport::TestCase
       should "restrict the versions destroyed to those that were created on the date provided" do
         assert_equal 10, PaperTrail::Version.count
         assert_equal 4, @animal.versions.size
-        assert_equal 3, @animal.versions_between(@date, @date + 1.day).size
+        assert_equal 3, @animal.paper_trail.versions_between(@date, @date + 1.day).size
         PaperTrail.clean_versions!(date: @date)
         assert_equal 8, PaperTrail::Version.count
         assert_equal 2, @animal.versions.reload.size

data/test/unit/model_test.rb

@@ -242,7 +242,7 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
     end
 
     should "be live" do
-      assert @widget.live?
+      assert @widget.paper_trail.live?
     end
 
     context "which is then created" do
@@ -262,7 +262,7 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
       end
 
       should "be live" do
-        assert @widget.live?
+        assert @widget.paper_trail.live?
       end
 
       should "use the widget `updated_at` as the version's `created_at`" do
@@ -317,7 +317,9 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
         end
 
         should "have versions that are not live" do
-          assert @widget.versions.map(&:reify).compact.all? { |w| !w.live? }
+          assert @widget.versions.map(&:reify).compact.all? { |w|
+            !w.paper_trail.live?
+          }
         end
 
         should "have stored changes" do
@@ -566,11 +568,11 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
 
     context "with its paper trail turned off" do
       setup do
-        Widget.paper_trail_off!
+        Widget.paper_trail.disable
         @count = @widget.versions.length
       end
 
-      teardown { Widget.paper_trail_on! }
+      teardown { Widget.paper_trail.enable }
 
       context "when updated" do
         setup { @widget.update_attributes name: "Beeblebrox" }
@@ -582,13 +584,13 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
 
       context 'when destroyed "without versioning"' do
         should "leave paper trail off after call" do
-          @widget.without_versioning :destroy
-          assert !Widget.paper_trail_enabled_for_model?
+          @widget.paper_trail.without_versioning :destroy
+          assert_equal false, Widget.paper_trail.enabled?
         end
       end
 
       context "and then its paper trail turned on" do
-        setup { Widget.paper_trail_on! }
+        setup { Widget.paper_trail.enable }
 
         context "when updated" do
           setup { @widget.update_attributes name: "Ford" }
@@ -600,11 +602,11 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
 
         context 'when updated "without versioning"' do
           setup do
-            @widget.without_versioning do
+            @widget.paper_trail.without_versioning do
               @widget.update_attributes name: "Ford"
             end
             # The model instance should yield itself for convenience purposes
-            @widget.without_versioning { |w| w.update_attributes name: "Nixon" }
+            @widget.paper_trail.without_versioning { |w| w.update_attributes name: "Nixon" }
           end
 
           should "not create new version" do
@@ -612,19 +614,19 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
           end
 
           should "enable paper trail after call" do
-            assert Widget.paper_trail_enabled_for_model?
+            assert Widget.paper_trail.enabled?
           end
         end
 
         context "when receiving a method name as an argument" do
-          setup { @widget.without_versioning(:touch_with_version) }
+          setup { @widget.paper_trail.without_versioning(:touch_with_version) }
 
           should "not create new version" do
             assert_equal @count, @widget.versions.length
           end
 
           should "enable paper trail after call" do
-            assert Widget.paper_trail_enabled_for_model?
+            assert Widget.paper_trail.enabled?
           end
         end
       end
@@ -645,9 +647,9 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
 
       should "track who made the change" do
         assert_equal "Alice", @version.whodunnit
-        assert_nil   @version.paper_trail_originator
+        assert_nil @version.paper_trail_originator
         assert_equal "Alice", @version.terminator
-        assert_equal "Alice", @widget.paper_trail_originator
+        assert_equal "Alice", @widget.paper_trail.originator
       end
 
       context "when a record is updated" do
@@ -658,10 +660,10 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
         end
 
         should "track who made the change" do
-          assert_equal "Bob",   @version.whodunnit
+          assert_equal "Bob", @version.whodunnit
           assert_equal "Alice", @version.paper_trail_originator
-          assert_equal "Bob",   @version.terminator
-          assert_equal "Bob",   @widget.paper_trail_originator
+          assert_equal "Bob", @version.terminator
+          assert_equal "Bob", @widget.paper_trail.originator
         end
 
         context "when a record is destroyed" do
@@ -673,9 +675,9 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
 
           should "track who made the change" do
             assert_equal "Charlie", @version.whodunnit
-            assert_equal "Bob",     @version.paper_trail_originator
+            assert_equal "Bob", @version.paper_trail_originator
             assert_equal "Charlie", @version.terminator
-            assert_equal "Charlie", @widget.paper_trail_originator
+            assert_equal "Charlie", @widget.paper_trail.originator
           end
         end
       end
@@ -735,7 +737,7 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
     should "should return the correct originator" do
       PaperTrail.whodunnit = "Ben"
       @foo.update_attribute(:name, "Geoffrey")
-      assert_equal PaperTrail.whodunnit, @foo.paper_trail_originator
+      assert_equal PaperTrail.whodunnit, @foo.paper_trail.originator
     end
 
     context "when destroyed" do
@@ -768,40 +770,43 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
       end
 
       should "return nil for version_at before it was created" do
-        assert_nil @widget.version_at(@created - 1)
+        assert_nil @widget.paper_trail.version_at(@created - 1)
       end
 
       should "return how it looked when created for version_at its creation" do
-        assert_equal "Widget", @widget.version_at(@created).name
+        assert_equal "Widget", @widget.paper_trail.version_at(@created).name
       end
 
       should "return how it looked before its first update" do
-        assert_equal "Widget", @widget.version_at(@first_update - 1).name
+        assert_equal "Widget", @widget.paper_trail.version_at(@first_update - 1).name
       end
 
       should "return how it looked after its first update" do
-        assert_equal "Fidget", @widget.version_at(@first_update).name
+        assert_equal "Fidget", @widget.paper_trail.version_at(@first_update).name
       end
 
       should "return how it looked before its second update" do
-        assert_equal "Fidget", @widget.version_at(@second_update - 1).name
+        assert_equal "Fidget", @widget.paper_trail.version_at(@second_update - 1).name
       end
 
       should "return how it looked after its second update" do
-        assert_equal "Digit", @widget.version_at(@second_update).name
+        assert_equal "Digit", @widget.paper_trail.version_at(@second_update).name
       end
 
       should "return the current object for version_at after latest update" do
-        assert_equal "Digit", @widget.version_at(1.day.from_now).name
+        assert_equal "Digit", @widget.paper_trail.version_at(1.day.from_now).name
       end
 
       context "passing in a string representation of a timestamp" do
         should "still return a widget when appropriate" do
           # need to add 1 second onto the timestamps before casting to a string,
           # since casting a Time to a string drops the microseconds
-          assert_equal "Widget", @widget.version_at((@created + 1.second).to_s).name
-          assert_equal "Fidget", @widget.version_at((@first_update + 1.second).to_s).name
-          assert_equal "Digit", @widget.version_at((@second_update + 1.second).to_s).name
+          assert_equal "Widget",
+            @widget.paper_trail.version_at((@created + 1.second).to_s).name
+          assert_equal "Fidget",
+            @widget.paper_trail.version_at((@first_update + 1.second).to_s).name
+          assert_equal "Digit",
+            @widget.paper_trail.version_at((@second_update + 1.second).to_s).name
         end
       end
     end
@@ -819,13 +824,13 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
 
       should "return versions in the time period" do
         assert_equal ["Fidget"],
-          @widget.versions_between(20.days.ago, 10.days.ago).map(&:name)
+          @widget.paper_trail.versions_between(20.days.ago, 10.days.ago).map(&:name)
         assert_equal %w(Widget Fidget),
-          @widget.versions_between(45.days.ago, 10.days.ago).map(&:name)
+          @widget.paper_trail.versions_between(45.days.ago, 10.days.ago).map(&:name)
         assert_equal %w(Fidget Digit Digit),
-          @widget.versions_between(16.days.ago, 1.minute.ago).map(&:name)
+          @widget.paper_trail.versions_between(16.days.ago, 1.minute.ago).map(&:name)
         assert_equal [],
-          @widget.versions_between(60.days.ago, 45.days.ago).map(&:name)
+          @widget.paper_trail.versions_between(60.days.ago, 45.days.ago).map(&:name)
       end
     end
 
@@ -948,7 +953,8 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
     end
 
     should "return its previous self" do
-      assert_equal @widget.versions[-2].reify, @widget.previous_version
+      assert_equal @widget.versions[-2].reify,
+        @widget.paper_trail.previous_version
     end
   end
 
@@ -956,11 +962,11 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
     setup { @widget = Widget.new }
 
     should "not have a previous version" do
-      assert_nil @widget.previous_version
+      assert_nil @widget.paper_trail.previous_version
     end
 
     should "not have a next version" do
-      assert_nil @widget.next_version
+      assert_nil @widget.paper_trail.next_version
     end
 
     context "with versions" do
@@ -970,11 +976,12 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
       end
 
       should "have a previous version" do
-        assert_equal @widget.versions.last.reify.name, @widget.previous_version.name
+        assert_equal @widget.versions.last.reify.name,
+          @widget.paper_trail.previous_version.name
       end
 
       should "not have a next version" do
-        assert_nil @widget.next_version
+        assert_nil @widget.paper_trail.next_version
       end
     end
   end
@@ -988,13 +995,15 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
     end
 
     should "have a previous version" do
-      assert_nil @second_widget.previous_version # `create` events return `nil` for `reify`
-      assert_equal @widget.versions[-2].reify.name, @last_widget.previous_version.name
+      # `create` events return `nil` for `reify`
+      assert_nil @second_widget.paper_trail.previous_version
+      assert_equal @widget.versions[-2].reify.name,
+        @last_widget.paper_trail.previous_version.name
     end
 
     should "have a next version" do
-      assert_equal @widget.versions[2].reify.name, @second_widget.next_version.name
-      assert_equal @last_widget.next_version.name, @widget.name
+      assert_equal @widget.versions[2].reify.name, @second_widget.paper_trail.next_version.name
+      assert_equal @last_widget.paper_trail.next_version.name, @widget.name
     end
   end
 
@@ -1270,13 +1279,14 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
     end
 
     should "respond to `next_version` as normal" do
-      assert_equal @doc.paper_trail_versions.last.reify.next_version.name, @doc.name
+      reified = @doc.paper_trail_versions.last.reify
+      assert_equal reified.paper_trail.next_version.name, @doc.name
     end
 
     should "respond to `previous_version` as normal" do
       @doc.update_attributes name: "Doc 2"
       assert_equal 3, @doc.paper_trail_versions.length
-      assert_equal "Doc 1", @doc.previous_version.name
+      assert_equal "Doc 1", @doc.paper_trail.previous_version.name
     end
   end
 
@@ -1350,7 +1360,7 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
       end
 
       should "still respond to touch_with_version" do
-        @fluxor.touch_with_version
+        @fluxor.paper_trail.touch_with_version
         assert_equal 1, @fluxor.versions.length
       end
     end
@@ -1405,7 +1415,7 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
     end
 
     should "return its previous self" do
-      assert_equal @widget.versions[-2].reify, @widget.previous_version
+      assert_equal @widget.versions[-2].reify, @widget.paper_trail.previous_version
     end
   end
 

data/test/unit/protected_attrs_test.rb

@@ -25,7 +25,7 @@ class ProtectedAttrsTest < ActiveSupport::TestCase
     end
 
     should "be `nil` in its previous version" do
-      assert_nil @widget.previous_version
+      assert_nil @widget.paper_trail.previous_version
     end
 
     context "which is then updated" do
@@ -36,14 +36,15 @@ class ProtectedAttrsTest < ActiveSupport::TestCase
       end
 
       should "not be `nil` in its previous version" do
-        assert_not_nil @widget.previous_version
+        assert_not_nil @widget.paper_trail.previous_version
       end
 
       should "the previous version should contain right attributes" do
         # For some reason this test seems to be broken in JRuby 1.9 mode in the
         # test env even though it works in the console. WTF?
         unless ActiveRecord::VERSION::MAJOR >= 4 && defined?(JRUBY_VERSION)
-          assert_attributes_equal @widget.previous_version.attributes, @initial_attributes
+          previous_attributes = @widget.paper_trail.previous_version.attributes
+          assert_attributes_equal previous_attributes, @initial_attributes
         end
       end
     end

data/test/unit/serializer_test.rb

@@ -11,7 +11,7 @@ class SerializerTest < ActiveSupport::TestCase
       @fluxor = Fluxor.create name: "Some text."
 
       # this is exactly what PaperTrail serializes
-      @original_fluxor_attributes = @fluxor.send(:attributes_before_change)
+      @original_fluxor_attributes = @fluxor.paper_trail.attributes_before_change
 
       @fluxor.update_attributes name: "Some more text."
     end
@@ -41,7 +41,7 @@ class SerializerTest < ActiveSupport::TestCase
       @fluxor = Fluxor.create name: "Some text."
 
       # this is exactly what PaperTrail serializes
-      @original_fluxor_attributes = @fluxor.send(:attributes_before_change)
+      @original_fluxor_attributes = @fluxor.paper_trail.attributes_before_change
 
       @fluxor.update_attributes name: "Some more text."
     end
@@ -85,7 +85,8 @@ class SerializerTest < ActiveSupport::TestCase
 
       # this is exactly what PaperTrail serializes
       @original_fluxor_attributes = @fluxor.
-        send(:attributes_before_change).
+        paper_trail.
+        attributes_before_change.
         reject { |_k, v| v.nil? }
 
       @fluxor.update_attributes name: "Some more text."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paper_trail
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0
 platform: ruby
 authors:
 - Andy Stewart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -344,7 +344,9 @@ files:
 - lib/paper_trail/frameworks/rspec/helpers.rb
 - lib/paper_trail/frameworks/sinatra.rb
 - lib/paper_trail/has_paper_trail.rb
+- lib/paper_trail/model_config.rb
 - lib/paper_trail/record_history.rb
+- lib/paper_trail/record_trail.rb
 - lib/paper_trail/reifier.rb
 - lib/paper_trail/serializers/json.rb
 - lib/paper_trail/serializers/yaml.rb