paper_trail 7.0.2 → 7.0.3

data/test/dummy/db/migrate/20110208155312_set_up_test_tables.rb

@@ -1,7 +1,16 @@
-# Keep this migration in sync with
+# Parts of this migration must be kept in sync with
 # `lib/generators/paper_trail/templates/create_versions.rb`
-# TODO: Is there a way to avoid duplication?
-class SetUpTestTables < ActiveRecord::Migration
+#
+# Starting with AR 5.1, we must specify which version of AR we are using.
+# I tried using `const_get` but I got a `NameError`, then I learned about
+# `::ActiveRecord::Migration::Current`.
+class SetUpTestTables < (
+  if ::ActiveRecord::VERSION::MAJOR >= 5
+    ::ActiveRecord::Migration::Current
+  else
+    ::ActiveRecord::Migration
+  end
+)
   MYSQL_ADAPTERS = [
     "ActiveRecord::ConnectionAdapters::MysqlAdapter",
     "ActiveRecord::ConnectionAdapters::Mysql2Adapter"
@@ -73,7 +82,7 @@ class SetUpTestTables < ActiveRecord::Migration
       t.string :ip
       t.string :user_agent
     end
-    add_index :versions, %i(item_type item_id)
+    add_index :versions, %i[item_type item_id]
 
     create_table :version_associations do |t|
       t.integer  :version_id
@@ -82,7 +91,7 @@ class SetUpTestTables < ActiveRecord::Migration
     end
     add_index :version_associations, [:version_id]
     add_index :version_associations,
-      %i(foreign_key_name foreign_key_id),
+      %i[foreign_key_name foreign_key_id],
       name: "index_version_associations_on_foreign_key"
 
     create_table :post_versions, force: true do |t|
@@ -97,7 +106,7 @@ class SetUpTestTables < ActiveRecord::Migration
       t.string :ip
       t.string :user_agent
     end
-    add_index :post_versions, %i(item_type item_id)
+    add_index :post_versions, %i[item_type item_id]
 
     if ENV["DB"] == "postgres" && ::ActiveRecord::VERSION::MAJOR >= 4
       create_table :json_versions, force: true do |t|
@@ -109,7 +118,7 @@ class SetUpTestTables < ActiveRecord::Migration
         t.json     :object_changes
         t.datetime :created_at
       end
-      add_index :json_versions, %i(item_type item_id)
+      add_index :json_versions, %i[item_type item_id]
     end
 
     create_table :not_on_updates, force: true do |t|
@@ -128,7 +137,7 @@ class SetUpTestTables < ActiveRecord::Migration
       t.text     :object
       t.datetime :created_at
     end
-    add_index :banana_versions, %i(item_type item_id)
+    add_index :banana_versions, %i[item_type item_id]
 
     create_table :wotsits, force: true do |t|
       t.integer :widget_id
@@ -305,7 +314,7 @@ class SetUpTestTables < ActiveRecord::Migration
       t.text     :object
       t.datetime :created_at
     end
-    add_index :custom_primary_key_record_versions, %i(item_type item_id), name: "idx_cust_pk_item"
+    add_index :custom_primary_key_record_versions, %i[item_type item_id], name: "idx_cust_pk_item"
   end
 
   def down

data/test/dummy/db/schema.rb

@@ -30,11 +30,11 @@ ActiveRecord::Schema.define(version: 20110208155312) do
   end
 
   create_table "banana_versions", force: :cascade do |t|
-    t.string   "item_type",  null: false
-    t.integer  "item_id",    null: false
-    t.string   "event",      null: false
-    t.string   "whodunnit"
-    t.text     "object"
+    t.string "item_type", null: false
+    t.integer "item_id", null: false
+    t.string "event", null: false
+    t.string "whodunnit"
+    t.text "object"
     t.datetime "created_at"
     t.index ["item_type", "item_id"], name: "index_banana_versions_on_item_type_and_item_id"
   end
@@ -60,13 +60,13 @@ ActiveRecord::Schema.define(version: 20110208155312) do
   end
 
   create_table "boolits", force: :cascade do |t|
-    t.string  "name"
+    t.string "name"
     t.boolean "scoped", default: true
   end
 
   create_table "callback_modifiers", force: :cascade do |t|
-    t.string  "some_content"
-    t.boolean "deleted",      default: false
+    t.string "some_content"
+    t.boolean "deleted", default: false
   end
 
   create_table "chapters", force: :cascade do |t|
@@ -78,20 +78,20 @@ ActiveRecord::Schema.define(version: 20110208155312) do
   end
 
   create_table "custom_primary_key_record_versions", force: :cascade do |t|
-    t.string   "item_type",  null: false
-    t.string   "item_id",    null: false
-    t.string   "event",      null: false
-    t.string   "whodunnit"
-    t.text     "object"
+    t.string "item_type", null: false
+    t.string "item_id", null: false
+    t.string "event", null: false
+    t.string "whodunnit"
+    t.text "object"
     t.datetime "created_at"
     t.index ["item_type", "item_id"], name: "idx_cust_pk_item"
   end
 
   create_table "custom_primary_key_records", primary_key: "uuid", id: :string, force: :cascade do |t|
-    t.string   "name"
+    t.string "name"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index ["uuid"], unique: true
+    t.index ["uuid"], name: "sqlite_autoindex_custom_primary_key_records_1", unique: true
   end
 
   create_table "customers", force: :cascade do |t|
@@ -113,7 +113,7 @@ ActiveRecord::Schema.define(version: 20110208155312) do
 
   create_table "fluxors", force: :cascade do |t|
     t.integer "widget_id"
-    t.string  "name"
+    t.string "name"
   end
 
   create_table "foo_habtms", force: :cascade do |t|
@@ -126,20 +126,20 @@ ActiveRecord::Schema.define(version: 20110208155312) do
   end
 
   create_table "gadgets", force: :cascade do |t|
-    t.string   "name"
-    t.string   "brand"
+    t.string "name"
+    t.string "brand"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "legacy_widgets", force: :cascade do |t|
-    t.string  "name"
+    t.string "name"
     t.integer "version"
   end
 
   create_table "line_items", force: :cascade do |t|
     t.integer "order_id"
-    t.string  "product"
+    t.string "product"
   end
 
   create_table "not_on_updates", force: :cascade do |t|
@@ -165,34 +165,34 @@ ActiveRecord::Schema.define(version: 20110208155312) do
 
   create_table "orders", force: :cascade do |t|
     t.integer "customer_id"
-    t.string  "order_date"
+    t.string "order_date"
   end
 
   create_table "paragraphs", force: :cascade do |t|
     t.integer "section_id"
-    t.string  "name"
+    t.string "name"
   end
 
   create_table "people", force: :cascade do |t|
-    t.string  "name"
-    t.string  "time_zone"
+    t.string "name"
+    t.string "time_zone"
     t.integer "mentor_id"
   end
 
   create_table "post_versions", force: :cascade do |t|
-    t.string   "item_type",  null: false
-    t.integer  "item_id",    null: false
-    t.string   "event",      null: false
-    t.string   "whodunnit"
-    t.text     "object"
+    t.string "item_type", null: false
+    t.integer "item_id", null: false
+    t.string "event", null: false
+    t.string "whodunnit"
+    t.text "object"
     t.datetime "created_at"
-    t.string   "ip"
-    t.string   "user_agent"
+    t.string "ip"
+    t.string "user_agent"
     t.index ["item_type", "item_id"], name: "index_post_versions_on_item_type_and_item_id"
   end
 
   create_table "post_with_statuses", force: :cascade do |t|
-    t.integer  "status"
+    t.integer "status"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
@@ -208,11 +208,11 @@ ActiveRecord::Schema.define(version: 20110208155312) do
 
   create_table "sections", force: :cascade do |t|
     t.integer "chapter_id"
-    t.string  "name"
+    t.string "name"
   end
 
   create_table "skippers", force: :cascade do |t|
-    t.string   "name"
+    t.string "name"
     t.datetime "another_timestamp"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -234,63 +234,63 @@ ActiveRecord::Schema.define(version: 20110208155312) do
   end
 
   create_table "vehicles", force: :cascade do |t|
-    t.string   "name",       null: false
-    t.string   "type",       null: false
+    t.string "name", null: false
+    t.string "type", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
   create_table "version_associations", force: :cascade do |t|
     t.integer "version_id"
-    t.string  "foreign_key_name", null: false
+    t.string "foreign_key_name", null: false
     t.integer "foreign_key_id"
     t.index ["foreign_key_name", "foreign_key_id"], name: "index_version_associations_on_foreign_key"
     t.index ["version_id"], name: "index_version_associations_on_version_id"
   end
 
   create_table "versions", force: :cascade do |t|
-    t.string   "item_type",                         null: false
-    t.integer  "item_id",                           null: false
-    t.string   "event",                             null: false
-    t.string   "whodunnit"
-    t.text     "object",         limit: 1073741823
-    t.text     "object_changes", limit: 1073741823
-    t.integer  "transaction_id"
+    t.string "item_type", null: false
+    t.integer "item_id", null: false
+    t.string "event", null: false
+    t.string "whodunnit"
+    t.text "object", limit: 1073741823
+    t.text "object_changes", limit: 1073741823
+    t.integer "transaction_id"
     t.datetime "created_at"
-    t.integer  "answer"
-    t.string   "action"
-    t.string   "question"
-    t.integer  "article_id"
-    t.string   "title"
-    t.string   "ip"
-    t.string   "user_agent"
+    t.integer "answer"
+    t.string "action"
+    t.string "question"
+    t.integer "article_id"
+    t.string "title"
+    t.string "ip"
+    t.string "user_agent"
     t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
   end
 
   create_table "whatchamajiggers", force: :cascade do |t|
-    t.string  "owner_type"
+    t.string "owner_type"
     t.integer "owner_id"
-    t.string  "name"
+    t.string "name"
   end
 
   create_table "widgets", force: :cascade do |t|
-    t.string   "name"
-    t.text     "a_text"
-    t.integer  "an_integer"
-    t.float    "a_float"
-    t.decimal  "a_decimal",  precision: 6, scale: 4
+    t.string "name"
+    t.text "a_text"
+    t.integer "an_integer"
+    t.float "a_float"
+    t.decimal "a_decimal", precision: 6, scale: 4
     t.datetime "a_datetime"
-    t.time     "a_time"
-    t.date     "a_date"
-    t.boolean  "a_boolean"
-    t.string   "type"
+    t.time "a_time"
+    t.date "a_date"
+    t.boolean "a_boolean"
+    t.string "type"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "wotsits", force: :cascade do |t|
-    t.integer  "widget_id"
-    t.string   "name"
+    t.integer "widget_id"
+    t.string "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-require "pry-nav"
+require "pry"
 
 ENV["RAILS_ENV"] = "test"
 ENV["DB"] ||= "sqlite"
@@ -53,38 +53,6 @@ module ActiveSupport
       DatabaseCleaner.clean if using_mysql?
       Thread.current[:paper_trail] = nil
     end
-
-    private
-
-    def assert_attributes_equal(expected, actual)
-      if using_mysql?
-        expected = expected.dup
-        actual = actual.dup
-
-        # Adjust timestamps for missing fractional seconds precision.
-        %w(created_at updated_at).each do |timestamp|
-          expected[timestamp] = expected[timestamp].change(usec: 0)
-          actual[timestamp] = actual[timestamp].change(usec: 0)
-        end
-      end
-
-      assert_equal expected, actual
-    end
-
-    def assert_changes_equal(expected, actual)
-      if using_mysql?
-        expected = expected.dup
-        actual = actual.dup
-
-        # Adjust timestamps for missing fractional seconds precision.
-        %w(created_at updated_at).each do |timestamp|
-          expected[timestamp][1] = expected[timestamp][1].change(usec: 0)
-          actual[timestamp][1] = actual[timestamp][1].change(usec: 0)
-        end
-      end
-
-      assert_equal expected, actual
-    end
   end
 end
 

data/test/unit/serializers/mixin_json_test.rb

@@ -1,5 +1,5 @@
 require "test_helper"
-require "custom_json_serializer"
+require_relative "../../../spec/support/custom_json_serializer"
 
 class MixinJsonTest < ActiveSupport::TestCase
   setup do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paper_trail
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.0.3
 platform: ruby
 authors:
 - Andy Stewart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -65,42 +65,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -178,33 +178,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: pry-nav
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.48.0
+        version: 0.48.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.48.0
+        version: 0.48.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -303,6 +303,7 @@ files:
 - gemfiles/ar_4.0.gemfile
 - gemfiles/ar_4.2.gemfile
 - gemfiles/ar_5.0.gemfile
+- gemfiles/ar_5.1.gemfile
 - gemfiles/ar_master.gemfile
 - lib/generators/paper_trail/USAGE
 - lib/generators/paper_trail/default_initializer.rb
@@ -362,24 +363,27 @@ files:
 - spec/models/post_with_status_spec.rb
 - spec/models/skipper_spec.rb
 - spec/models/thing_spec.rb
-- spec/models/truck_spec.rb
 - spec/models/vehicle_spec.rb
 - spec/models/version_spec.rb
 - spec/models/widget_spec.rb
 - spec/modules/paper_trail_spec.rb
 - spec/modules/version_concern_spec.rb
 - spec/modules/version_number_spec.rb
+- spec/paper_trail/associations_spec.rb
 - spec/paper_trail/cleaner_spec.rb
 - spec/paper_trail/config_spec.rb
+- spec/paper_trail/model_spec.rb
+- spec/paper_trail/serializer_spec.rb
 - spec/paper_trail/serializers/custom_yaml_serializer_spec.rb
 - spec/paper_trail/serializers/json_spec.rb
+- spec/paper_trail/serializers/yaml_spec.rb
 - spec/paper_trail/version_limit_spec.rb
+- spec/paper_trail/version_spec.rb
 - spec/paper_trail_spec.rb
-- spec/rails_helper.rb
 - spec/requests/articles_spec.rb
 - spec/spec_helper.rb
 - spec/support/alt_db_init.rb
-- test/custom_json_serializer.rb
+- spec/support/custom_json_serializer.rb
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/articles_controller.rb
@@ -460,13 +464,7 @@ files:
 - test/functional/controller_test.rb
 - test/functional/thread_safety_test.rb
 - test/test_helper.rb
-- test/time_travel_helper.rb
-- test/unit/associations_test.rb
-- test/unit/model_test.rb
-- test/unit/serializer_test.rb
 - test/unit/serializers/mixin_json_test.rb
-- test/unit/serializers/yaml_test.rb
-- test/unit/version_test.rb
 homepage: https://github.com/airblade/paper_trail
 licenses:
 - MIT
@@ -487,7 +485,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Track changes to your models.
@@ -508,24 +506,27 @@ test_files:
 - spec/models/post_with_status_spec.rb
 - spec/models/skipper_spec.rb
 - spec/models/thing_spec.rb
-- spec/models/truck_spec.rb
 - spec/models/vehicle_spec.rb
 - spec/models/version_spec.rb
 - spec/models/widget_spec.rb
 - spec/modules/paper_trail_spec.rb
 - spec/modules/version_concern_spec.rb
 - spec/modules/version_number_spec.rb
+- spec/paper_trail/associations_spec.rb
 - spec/paper_trail/cleaner_spec.rb
 - spec/paper_trail/config_spec.rb
+- spec/paper_trail/model_spec.rb
+- spec/paper_trail/serializer_spec.rb
 - spec/paper_trail/serializers/custom_yaml_serializer_spec.rb
 - spec/paper_trail/serializers/json_spec.rb
+- spec/paper_trail/serializers/yaml_spec.rb
 - spec/paper_trail/version_limit_spec.rb
+- spec/paper_trail/version_spec.rb
 - spec/paper_trail_spec.rb
-- spec/rails_helper.rb
 - spec/requests/articles_spec.rb
 - spec/spec_helper.rb
 - spec/support/alt_db_init.rb
-- test/custom_json_serializer.rb
+- spec/support/custom_json_serializer.rb
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/articles_controller.rb
@@ -606,10 +607,4 @@ test_files:
 - test/functional/controller_test.rb
 - test/functional/thread_safety_test.rb
 - test/test_helper.rb
-- test/time_travel_helper.rb
-- test/unit/associations_test.rb
-- test/unit/model_test.rb
-- test/unit/serializer_test.rb
 - test/unit/serializers/mixin_json_test.rb
-- test/unit/serializers/yaml_test.rb
-- test/unit/version_test.rb