paper_trail 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 342a6b8d2c4c6685107d14ae36f6711d7fe09d78
-  data.tar.gz: f7d83394a6bb503a898509b26e9adf0f712c1dfb
+  metadata.gz: d6b8b27c90bfd64f2b38cef59276076e4123f38b
+  data.tar.gz: 02bc459e5c9ae9e74eafdc782eee7cb4708cfb3e
 SHA512:
-  metadata.gz: d240d05e510adf0a4e178a27cda8e490b99750384a15af935daa6019f02f8ce944c7894fdea76fb970a07dde7bdbbf62de8c314a24f5684f961d8da949fe3b64
-  data.tar.gz: 078716e13039aebf41ea3c10e78180e78d1879ab30095a39298678bb88e6e5659a760f67449cbffee22492419943988df53eac04417fd8da8259804a08fe4732
+  metadata.gz: c0581395fd0a5782e279133c26ff723a62eda27470ecd57660d3b495c55ef542a9d08b99a5701762f585fefed54a5191c367469031a1a00cb2efede10690a7b8
+  data.tar.gz: e12d54c3a6c00dfa21d2634ee6b2561bbf1aba2bbc907e82f0a651b12acf35a391c6ca81a0e589feca9e0c502efbdc052b5b2e18010e44a3a9ea60c7ec99b8fe

data/CHANGELOG.md

@@ -1,11 +1,16 @@
+## 3.0.7
+
+  - [#404](https://github.com/airblade/paper_trail/issues/404) / [#428](https://github.com/airblade/paper_trail/issues/428) -
+    Fix errors occuring when a user attempts to update the inheritance column on an STI model instance in `ActiveRecord` 4.1.x
+
 ## 3.0.6
 
   - [#414](https://github.com/airblade/paper_trail/issues/414) - Fix functionality `ignore` argument to `has_paper_trail`
-    in `ActiveRecord` 4.
+    in `ActiveRecord` 4
 
 ## 3.0.5
 
-  - [#401](https://github.com/airblade/paper_trail/issues/401) / [#406](https://github.com/airblade/paper_trail/issues/406)
+  - [#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
     will be re-introduced in version `3.1.0`.
   - [#398](https://github.com/airblade/paper_trail/pull/398) - Only require the `RSpec` helper if `RSpec::Core` is required.
@@ -20,7 +25,7 @@ in the `PaperTrail::Version` class through a `Rails::Engine` when the gem is use
   - [#383](https://github.com/airblade/paper_trail/pull/383) - Make gem compatible with `ActiveRecord::Enum` (available in `ActiveRecord` 4.1+).
   - [#380](https://github.com/airblade/paper_trail/pull/380) / [#377](https://github.com/airblade/paper_trail/issues/377) -
     Add `VersionConcern#where_object` instance method; acts as a helper for querying against the `object` column in versions table.
-  - [#373](https://github.com/airblade/paper_trail/pull/373) - Fix default sort order for the `versions` association in `ActiveRecord` 4.1.
+  - [#373](https://github.com/airblade/paper_trail/pull/373) - Fix default sort order for the `versions` association in `ActiveRecord` 4.1+
   - [#372](https://github.com/airblade/paper_trail/pull/372) - Use [Arel](https://github.com/rails/arel) for SQL construction.
   - [#365](https://github.com/airblade/paper_trail/issues/365) - `VersionConcern#version_at` should return `nil` when receiving a timestamp
     that occured after the object was destroyed.

data/README.md

@@ -42,7 +42,7 @@ The Rails 2.3 code is on the [`rails2`](https://github.com/airblade/paper_trail/
 
 1. Add PaperTrail to your `Gemfile`.
 
-    `gem 'paper_trail', '~> 3.0.6'`
+    `gem 'paper_trail', '~> 3.0.7'`
 
 2. Generate a migration which will add a `versions` table to your database.
 
@@ -64,7 +64,7 @@ your applications `ActiveRecord` connection in a manner similar to the way `Rail
 
 1. Add PaperTrail to your `Gemfile`.
 
-    `gem 'paper_trail', '~> 3.0.6'`
+    `gem 'paper_trail', '~> 3.0.7'`
 
 2. Generate a migration to add a `versions` table to your database.
 
@@ -545,7 +545,7 @@ If you are using Postgres, you should also define the sequence that your custom
 ```ruby
 class PostVersion < PaperTrail::Version
   self.table_name = :post_versions
-  self.sequence_name = :post_version_id_seq
+  self.sequence_name = :post_versions_id_seq
 end
 ```
 
@@ -890,6 +890,23 @@ A valid serializer is a `module` (or `class`) that defines a `load` and `dump` m
 * [YAML](https://github.com/airblade/paper_trail/blob/master/lib/paper_trail/serializers/yaml.rb) - Default
 * [JSON](https://github.com/airblade/paper_trail/blob/master/lib/paper_trail/serializers/json.rb)
 
+### PostgreSQL JSON column type support
+
+If you use PostgreSQL, and would like to store your `object` (and/or `object_changes`) data in a column of
+[type `JSON`](http://www.postgresql.org/docs/9.4/static/datatype-json.html),
+specify `json` instead of `text` for these columns in your migration:
+
+```ruby
+create_table :versions do |t|
+  ...
+  t.json :object          # Full object changes
+  t.json :object_changes  # Optional column-level changes
+  ...
+end
+```
+
+Note: You don't need to use a particular serializer for the PostgreSQL `JSON` column type.
+
 ## Limiting the number of versions created per object instance
 
 If you are wary of your `versions` table growing to an unwieldy size, or just don't care to track more than a certain number of versions per object,

data/lib/paper_trail/has_paper_trail.rb

@@ -338,14 +338,8 @@ module PaperTrail
       end
 
       def item_before_change
-        previous = self.dup
-        # `dup` clears timestamps so we add them back.
-        all_timestamp_attributes.each do |column|
-          previous[column] = send(column) if self.class.column_names.include?(column.to_s) and not send(column).nil?
-        end
-        enums = previous.respond_to?(:defined_enums) ? previous.defined_enums : {}
-        previous.tap do |prev|
-          prev.id = id # `dup` clears the `id` so we add that back
+        attributes.tap do |prev|
+          enums = self.respond_to?(:defined_enums) ? self.defined_enums : {}
           changed_attributes.select { |k,v| self.class.column_names.include?(k) }.each do |attr, before|
             before = enums[attr][before] if enums[attr]
             prev[attr] = before
@@ -353,9 +347,10 @@ module PaperTrail
         end
       end
 
-      # returns hash of object attributes (with appropriate attributes serialized), ommitting attributes to be skipped
-      def object_attrs_for_paper_trail(object)
-        _attrs = object.attributes.except(*self.paper_trail_options[:skip]).tap do |attributes|
+      # returns hash of attributes (with appropriate attributes serialized),
+      # ommitting attributes to be skipped
+      def object_attrs_for_paper_trail(attributes_hash)
+        attributes_hash.except(*self.paper_trail_options[:skip]).tap do |attributes|
           self.class.serialize_attributes_for_paper_trail(attributes)
         end
       end

data/lib/paper_trail/version_number.rb

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

data/spec/models/animal_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Animal, :type => :model do
+  it { is_expected.to be_versioned }
+
+  describe "STI", :versioning => true do
+    it { expect(Animal.inheritance_column).to eq('species') }
+
+    describe "updates to the `inheritance_column`" do
+      subject { Cat.create!(:name => 'Leo') }
+
+      it "should be allowed" do
+        subject.update_attributes(:name => 'Spike', :species => 'Dog')
+        dog = Animal.find(subject.id)
+        expect(dog).to be_instance_of(Dog)
+      end
+    end
+  end
+end

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

@@ -1,4 +1,6 @@
 class Animal < ActiveRecord::Base
   has_paper_trail
   self.inheritance_column = 'species'
+
+  attr_accessible :species, :name if ::PaperTrail.active_record_protected_attributes?
 end

data/test/unit/serializer_test.rb

@@ -10,7 +10,7 @@ class SerializerTest < ActiveSupport::TestCase
       END
 
       @fluxor = Fluxor.create :name => 'Some text.'
-      @original_fluxor_attributes = @fluxor.send(:item_before_change).attributes # this is exactly what PaperTrail serializes
+      @original_fluxor_attributes = @fluxor.send(:item_before_change) # this is exactly what PaperTrail serializes
       @fluxor.update_attributes :name => 'Some more text.'
     end
 
@@ -41,7 +41,7 @@ class SerializerTest < ActiveSupport::TestCase
       END
 
       @fluxor = Fluxor.create :name => 'Some text.'
-      @original_fluxor_attributes = @fluxor.send(:item_before_change).attributes # this is exactly what PaperTrail serializes
+      @original_fluxor_attributes = @fluxor.send(:item_before_change) # this is exactly what PaperTrail serializes
       @fluxor.update_attributes :name => 'Some more text.'
     end
 
@@ -83,7 +83,7 @@ class SerializerTest < ActiveSupport::TestCase
       END
 
       @fluxor = Fluxor.create
-      @original_fluxor_attributes = @fluxor.send(:item_before_change).attributes.reject { |k,v| v.nil? } # this is exactly what PaperTrail serializes
+      @original_fluxor_attributes = @fluxor.send(:item_before_change).reject { |k,v| v.nil? } # this is exactly what PaperTrail serializes
       @fluxor.update_attributes :name => 'Some more text.'
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paper_trail
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Andy Stewart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -263,6 +263,7 @@ files:
 - lib/paper_trail/version_number.rb
 - paper_trail.gemspec
 - spec/generators/install_generator_spec.rb
+- spec/models/animal_spec.rb
 - spec/models/gadget_spec.rb
 - spec/models/joined_version_spec.rb
 - spec/models/post_with_status_spec.rb
@@ -374,12 +375,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Track changes to your models' data. Good for auditing or versioning.
 test_files:
 - spec/generators/install_generator_spec.rb
+- spec/models/animal_spec.rb
 - spec/models/gadget_spec.rb
 - spec/models/joined_version_spec.rb
 - spec/models/post_with_status_spec.rb