paper_trail 6.0.2 → 7.0.0

data/test/unit/model_test.rb

@@ -2,8 +2,6 @@ require "test_helper"
 require "time_travel_helper"
 
 class HasPaperTrailModelTest < ActiveSupport::TestCase
-  extend CleanupCallbacks
-
   context "A record with defined 'only' and 'ignore' attributes" do
     setup { @article = Article.create }
 
@@ -319,9 +317,7 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
         end
 
         should "have versions that are not live" do
-          assert @widget.versions.map(&:reify).compact.all? { |w|
-            !w.paper_trail.live?
-          }
+          assert(@widget.versions.map(&:reify).compact.all? { |w| !w.paper_trail.live? })
         end
 
         should "have stored changes" do
@@ -1269,114 +1265,62 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
 
   context "The `on` option" do
     context "on create" do
-      cleanup_callbacks(Fluxor, :create)
-      cleanup_callbacks(Fluxor, :update)
-      cleanup_callbacks(Fluxor, :destroy)
-      cleanup_callbacks(Fluxor, :save)
-
-      setup do
-        Fluxor.instance_eval <<-END
-          has_paper_trail :on => [:create]
-        END
-        @fluxor = Fluxor.create
-        @fluxor.update_attributes name: "blah"
-        @fluxor.destroy
-      end
-
       should "only have a version for the create event" do
-        assert_equal 1, @fluxor.versions.length
-        assert_equal "create", @fluxor.versions.last.event
+        record = ::On::Create.create(name: "Alice")
+        record.update_attributes name: "blah"
+        record.destroy
+        assert_equal 1, record.versions.length
+        assert_equal "create", record.versions.last.event
       end
     end
 
     context "on update" do
-      cleanup_callbacks(Fluxor, :create)
-      cleanup_callbacks(Fluxor, :update)
-      cleanup_callbacks(Fluxor, :destroy)
-      cleanup_callbacks(Fluxor, :save)
-
-      setup do
-        Fluxor.instance_eval <<-END
-          has_paper_trail :on => [:update]
-        END
-        @fluxor = Fluxor.create
-        @fluxor.update_attributes name: "blah"
-        @fluxor.destroy
-      end
-
       should "only have a version for the update event" do
-        assert_equal 1, @fluxor.versions.length
-        assert_equal "update", @fluxor.versions.last.event
+        record = ::On::Update.create(name: "Alice")
+        record.update_attributes name: "blah"
+        record.destroy
+        assert_equal 1, record.versions.length
+        assert_equal "update", record.versions.last.event
       end
     end
 
     context "on destroy" do
-      cleanup_callbacks(Fluxor, :create)
-      cleanup_callbacks(Fluxor, :update)
-      cleanup_callbacks(Fluxor, :destroy)
-      cleanup_callbacks(Fluxor, :save)
-
-      setup do
-        Fluxor.instance_eval <<-END
-          has_paper_trail :on => [:destroy]
-        END
-        @fluxor = Fluxor.create
-        @fluxor.update_attributes name: "blah"
-        @fluxor.destroy
-      end
-
       should "only have a version for the destroy event" do
-        assert_equal 1, @fluxor.versions.length
-        assert_equal "destroy", @fluxor.versions.last.event
+        record = ::On::Destroy.create(name: "Alice")
+        record.update_attributes name: "blah"
+        record.destroy
+        assert_equal 1, record.versions.length
+        assert_equal "destroy", record.versions.last.event
       end
     end
 
     context "on []" do
-      cleanup_callbacks(Fluxor, :create)
-      cleanup_callbacks(Fluxor, :update)
-      cleanup_callbacks(Fluxor, :destroy)
-      cleanup_callbacks(Fluxor, :save)
-
       setup do
-        Fluxor.instance_eval <<-END
-          has_paper_trail :on => []
-        END
-        @fluxor = Fluxor.create
-        @fluxor.update_attributes name: "blah"
+        @record = ::On::EmptyArray.create(name: "Alice")
+        @record.update_attributes name: "blah"
       end
 
       teardown do
-        @fluxor.destroy
+        @record.destroy
       end
 
       should "not have any versions" do
-        assert_equal 0, @fluxor.versions.length
+        assert_equal 0, @record.versions.length
       end
 
       should "still respond to touch_with_version" do
-        @fluxor.paper_trail.touch_with_version
-        assert_equal 1, @fluxor.versions.length
+        @record.paper_trail.touch_with_version
+        assert_equal 1, @record.versions.length
       end
     end
 
     context "allows a symbol to be passed" do
-      cleanup_callbacks(Fluxor, :create)
-      cleanup_callbacks(Fluxor, :update)
-      cleanup_callbacks(Fluxor, :destroy)
-      cleanup_callbacks(Fluxor, :save)
-
-      setup do
-        Fluxor.instance_eval <<-END
-          has_paper_trail :on => :create
-        END
-        @fluxor = Fluxor.create
-        @fluxor.update_attributes name: "blah"
-        @fluxor.destroy
-      end
-
       should "only have a version for hte create event" do
-        assert_equal 1, @fluxor.versions.length
-        assert_equal "create", @fluxor.versions.last.event
+        record = ::On::Create.create(name: "Alice")
+        record.update_attributes name: "blah"
+        record.destroy
+        assert_equal 1, record.versions.length
+        assert_equal "create", record.versions.last.event
       end
     end
   end
@@ -1419,65 +1363,38 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
 
   context "custom events" do
     context "on create" do
-      cleanup_callbacks(Fluxor, :create)
-      cleanup_callbacks(Fluxor, :update)
-      cleanup_callbacks(Fluxor, :destroy)
-      cleanup_callbacks(Fluxor, :save)
-
-      setup do
-        Fluxor.instance_eval <<-END
-          has_paper_trail :on => [:create]
-        END
-        @fluxor = Fluxor.new.tap { |model| model.paper_trail_event = "created" }
-        @fluxor.update_attributes name: "blah"
-        @fluxor.destroy
-      end
-
       should "only have a version for the created event" do
-        assert_equal 1, @fluxor.versions.length
-        assert_equal "created", @fluxor.versions.last.event
+        record = ::On::Create.new.tap { |model|
+          model.paper_trail_event = "created"
+        }
+        record.update_attributes name: "blah"
+        record.destroy
+        assert_equal 1, record.versions.length
+        assert_equal "created", record.versions.last.event
       end
     end
 
     context "on update" do
-      cleanup_callbacks(Fluxor, :create)
-      cleanup_callbacks(Fluxor, :update)
-      cleanup_callbacks(Fluxor, :destroy)
-      cleanup_callbacks(Fluxor, :save)
-
-      setup do
-        Fluxor.instance_eval <<-END
-          has_paper_trail :on => [:update]
-        END
-        @fluxor = Fluxor.create.tap { |model| model.paper_trail_event = "name_updated" }
-        @fluxor.update_attributes name: "blah"
-        @fluxor.destroy
-      end
-
       should "only have a version for the name_updated event" do
-        assert_equal 1, @fluxor.versions.length
-        assert_equal "name_updated", @fluxor.versions.last.event
+        record = ::On::Update.create(name: "Alice").tap { |model|
+          model.paper_trail_event = "name_updated"
+        }
+        record.update_attributes name: "blah"
+        record.destroy
+        assert_equal 1, record.versions.length
+        assert_equal "name_updated", record.versions.last.event
       end
     end
 
     context "on destroy" do
-      cleanup_callbacks(Fluxor, :create)
-      cleanup_callbacks(Fluxor, :update)
-      cleanup_callbacks(Fluxor, :destroy)
-      cleanup_callbacks(Fluxor, :save)
-
-      setup do
-        Fluxor.instance_eval <<-END
-          has_paper_trail :on => [:destroy]
-        END
-        @fluxor = Fluxor.create.tap { |model| model.paper_trail_event = "destroyed" }
-        @fluxor.update_attributes name: "blah"
-        @fluxor.destroy
-      end
-
       should "only have a version for the destroy event" do
-        assert_equal 1, @fluxor.versions.length
-        assert_equal "destroyed", @fluxor.versions.last.event
+        record = ::On::Destroy.create(name: "Alice").tap { |model|
+          model.paper_trail_event = "destroyed"
+        }
+        record.update_attributes name: "blah"
+        record.destroy
+        assert_equal 1, record.versions.length
+        assert_equal "destroyed", record.versions.last.event
       end
     end
   end

data/test/unit/serializer_test.rb

@@ -2,36 +2,25 @@ require "test_helper"
 require "custom_json_serializer"
 
 class SerializerTest < ActiveSupport::TestCase
-  extend CleanupCallbacks
-
-  cleanup_callbacks(Fluxor, :create)
-  cleanup_callbacks(Fluxor, :update)
-  cleanup_callbacks(Fluxor, :destroy)
-  cleanup_callbacks(Fluxor, :save)
-
-  setup do
-    Fluxor.instance_eval "has_paper_trail"
-  end
-
   context "YAML Serializer" do
     setup do
-      @fluxor = Fluxor.create name: "Some text."
+      @customer = Customer.create name: "Some text."
 
       # this is exactly what PaperTrail serializes
-      @original_fluxor_attributes = @fluxor.paper_trail.attributes_before_change
+      @original_attributes = @customer.paper_trail.attributes_before_change
 
-      @fluxor.update_attributes name: "Some more text."
+      @customer.update_attributes name: "Some more text."
     end
 
     should "work with the default `YAML` serializer" do
       # Normal behaviour
-      assert_equal 2, @fluxor.versions.length
-      assert_nil @fluxor.versions[0].reify
-      assert_equal "Some text.", @fluxor.versions[1].reify.name
+      assert_equal 2, @customer.versions.length
+      assert_nil @customer.versions[0].reify
+      assert_equal "Some text.", @customer.versions[1].reify.name
 
       # Check values are stored as `YAML`.
-      assert_equal @original_fluxor_attributes, YAML.load(@fluxor.versions[1].object)
-      assert_equal YAML.dump(@original_fluxor_attributes), @fluxor.versions[1].object
+      assert_equal @original_attributes, YAML.load(@customer.versions[1].object)
+      assert_equal YAML.dump(@original_attributes), @customer.versions[1].object
     end
   end
 
@@ -41,12 +30,12 @@ class SerializerTest < ActiveSupport::TestCase
         config.serializer = PaperTrail::Serializers::JSON
       end
 
-      @fluxor = Fluxor.create name: "Some text."
+      @customer = Customer.create name: "Some text."
 
       # this is exactly what PaperTrail serializes
-      @original_fluxor_attributes = @fluxor.paper_trail.attributes_before_change
+      @original_attributes = @customer.paper_trail.attributes_before_change
 
-      @fluxor.update_attributes name: "Some more text."
+      @customer.update_attributes name: "Some more text."
     end
 
     teardown do
@@ -55,22 +44,22 @@ class SerializerTest < ActiveSupport::TestCase
 
     should "reify with JSON serializer" do
       # Normal behaviour
-      assert_equal 2, @fluxor.versions.length
-      assert_nil @fluxor.versions[0].reify
-      assert_equal "Some text.", @fluxor.versions[1].reify.name
+      assert_equal 2, @customer.versions.length
+      assert_nil @customer.versions[0].reify
+      assert_equal "Some text.", @customer.versions[1].reify.name
 
       # Check values are stored as JSON.
-      assert_equal @original_fluxor_attributes,
-        ActiveSupport::JSON.decode(@fluxor.versions[1].object)
-      assert_equal ActiveSupport::JSON.encode(@original_fluxor_attributes),
-        @fluxor.versions[1].object
+      assert_equal @original_attributes,
+        ActiveSupport::JSON.decode(@customer.versions[1].object)
+      assert_equal ActiveSupport::JSON.encode(@original_attributes),
+        @customer.versions[1].object
     end
 
     should "store object_changes" do
-      initial_changeset = { "name" => [nil, "Some text."], "id" => [nil, @fluxor.id] }
+      initial_changeset = { "name" => [nil, "Some text."], "id" => [nil, @customer.id] }
       second_changeset = { "name" => ["Some text.", "Some more text."] }
-      assert_equal initial_changeset, @fluxor.versions[0].changeset
-      assert_equal second_changeset,  @fluxor.versions[1].changeset
+      assert_equal initial_changeset, @customer.versions[0].changeset
+      assert_equal second_changeset,  @customer.versions[1].changeset
     end
   end
 
@@ -80,15 +69,15 @@ class SerializerTest < ActiveSupport::TestCase
         config.serializer = CustomJsonSerializer
       end
 
-      @fluxor = Fluxor.create
+      @customer = Customer.create
 
       # this is exactly what PaperTrail serializes
-      @original_fluxor_attributes = @fluxor.
+      @original_attributes = @customer.
         paper_trail.
         attributes_before_change.
         reject { |_k, v| v.nil? }
 
-      @fluxor.update_attributes name: "Some more text."
+      @customer.update_attributes name: "Some more text."
     end
 
     teardown do
@@ -97,22 +86,22 @@ class SerializerTest < ActiveSupport::TestCase
 
     should "reify with custom serializer" do
       # Normal behaviour
-      assert_equal 2, @fluxor.versions.length
-      assert_nil @fluxor.versions[0].reify
-      assert_nil @fluxor.versions[1].reify.name
+      assert_equal 2, @customer.versions.length
+      assert_nil @customer.versions[0].reify
+      assert_nil @customer.versions[1].reify.name
 
       # Check values are stored as JSON.
-      assert_equal @original_fluxor_attributes,
-        ActiveSupport::JSON.decode(@fluxor.versions[1].object)
-      assert_equal ActiveSupport::JSON.encode(@original_fluxor_attributes),
-        @fluxor.versions[1].object
+      assert_equal @original_attributes,
+        ActiveSupport::JSON.decode(@customer.versions[1].object)
+      assert_equal ActiveSupport::JSON.encode(@original_attributes),
+        @customer.versions[1].object
     end
 
     should "store object_changes" do
-      initial_changeset = { "id" => [nil, @fluxor.id] }
+      initial_changeset = { "id" => [nil, @customer.id] }
       second_changeset = { "name" => [nil, "Some more text."] }
-      assert_equal initial_changeset, @fluxor.versions[0].changeset
-      assert_equal second_changeset,  @fluxor.versions[1].changeset
+      assert_equal initial_changeset, @customer.versions[0].changeset
+      assert_equal second_changeset,  @customer.versions[1].changeset
     end
   end
 end

data/test/unit/serializers/mixin_json_test.rb

@@ -19,8 +19,10 @@ class MixinJsonTest < ActiveSupport::TestCase
     end
 
     should "`deserialize` JSON to Ruby, removing pairs with `blank` keys or values" do
-      assert_equal @hash.reject { |k, v| k.blank? || v.blank? },
+      assert_equal(
+        @hash.reject { |k, v| k.blank? || v.blank? },
         CustomJsonSerializer.load(@hash_as_json)
+      )
     end
   end
 

data/test/unit/serializers/yaml_test.rb

@@ -44,11 +44,7 @@ class YamlTest < ActiveSupport::TestCase
         "Val 1"
       )
       assert matches.instance_of?(Arel::Nodes::Matches)
-      if Arel::VERSION >= "6"
-        assert_equal matches.right.val, "%\narg1: Val 1\n%"
-      else
-        assert_equal matches.right, "%\narg1: Val 1\n%"
-      end
+      assert_equal matches.right.val, "%\narg1: Val 1\n%"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paper_trail
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 7.0.0
 platform: ruby
 authors:
 - Andy Stewart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -197,14 +197,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.1
+        version: 0.48.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.1
+        version: 0.48.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -286,6 +300,7 @@ files:
 - doc/bug_report_template.rb
 - doc/triage.md
 - doc/warning_about_not_setting_whodunnit.md
+- gemfiles/ar_4.0.gemfile
 - gemfiles/ar_4.2.gemfile
 - gemfiles/ar_5.0.gemfile
 - gemfiles/ar_master.gemfile
@@ -313,7 +328,6 @@ files:
 - lib/paper_trail/frameworks/rails/engine.rb
 - lib/paper_trail/frameworks/rspec.rb
 - 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/queries/versions/where_object.rb
@@ -321,6 +335,11 @@ files:
 - lib/paper_trail/record_history.rb
 - lib/paper_trail/record_trail.rb
 - lib/paper_trail/reifier.rb
+- lib/paper_trail/reifiers/belongs_to.rb
+- lib/paper_trail/reifiers/has_and_belongs_to_many.rb
+- lib/paper_trail/reifiers/has_many.rb
+- lib/paper_trail/reifiers/has_many_through.rb
+- lib/paper_trail/reifiers/has_one.rb
 - lib/paper_trail/serializers/json.rb
 - lib/paper_trail/serializers/yaml.rb
 - lib/paper_trail/version_association_concern.rb
@@ -335,6 +354,7 @@ files:
 - spec/models/callback_modifier_spec.rb
 - spec/models/car_spec.rb
 - spec/models/custom_primary_key_record_spec.rb
+- spec/models/document_spec.rb
 - spec/models/gadget_spec.rb
 - spec/models/joined_version_spec.rb
 - spec/models/json_version_spec.rb
@@ -350,7 +370,11 @@ files:
 - spec/modules/paper_trail_spec.rb
 - spec/modules/version_concern_spec.rb
 - spec/modules/version_number_spec.rb
+- spec/paper_trail/cleaner_spec.rb
 - spec/paper_trail/config_spec.rb
+- spec/paper_trail/serializers/custom_yaml_serializer_spec.rb
+- spec/paper_trail/serializers/json_spec.rb
+- spec/paper_trail/version_limit_spec.rb
 - spec/paper_trail_spec.rb
 - spec/rails_helper.rb
 - spec/requests/articles_spec.rb
@@ -389,6 +413,10 @@ files:
 - test/dummy/app/models/legacy_widget.rb
 - test/dummy/app/models/line_item.rb
 - test/dummy/app/models/not_on_update.rb
+- test/dummy/app/models/on/create.rb
+- test/dummy/app/models/on/destroy.rb
+- test/dummy/app/models/on/empty_array.rb
+- test/dummy/app/models/on/update.rb
 - test/dummy/app/models/order.rb
 - test/dummy/app/models/paragraph.rb
 - test/dummy/app/models/person.rb
@@ -431,19 +459,13 @@ files:
 - test/dummy/db/migrate/20110208155312_set_up_test_tables.rb
 - test/dummy/db/schema.rb
 - test/functional/controller_test.rb
-- test/functional/modular_sinatra_test.rb
-- test/functional/sinatra_test.rb
 - test/functional/thread_safety_test.rb
 - test/test_helper.rb
 - test/time_travel_helper.rb
 - test/unit/associations_test.rb
-- test/unit/cleaner_test.rb
-- test/unit/inheritance_column_test.rb
 - test/unit/model_test.rb
 - test/unit/serializer_test.rb
-- test/unit/serializers/json_test.rb
 - test/unit/serializers/mixin_json_test.rb
-- test/unit/serializers/mixin_yaml_test.rb
 - test/unit/serializers/yaml_test.rb
 - test/unit/version_test.rb
 homepage: https://github.com/airblade/paper_trail
@@ -458,7 +480,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -466,7 +488,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Track changes to your models.
@@ -479,6 +501,7 @@ test_files:
 - spec/models/callback_modifier_spec.rb
 - spec/models/car_spec.rb
 - spec/models/custom_primary_key_record_spec.rb
+- spec/models/document_spec.rb
 - spec/models/gadget_spec.rb
 - spec/models/joined_version_spec.rb
 - spec/models/json_version_spec.rb
@@ -494,7 +517,11 @@ test_files:
 - spec/modules/paper_trail_spec.rb
 - spec/modules/version_concern_spec.rb
 - spec/modules/version_number_spec.rb
+- spec/paper_trail/cleaner_spec.rb
 - spec/paper_trail/config_spec.rb
+- spec/paper_trail/serializers/custom_yaml_serializer_spec.rb
+- spec/paper_trail/serializers/json_spec.rb
+- spec/paper_trail/version_limit_spec.rb
 - spec/paper_trail_spec.rb
 - spec/rails_helper.rb
 - spec/requests/articles_spec.rb
@@ -533,6 +560,10 @@ test_files:
 - test/dummy/app/models/legacy_widget.rb
 - test/dummy/app/models/line_item.rb
 - test/dummy/app/models/not_on_update.rb
+- test/dummy/app/models/on/create.rb
+- test/dummy/app/models/on/destroy.rb
+- test/dummy/app/models/on/empty_array.rb
+- test/dummy/app/models/on/update.rb
 - test/dummy/app/models/order.rb
 - test/dummy/app/models/paragraph.rb
 - test/dummy/app/models/person.rb
@@ -575,18 +606,12 @@ test_files:
 - test/dummy/db/migrate/20110208155312_set_up_test_tables.rb
 - test/dummy/db/schema.rb
 - test/functional/controller_test.rb
-- test/functional/modular_sinatra_test.rb
-- test/functional/sinatra_test.rb
 - test/functional/thread_safety_test.rb
 - test/test_helper.rb
 - test/time_travel_helper.rb
 - test/unit/associations_test.rb
-- test/unit/cleaner_test.rb
-- test/unit/inheritance_column_test.rb
 - test/unit/model_test.rb
 - test/unit/serializer_test.rb
-- test/unit/serializers/json_test.rb
 - test/unit/serializers/mixin_json_test.rb
-- test/unit/serializers/mixin_yaml_test.rb
 - test/unit/serializers/yaml_test.rb
 - test/unit/version_test.rb