paper_trail 5.2.2 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40131e454009216354dd82f76bfab5ecbc465efb
-  data.tar.gz: b1cbd97963f0ef014c90b2462eceaac5e6df2e77
+  metadata.gz: 096e05463c63093078629b25f9be4449a57d3fa7
+  data.tar.gz: 56ab2c64e8a17af51d4acb67076740f4dd07d17e
 SHA512:
-  metadata.gz: 42138b9e11f51e210cc11af893b77f1834727c4280dd522ef28465856f3af0072d7065c3a906ccdfcb28ee50d80eefa7535033a6c65a612287ea0d89cd7faf58
-  data.tar.gz: 8a54e81675b6954778ebd715f596886991a47aba63fb0cf3a549be9410947e181a4084b323c64d156c8587306f2c2d6aec557479f3466dada0c34feefc400177
+  metadata.gz: 6e10ad3f94b5604ba97f8d49b9f5191ace437d5bd777fa78aa0f2459c82acd852aa62ddb73bd589f90b8d28f4cdd702cdc89438bb0dd63fa020edb265bf4a3db
+  data.tar.gz: 09ccd0195883ddba04a640c4a235ac4ca5ea94e006d39549d974f4181cc55c5f6856525fdcf39c32089fcfcb4cffb088b3b8894b2077ce07a46ab02a0faa2405

data/CHANGELOG.md

@@ -3,7 +3,7 @@
 This project follows [semver 2.0.0](http://semver.org/spec/v2.0.0.html) and the
 recommendations of [keepachangelog.com](http://keepachangelog.com/).
 
-## Unreleased
+## 5.2.3 (2016-11-29)
 
 ### Breaking Changes
 
@@ -19,6 +19,11 @@ recommendations of [keepachangelog.com](http://keepachangelog.com/).
 
 ### Fixed
 
+- [#889](https://github.com/airblade/paper_trail/pull/889) -
+  Fix warning message in instances when a version can't be persisted due to validation errors.
+- [#868](https://github.com/airblade/paper_trail/pull/868)
+  Fix usage of find_by_id when primary key is not id, affecting reifying certain records.
+
 ## 5.2.2 (2016-09-08)
 
 ### Breaking Changes
@@ -27,7 +32,7 @@ recommendations of [keepachangelog.com](http://keepachangelog.com/).
 
 ### Deprecated
 
-- [#863](https://github.com/airblade/paper_trail/pull/863)
+- [#863](https://github.com/airblade/paper_trail/pull/863) -
   PaperTrail.timestamp_field= deprecated without replacement.
   See [#861](https://github.com/airblade/paper_trail/pull/861) for discussion.
 
@@ -37,6 +42,8 @@ recommendations of [keepachangelog.com](http://keepachangelog.com/).
 
 ### Fixed
 
+- None
+
 ## 5.2.1 (2016-09-02)
 
 ### Breaking Changes
@@ -404,7 +411,7 @@ candidates.
 ## 3.0.5
 
   - [#401](https://github.com/airblade/paper_trail/issues/401) / [#406](https://github.com/airblade/paper_trail/issues/406) -
-    `PaperTrail::Version` class is not loaded via a `Rails::Engine`, even when the gem is used with in Rails. This feature has
+    `PaperTrail::Version` class is not loaded via a `Rails::Engine`, even when the gem is used within Rails. This feature has
     will be re-introduced in version `4.0`.
   - [#398](https://github.com/airblade/paper_trail/pull/398) - Only require the `RSpec` helper if `RSpec::Core` is required.
 

data/README.md

@@ -11,7 +11,7 @@ has been destroyed.
 | Version        | Documentation |
 | -------------- | ------------- |
 | Unreleased     | https://github.com/airblade/paper_trail/blob/master/README.md |
-| 5.2.2          | https://github.com/airblade/paper_trail/blob/v5.2.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 |
 | 3.0.9          | https://github.com/airblade/paper_trail/blob/v3.0.9/README.md |
 | 2.7.2          | https://github.com/airblade/paper_trail/blob/v2.7.2/README.md |

data/lib/paper_trail/record_trail.rb

@@ -418,8 +418,8 @@ module PaperTrail
 
     def log_version_errors(version, action)
       version.logger.warn(
-        "Unable to create version for #{action} of #{@record.class.name}##{id}: " +
-          version.errors.full_messages.join(", ")
+        "Unable to create version for #{action} of #{@record.class.name}" +
+          "##{@record.id}: " + version.errors.full_messages.join(", ")
       )
     end
 

data/lib/paper_trail/reifier.rb

@@ -31,7 +31,8 @@ module PaperTrail
           klass = version_reification_class(version, attrs)
           # The `dup` option always returns a new object, otherwise we should
           # attempt to look for the item outside of default scope(s).
-          if options[:dup] || (item_found = klass.unscoped.find_by_id(version.item_id)).nil?
+          find_cond = { klass.primary_key => version.item_id }
+          if options[:dup] || (item_found = klass.unscoped.where(find_cond).first).nil?
             model = klass.new
           elsif options[:unversioned_attributes] == :nil
             model = item_found

data/lib/paper_trail/version_number.rb

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

data/paper_trail.gemspec

@@ -42,7 +42,13 @@ Gem::Specification.new do |s|
     s.add_development_dependency "activerecord-jdbcmysql-adapter", "~> 1.3.15"
   else
     s.add_development_dependency "sqlite3", "~> 1.2"
-    s.add_development_dependency "pg", "~> 0.17"
+
+    # pg 0.19 requires ruby >= 2.0.0
+    if ::Gem.ruby_version >= ::Gem::Version.new("2.0.0")
+      s.add_development_dependency "pg", "~> 0.19.0"
+    else
+      s.add_development_dependency "pg", [">= 0.17", "< 0.19"]
+    end
 
     # activerecord >= 4.2.5 may use mysql2 >= 0.4
     s.add_development_dependency "mysql2", "~> 0.4.2"

data/spec/models/custom_primary_key_record_spec.rb

@@ -0,0 +1,18 @@
+require "rails_helper"
+
+describe CustomPrimaryKeyRecord, type: :model do
+  it { is_expected.to be_versioned }
+
+  describe "#versions" do
+    it "returns instances of CustomPrimaryKeyRecordVersion", versioning: true do
+      custom_primary_key_record = described_class.create!
+      custom_primary_key_record.update_attributes!(name: "bob")
+      version = custom_primary_key_record.versions.last
+      expect(version).to be_a(CustomPrimaryKeyRecordVersion)
+      version_from_db = CustomPrimaryKeyRecordVersion.last
+      expect(version_from_db.reify).to be_a(CustomPrimaryKeyRecord)
+      custom_primary_key_record.destroy
+      expect(CustomPrimaryKeyRecordVersion.last.reify).to be_a(CustomPrimaryKeyRecord)
+    end
+  end
+end

data/test/dummy/app/models/custom_primary_key_record.rb

@@ -0,0 +1,13 @@
+require "securerandom"
+class CustomPrimaryKeyRecord < ActiveRecord::Base
+  self.primary_key = :uuid
+
+  has_paper_trail class_name: "CustomPrimaryKeyRecordVersion"
+  # this unusual default_scope is to test the case of the Version#item association
+  # not returning the item due to unmatched default_scope on the model.
+  default_scope -> { where(name: "custom_primary_key_record") }
+
+  before_create do
+    self.uuid ||= SecureRandom.uuid
+  end
+end

data/test/dummy/app/versions/custom_primary_key_record_version.rb

@@ -0,0 +1,3 @@
+class CustomPrimaryKeyRecordVersion < PaperTrail::Version
+  self.table_name = "custom_primary_key_record_versions"
+end

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

@@ -271,6 +271,24 @@ class SetUpTestTables < ActiveRecord::Migration
     end
     add_index :bar_habtms_foo_habtms, [:foo_habtm_id]
     add_index :bar_habtms_foo_habtms, [:bar_habtm_id]
+
+    # custom_primary_key_records use a uuid column (string)
+    create_table :custom_primary_key_records, id: false, force: true do |t|
+      t.column :uuid, :string, primary_key: true
+      t.string :name
+      t.timestamps null: true
+    end
+
+    # and custom_primary_key_record_versions stores the uuid in item_id, a string
+    create_table :custom_primary_key_record_versions, force: true 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.datetime :created_at
+    end
+    add_index :custom_primary_key_record_versions, [:item_type, :item_id], name: "idx_cust_pk_item"
   end
 
   def down

data/test/dummy/db/schema.rb

@@ -80,6 +80,24 @@ ActiveRecord::Schema.define(version: 20110208155312) do
     t.integer "quotation_id"
   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.datetime "created_at"
+  end
+
+  add_index "custom_primary_key_record_versions", ["item_type", "item_id"], name: "idx_cust_pk_item"
+
+  create_table "custom_primary_key_records", id: false, force: :cascade do |t|
+    t.string   "uuid"
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "customers", force: :cascade do |t|
     t.string "name"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paper_trail
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.3
 platform: ruby
 authors:
 - Andy Stewart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -239,14 +239,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -327,6 +327,7 @@ files:
 - spec/models/boolit_spec.rb
 - spec/models/callback_modifier_spec.rb
 - spec/models/car_spec.rb
+- spec/models/custom_primary_key_record_spec.rb
 - spec/models/fluxor_spec.rb
 - spec/models/gadget_spec.rb
 - spec/models/joined_version_spec.rb
@@ -367,6 +368,7 @@ files:
 - test/dummy/app/models/cat.rb
 - test/dummy/app/models/chapter.rb
 - test/dummy/app/models/citation.rb
+- test/dummy/app/models/custom_primary_key_record.rb
 - test/dummy/app/models/customer.rb
 - test/dummy/app/models/document.rb
 - test/dummy/app/models/dog.rb
@@ -399,6 +401,7 @@ files:
 - test/dummy/app/models/whatchamajigger.rb
 - test/dummy/app/models/widget.rb
 - test/dummy/app/models/wotsit.rb
+- test/dummy/app/versions/custom_primary_key_record_version.rb
 - test/dummy/app/versions/joined_version.rb
 - test/dummy/app/versions/json_version.rb
 - test/dummy/app/versions/kitchen/banana_version.rb
@@ -475,6 +478,7 @@ test_files:
 - spec/models/boolit_spec.rb
 - spec/models/callback_modifier_spec.rb
 - spec/models/car_spec.rb
+- spec/models/custom_primary_key_record_spec.rb
 - spec/models/fluxor_spec.rb
 - spec/models/gadget_spec.rb
 - spec/models/joined_version_spec.rb
@@ -515,6 +519,7 @@ test_files:
 - test/dummy/app/models/cat.rb
 - test/dummy/app/models/chapter.rb
 - test/dummy/app/models/citation.rb
+- test/dummy/app/models/custom_primary_key_record.rb
 - test/dummy/app/models/customer.rb
 - test/dummy/app/models/document.rb
 - test/dummy/app/models/dog.rb
@@ -547,6 +552,7 @@ test_files:
 - test/dummy/app/models/whatchamajigger.rb
 - test/dummy/app/models/widget.rb
 - test/dummy/app/models/wotsit.rb
+- test/dummy/app/versions/custom_primary_key_record_version.rb
 - test/dummy/app/versions/joined_version.rb
 - test/dummy/app/versions/json_version.rb
 - test/dummy/app/versions/kitchen/banana_version.rb