paper_trail 3.0.7 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6b8b27c90bfd64f2b38cef59276076e4123f38b
-  data.tar.gz: 02bc459e5c9ae9e74eafdc782eee7cb4708cfb3e
+  metadata.gz: de205e84196241d1165f38050f43114114b47cca
+  data.tar.gz: 2401292c3098d9050260528490556294f8034a6d
 SHA512:
-  metadata.gz: c0581395fd0a5782e279133c26ff723a62eda27470ecd57660d3b495c55ef542a9d08b99a5701762f585fefed54a5191c367469031a1a00cb2efede10690a7b8
-  data.tar.gz: e12d54c3a6c00dfa21d2634ee6b2561bbf1aba2bbc907e82f0a651b12acf35a391c6ca81a0e589feca9e0c502efbdc052b5b2e18010e44a3a9ea60c7ec99b8fe
+  metadata.gz: 89b14153e1f66e8e043532c78a6cda7033e2aa902c9d191fddc29ece1a4036c9808c26e345ca3360d4c70f6d1193eac14eb5884025a45750361419e290217d2f
+  data.tar.gz: 531199dd212d76562c9baed8033fd3ca765b5458b19c3b8029e89c8cd3f7a44202cdcb5efd3ad979022c5e4386e47e042fab2617470134a52d3ee6b328779f65

data/CHANGELOG.md

@@ -1,18 +1,32 @@
+## 3.0.9
+
+  - [#479](https://github.com/airblade/paper_trail/issues/479) - Deprecated `originator` method in favor of
+    `paper_trail_originator` Deprecation warning informs users that the `originator` of the methods will be
+    removed in version `4.0`. (Backported from v4)
+  - Updated deprecation warnings for `Model.paper_trail_on` and `Model.paper_trail_off` to have display correct
+    version number the methods will be removed (`4.0`)
+
+## 3.0.8
+
+  - [#525](https://github.com/airblade/paper_trail/issues/525) / [#512](https://github.com/airblade/paper_trail/pull/512) -
+    Support for virtual accessors and redefined setter and getter methods. (Backported from v4)
+
 ## 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
+    Fix errors occuring when a user attempts to update the inheritance column on an STI model instance in `ActiveRecord` 4.1.x.
+    (Backported from v4)
 
 ## 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. (Backported from v4)
 
 ## 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
-    will be re-introduced in version `3.1.0`.
+    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.
 
 ## 3.0.3
@@ -57,7 +71,7 @@ in the `PaperTrail::Version` class through a `Rails::Engine` when the gem is use
     with Rails `4.1.0.rc1`.
   - [#334](https://github.com/airblade/paper_trail/pull/334) - Add small-scope `whodunnit` method to `PaperTrail::Model::InstanceMethods`.
   - [#329](https://github.com/airblade/paper_trail/issues/329) - Add `touch_with_version` method to `PaperTrail::Model::InstanceMethods`,
-    to allow for generating a version `touch`ing a model.
+    to allow for generating a version while `touch`ing a model.
   - [#328](https://github.com/airblade/paper_trail/pull/328) / [#326](https://github.com/airblade/paper_trail/issues/326) /
     [#307](https://github.com/airblade/paper_trail/issues/307) - `Model.paper_trail_enabled_for_model?` and
     `model_instance.without_versioning` is now thread-safe.
@@ -68,8 +82,8 @@ in the `PaperTrail::Version` class through a `Rails::Engine` when the gem is use
   - [#312](https://github.com/airblade/paper_trail/issues/312) - Fix RSpec `with_versioning` class level helper method.
   - `model_instance.without_versioning` now yields the `model_instance`, enabling syntax like this:
     `model_instance.without_versioning { |obj| obj.update_attributes(:name => 'value') }`.
-  - Deprecated `Model.paper_trail_on` and `Model.paper_trail_off` in favor of bang versions of the methods. Deprecation warning
-    informs users that the non-bang versions of the methods will be removed in version `3.1.0`.
+  - Deprecated `Model.paper_trail_on` and `Model.paper_trail_off` in favor of bang versions of the methods.
+    Deprecation warning informs users that the non-bang versions of the methods will be removed in version `4.0`
 
 ## 3.0.0
 

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.7'`
+    `gem 'paper_trail', '~> 3.0.9'`
 
 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.7'`
+    `gem 'paper_trail', '~> 3.0.9'`
 
 2. Generate a migration to add a `versions` table to your database.
 
@@ -115,7 +115,7 @@ widget.version
 widget.live?
 
 # Returns who put the widget into its current state.
-widget.originator
+widget.paper_trail_originator
 
 # Returns the widget (not a version) as it looked at the given timestamp.
 widget.version_at(timestamp)
@@ -147,7 +147,7 @@ And a `PaperTrail::Version` instance has these methods:
 version.reify(options = {})
 
 # Returns who put the item into the state stored in this version.
-version.originator
+version.paper_trail_originator
 
 # Returns who changed the item from the state it had in this version.
 version.terminator
@@ -504,22 +504,22 @@ Sometimes you want to define who is responsible for a change in a small scope wi
 
 A version's `whodunnit` records who changed the object causing the `version` to be stored.  Because a version stores the object as it looked before the change (see the table above), `whodunnit` returns who stopped the object looking like this -- not who made it look like this.  Hence `whodunnit` is aliased as `terminator`.
 
-To find out who made a version's object look that way, use `version.originator`.  And to find out who made a "live" object look like it does, use `originator` on the object.
+To find out who made a version's object look that way, use `version.paper_trail_originator`.  And to find out who made a "live" object look like it does, call `paper_trail_originator` on the object.
 
 ```ruby
 >> widget = Widget.find 153                    # assume widget has 0 versions
 >> PaperTrail.whodunnit = 'Alice'
 >> widget.update_attributes :name => 'Yankee'
->> widget.originator                           # 'Alice'
+>> widget..paper_trail_originator              # 'Alice'
 >> PaperTrail.whodunnit = 'Bob'
 >> widget.update_attributes :name => 'Zulu'
->> widget.originator                           # 'Bob'
+>> widget.paper_trail_originator               # 'Bob'
 >> first_version, last_version = widget.versions.first, widget.versions.last
 >> first_version.whodunnit                     # 'Alice'
->> first_version.originator                    # nil
+>> first_version.paper_trail_originator        # nil
 >> first_version.terminator                    # 'Alice'
 >> last_version.whodunnit                      # 'Bob'
->> last_version.originator                     # 'Alice'
+>> last_version.paper_trail_originator         # 'Alice'
 >> last_version.terminator                     # 'Bob'
 ```
 

data/gemfiles/3.0.gemfile

@@ -1,11 +1,12 @@
 source 'https://rubygems.org'
 
 gem 'activerecord', '~> 3.0'
+gem 'i18n', '~> 0.6.11'
 
 group :development, :test do
   gem 'rake', '~> 10.1.1'
   gem 'shoulda', '~> 3.5'
-  gem 'ffaker',  '>= 1.15'
+  gem 'ffaker',  '<= 1.31.0'
 
   # Testing of Rails
   gem 'railties', '~> 3.0'
@@ -24,7 +25,7 @@ group :development, :test do
   platforms :ruby do 
     gem 'sqlite3', '~> 1.2'
     gem 'mysql2', '~> 0.3'
-    gem 'pg', '~> 0.17'
+    gem 'pg', '~> 0.17.1'
   end
 
   platforms :jruby, :ruby_18 do
@@ -38,5 +39,6 @@ group :development, :test do
     gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3'
     gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3'
     gem 'activerecord-jdbcmysql-adapter', '~> 1.3'
+    gem 'activerecord-jdbc-adapter', '1.3.15'
   end
 end

data/lib/paper_trail/has_paper_trail.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object' # provides the `try` method
+
 module PaperTrail
   module Model
 
@@ -86,7 +88,7 @@ module PaperTrail
       end
 
       def paper_trail_off
-        warn "DEPRECATED: use `paper_trail_off!` instead of `paper_trail_off`. Support for `paper_trail_off` will be removed in PaperTrail 3.1"
+        warn "DEPRECATED: use `paper_trail_off!` instead of `paper_trail_off`. Support for `paper_trail_off` will be removed in PaperTrail 4.0"
         self.paper_trail_off!
       end
 
@@ -96,7 +98,7 @@ module PaperTrail
       end
 
       def paper_trail_on
-        warn "DEPRECATED: use `paper_trail_on!` instead of `paper_trail_on`. Support for `paper_trail_on` will be removed in PaperTrail 3.1"
+        warn "DEPRECATED: use `paper_trail_on!` instead of `paper_trail_on`. Support for `paper_trail_on` will be removed in PaperTrail 4.0"
         self.paper_trail_on!
       end
 
@@ -173,10 +175,15 @@ module PaperTrail
       end
 
       # Returns who put the object into its current state.
-      def originator
+      def paper_trail_originator
         (source_version || send(self.class.versions_association_name).last).try(:whodunnit)
       end
 
+      def originator
+        warn "DEPRECATED: use `paper_trail_originator` instead of `originator`. Support for `originator` will be removed in PaperTrail 4.0"
+        self.paper_trail_originator
+      end
+
       # Returns the object (not a Version) as it was at the given timestamp.
       def version_at(timestamp, reify_options={})
         # Because a version stores how its object looked *before* the change,

data/lib/paper_trail/version_concern.rb

@@ -148,8 +148,10 @@ module PaperTrail
 
         # Set all the attributes in this version on the model
         attrs.each do |k, v|
-          if model.respond_to?("#{k}=")
+          if model.has_attribute?(k)
             model[k.to_sym] = v
+          elsif model.respond_to?("#{k}=")
+            model.send("#{k}=", v)
           else
             logger.warn "Attribute #{k} does not exist on #{item_type} (Version id: #{id})."
           end
@@ -179,8 +181,13 @@ module PaperTrail
     end
 
     # Returns who put the item into the state stored in this version.
+    def paper_trail_originator
+      @paper_trail_originator ||= previous.whodunnit rescue nil
+    end
+
     def originator
-      @originator ||= previous.whodunnit rescue nil
+      warn "DEPRECATED: use `paper_trail_originator` instead of `originator`. Support for `originator` will be removed in PaperTrail 4.0"
+      self.paper_trail_originator
     end
 
     # Returns who changed the item from the state it had in this version.

data/lib/paper_trail/version_number.rb

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

data/paper_trail.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 10.1.1'
   s.add_development_dependency 'shoulda', '~> 3.5'
   # s.add_development_dependency 'shoulda-matchers', '~> 1.5' # needed for ActiveRecord < 4
-  s.add_development_dependency 'ffaker',  '>= 1.15'
+  s.add_development_dependency 'ffaker', '<= 1.31.0'
   s.add_development_dependency 'railties', ['>= 3.0', '< 5.0']
   s.add_development_dependency 'sinatra', '~> 1.0'
   s.add_development_dependency 'rack-test', '>= 0.6'

data/spec/models/version_spec.rb

@@ -22,13 +22,60 @@ describe PaperTrail::Version do
     describe "Instance" do
       subject { PaperTrail::Version.new(attributes) rescue PaperTrail::Version.new }
 
-      describe :terminator do
+      describe '#paper_trail_originator' do
+        it { is_expected.to respond_to(:paper_trail_originator) }
+
+        context "No previous versions" do
+          specify { expect(subject.previous).to be_nil }
+
+          it "should return nil" do
+            expect(subject.paper_trail_originator).to be_nil
+          end
+        end
+
+        context "Has previous version", :versioning => true do
+          let(:name) { Faker::Name.name }
+          let(:widget) { Widget.create!(:name => Faker::Name.name) }
+          before do
+            widget.versions.first.update_attributes!(:whodunnit => name)
+            widget.update_attributes!(:name => Faker::Name.first_name)
+          end
+          subject { widget.versions.last }
+
+          specify { expect(subject.previous).to be_instance_of(PaperTrail::Version) }
+
+          it "should return nil" do
+            expect(subject.paper_trail_originator).to eq(name)
+          end
+        end
+      end
+
+      describe "#originator" do
+        it { is_expected.to respond_to(:originator) }
+        let(:warning_msg) do
+          "DEPRECATED: use `paper_trail_originator` instead of `originator`." +
+          " Support for `originator` will be removed in PaperTrail 4.0"
+        end
+
+        it 'should set the invoke `paper_trail_originator`' do
+          is_expected.to receive(:warn)
+          is_expected.to receive(:paper_trail_originator)
+          subject.originator
+        end
+
+        it 'should display a deprecation warning' do
+          is_expected.to receive(:warn).with(warning_msg)
+          subject.originator
+        end
+      end
+
+      describe '#terminator' do
         it { should respond_to(:terminator) }
 
         let(:attributes) { {:whodunnit => Faker::Name.first_name} }
 
         it "is an alias for the `whodunnit` attribute" do
-          subject.whodunnit.should == attributes[:whodunnit]
+          subject.terminator.should == attributes[:whodunnit]
         end
       end
 

data/spec/models/widget_spec.rb

@@ -72,8 +72,8 @@ describe Widget do
 
   describe "Methods" do
     describe "Instance", :versioning => true do
-      describe :originator do
-        it { should respond_to(:originator) }
+      describe '#paper_trail_originator' do
+        it { should respond_to(:paper_trail_originator) }
 
         describe "return value" do
           let(:orig_name) { Faker::Name.name }
@@ -84,9 +84,9 @@ describe Widget do
             specify { widget.should be_live }
 
             it "should return the originator for the model at a given state" do
-              widget.originator.should == orig_name
+              widget.paper_trail_originator.should == orig_name
               widget.whodunnit(new_name) { |w| w.update_attributes(:name => 'Elizabeth') }
-              widget.originator.should == new_name
+              widget.paper_trail_originator.should == new_name
             end
           end
 
@@ -99,13 +99,34 @@ describe Widget do
             let(:reified_widget) { widget.versions[1].reify }
 
             it "should return the appropriate originator" do
-              reified_widget.originator.should == orig_name
+              reified_widget.paper_trail_originator.should == orig_name
             end
           end
         end
       end
 
-      describe :version_at do
+      describe "#originator" do
+        subject { widget }
+
+        it { is_expected.to respond_to(:originator) }
+        let(:warning_msg) do
+          "DEPRECATED: use `paper_trail_originator` instead of `originator`." +
+          " Support for `originator` will be removed in PaperTrail 4.0"
+        end
+
+        it 'should set the invoke `paper_trail_originator`' do
+          is_expected.to receive(:warn)
+          is_expected.to receive(:paper_trail_originator)
+          subject.originator
+        end
+
+        it 'should display a deprecation warning' do
+          is_expected.to receive(:warn).with(warning_msg)
+          subject.originator
+        end
+      end
+
+      describe '#version_at' do
         it { should respond_to(:version_at) }
 
         context "Timestamp argument is AFTER object has been destroyed" do
@@ -200,7 +221,7 @@ describe Widget do
         end
 
         it 'should display a deprecation warning' do
-          subject.should_receive(:warn).with("DEPRECATED: use `paper_trail_on!` instead of `paper_trail_on`. Support for `paper_trail_on` will be removed in PaperTrail 3.1")
+          subject.should_receive(:warn).with("DEPRECATED: use `paper_trail_on!` instead of `paper_trail_on`. Support for `paper_trail_on` will be removed in PaperTrail 4.0")
           subject.paper_trail_on
         end
       end
@@ -229,7 +250,7 @@ describe Widget do
         end
 
         it 'should display a deprecation warning' do
-          subject.should_receive(:warn).with("DEPRECATED: use `paper_trail_on!` instead of `paper_trail_on`. Support for `paper_trail_on` will be removed in PaperTrail 3.1")
+          subject.should_receive(:warn).with("DEPRECATED: use `paper_trail_on!` instead of `paper_trail_on`. Support for `paper_trail_on` will be removed in PaperTrail 4.0")
           subject.paper_trail_on
         end
       end

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

@@ -15,12 +15,22 @@ class Person < ActiveRecord::Base
 
   # Store TimeZone objects as strings when serialized to database
   class TimeZoneSerializer
+    class << self
+      def dump(zone)
+        zone.try(:name)
+      end
+
+      def load(value)
+        ::Time.find_zone!(value) rescue nil
+      end
+    end
+
     def dump(zone)
-      zone.try(:name)
+      self.class.dump(zone)
     end
-   
+
     def load(value)
-      ::Time.find_zone!(value) rescue nil
+      self.class.load(value)
     end
   end
  

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

@@ -1,6 +1,7 @@
 # Example from 'Overwriting default accessors' in ActiveRecord::Base.
 class Song < ActiveRecord::Base
   has_paper_trail
+  attr_accessor :name
 
   # Uses an integer of seconds to hold the length of the song
   def length=(minutes)
@@ -9,4 +10,23 @@ class Song < ActiveRecord::Base
   def length
     read_attribute(:length) / 60
   end
+
+  # override attributes hashes like some libraries do
+  def attributes_with_name
+    if name
+      attributes_without_name.merge(:name => name)
+    else
+      attributes_without_name
+    end
+  end
+  alias_method_chain :attributes, :name
+
+  def changed_attributes_with_name
+    if name
+      changed_attributes_without_name.merge(:name => name)
+    else
+      changed_attributes_without_name
+    end
+  end
+  alias_method_chain :changed_attributes, :name
 end

data/test/dummy/config/application.rb

@@ -59,5 +59,8 @@ module Dummy
 
     # Rails 4 key for generating secret key
     config.secret_key_base = 'A fox regularly kicked the screaming pile of biscuits.'
+
+    # supress warnings about raises in transactional callbacks on AR 4.2+
+    config.active_record.raise_in_transactional_callbacks = true if ActiveRecord::VERSION::STRING >= '4.2'
   end
 end

data/test/unit/model_test.rb

@@ -567,9 +567,9 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
 
       should 'track who made the change' do
         assert_equal 'Alice', @version.whodunnit
-        assert_nil   @version.originator
+        assert_nil   @version.paper_trail_originator
         assert_equal 'Alice', @version.terminator
-        assert_equal 'Alice', @widget.originator
+        assert_equal 'Alice', @widget.paper_trail_originator
       end
 
       context 'when a record is updated' do
@@ -581,9 +581,9 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
 
         should 'track who made the change' do
           assert_equal 'Bob',   @version.whodunnit
-          assert_equal 'Alice', @version.originator
+          assert_equal 'Alice', @version.paper_trail_originator
           assert_equal 'Bob',   @version.terminator
-          assert_equal 'Bob',   @widget.originator
+          assert_equal 'Bob',   @widget.paper_trail_originator
         end
 
         context 'when a record is destroyed' do
@@ -595,9 +595,9 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
 
           should 'track who made the change' do
             assert_equal 'Charlie', @version.whodunnit
-            assert_equal 'Bob',     @version.originator
+            assert_equal 'Bob',     @version.paper_trail_originator
             assert_equal 'Charlie', @version.terminator
-            assert_equal 'Charlie', @widget.originator
+            assert_equal 'Charlie', @widget.paper_trail_originator
           end
         end
       end
@@ -616,15 +616,18 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
       assert_not_nil @wotsit.versions.last.reify.updated_at
     end
 
-    should 'not generate warning' do
-      # Tests that it doesn't try to write created_on as an attribute just because a created_on
-      # method exists.
-      warnings = capture(:stderr) {  # Deprecation warning in Rails 3.2
-        assert_nothing_raised {  # ActiveModel::MissingAttributeError in Rails 4
-          @wotsit.update_attributes! :name => 'changed'
+    # Currently the gem generates a bunch of deprecation warnings about serialized attributes on AR 4.2
+    if ActiveRecord::VERSION::STRING < '4.2'
+      should 'not generate warning' do
+        # Tests that it doesn't try to write created_on as an attribute just because a created_on
+        # method exists.
+        warnings = capture(:stderr) {  # Deprecation warning in Rails 3.2
+          assert_nothing_raised {  # ActiveModel::MissingAttributeError in Rails 4
+            @wotsit.update_attributes! :name => 'changed'
+          }
         }
-      }
-      assert_equal '', warnings
+        assert_equal '', warnings
+      end
     end
 
   end
@@ -646,7 +649,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.originator
+      assert_equal PaperTrail.whodunnit, @foo.paper_trail_originator
     end
 
     context 'when destroyed' do
@@ -1052,12 +1055,14 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
       should 'version.object_changes attribute should have stored the value returned by the attribute serializer' do
         as_stored_in_version = HashWithIndifferentAccess[YAML::load(@person.versions.last.object_changes)]
         assert_equal [nil, 'Samoa'], as_stored_in_version[:time_zone]
-        assert_equal @person.instance_variable_get(:@attributes)['time_zone'].serialized_value, as_stored_in_version[:time_zone].last
+        serialized_value = Person::TimeZoneSerializer.dump(@person.time_zone)
+        assert_equal serialized_value, as_stored_in_version[:time_zone].last
       end
 
       # Tests for unserialization:
       should 'version.changeset should convert the attribute value back to its original, unserialized value' do
-        assert_equal @person.instance_variable_get(:@attributes)['time_zone'].unserialized_value, @person.versions.last.changeset[:time_zone].last
+        unserialized_value = Person::TimeZoneSerializer.load(@person.time_zone)
+        assert_equal unserialized_value, @person.versions.last.changeset[:time_zone].last
       end
       should "record.changes (before save) returns the original, unserialized values" do
         assert_equal [NilClass, ActiveSupport::TimeZone], @changes_before_save[:time_zone].map(&:class)
@@ -1069,7 +1074,7 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
 
       context 'when that attribute is updated' do
         setup do
-          @attribute_value_before_change = @person.instance_variable_get(:@attributes)['time_zone']
+          @attribute_value_before_change = @person.time_zone
           @person.assign_attributes({ :time_zone => 'Pacific Time (US & Canada)' })
           @changes_before_save = @person.changes.dup
           @person.save!
@@ -1078,7 +1083,7 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
         # Tests for serialization:
         # Before the serialized attributes fix, the object/object_changes value that was stored was ridiculously long (58723).
         should 'version.object should not have stored the default, ridiculously long (to_yaml) serialization of the TimeZone object' do
-          assert @person.versions.last.object.        length < 105, "object         length was #{@person.versions.last.object        .length}"
+          assert @person.versions.last.object.length < 105, "object length was #{@person.versions.last.object.length}"
         end
         # Need an additional clause to detect what version of ActiveRecord is being used for this test because AR4 injects the `updated_at` column into the changeset for updates to models
         should 'version.object_changes should not have stored the default, ridiculously long (to_yaml) serialization of the TimeZone object' do
@@ -1088,20 +1093,24 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
         should 'version.object attribute should have stored the value returned by the attribute serializer' do
           as_stored_in_version = HashWithIndifferentAccess[YAML::load(@person.versions.last.object)]
           assert_equal 'Samoa', as_stored_in_version[:time_zone]
-          assert_equal @attribute_value_before_change.serialized_value, as_stored_in_version[:time_zone]
+          serialized_value = Person::TimeZoneSerializer.dump(@attribute_value_before_change)
+          assert_equal serialized_value, as_stored_in_version[:time_zone]
         end
         should 'version.object_changes attribute should have stored the value returned by the attribute serializer' do
           as_stored_in_version = HashWithIndifferentAccess[YAML::load(@person.versions.last.object_changes)]
           assert_equal ['Samoa', 'Pacific Time (US & Canada)'], as_stored_in_version[:time_zone]
-          assert_equal @person.instance_variable_get(:@attributes)['time_zone'].serialized_value, as_stored_in_version[:time_zone].last
+          serialized_value = Person::TimeZoneSerializer.dump(@person.time_zone)
+          assert_equal serialized_value, as_stored_in_version[:time_zone].last
         end
 
         # Tests for unserialization:
         should 'version.reify should convert the attribute value back to its original, unserialized value' do
-          assert_equal @attribute_value_before_change.unserialized_value, @person.versions.last.reify.time_zone
+          unserialized_value = Person::TimeZoneSerializer.load(@attribute_value_before_change)
+          assert_equal unserialized_value, @person.versions.last.reify.time_zone
         end
         should 'version.changeset should convert the attribute value back to its original, unserialized value' do
-          assert_equal @person.instance_variable_get(:@attributes)['time_zone'].unserialized_value, @person.versions.last.changeset[:time_zone].last
+          unserialized_value = Person::TimeZoneSerializer.load(@person.time_zone)
+          assert_equal unserialized_value, @person.versions.last.changeset[:time_zone].last
         end
         should "record.changes (before save) returns the original, unserialized values" do
           assert_equal [ActiveSupport::TimeZone, ActiveSupport::TimeZone], @changes_before_save[:time_zone].map(&:class)
@@ -1165,6 +1174,21 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
     should 'return "overwritten" value on reified instance' do
       assert_equal 4, @song.versions.last.reify.length
     end
+
+    context 'Has a virtual attribute injected into the ActiveModel::Dirty changes' do
+      setup do
+        @song.name = 'Good Vibrations'
+        @song.save
+        @song.name = nil
+      end
+
+      should 'return persist the changes on the live instance properly' do
+        assert_equal nil, @song.name
+      end
+      should 'return "overwritten" virtual attribute on the reified instance' do
+        assert_equal 'Good Vibrations', @song.versions.last.reify.name
+      end
+    end
   end