paper_trail 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6b8b27c90bfd64f2b38cef59276076e4123f38b
-  data.tar.gz: 02bc459e5c9ae9e74eafdc782eee7cb4708cfb3e
+  metadata.gz: 2341d38bf3de33be104cb0e608c3e6ba7681fb58
+  data.tar.gz: d692d110b6774f05b0cfaf446dabae5b39b544e0
 SHA512:
-  metadata.gz: c0581395fd0a5782e279133c26ff723a62eda27470ecd57660d3b495c55ef542a9d08b99a5701762f585fefed54a5191c367469031a1a00cb2efede10690a7b8
-  data.tar.gz: e12d54c3a6c00dfa21d2634ee6b2561bbf1aba2bbc907e82f0a651b12acf35a391c6ca81a0e589feca9e0c502efbdc052b5b2e18010e44a3a9ea60c7ec99b8fe
+  metadata.gz: beabb6745c775196c97df32b3442d427dca469d31fc3e92c30e8afb94dabff853ae6bf95a7ba4edc4a8652f214205ac06b56c9a7571cc04e7d6f623c76905b95
+  data.tar.gz: d840c40829ed5c82bedf4d5b21227d902809528a26e7cc2c28b04c6bbe04267572c8c816530fdd661df4a3825bffe626d992adff4e60e6abccf7eb576b390125

data/CHANGELOG.md

@@ -1,12 +1,18 @@
+## 3.0.8
+
+  - [#525](https://github.com/airblade/paper_trail/pull/525) / [#512](https://github.com/airblade/paper_trail/issues/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
 

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.8'`
 
 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.8'`
 
 2. Generate a migration to add a `versions` table to your database.
 

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/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

data/lib/paper_trail/version_number.rb

@@ -2,7 +2,7 @@ module PaperTrail
   module VERSION
     MAJOR = 3
     MINOR = 0
-    TINY  = 7
+    TINY  = 8
     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/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

@@ -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
@@ -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
 
 

data/test/unit/serializers/json_test.rb

@@ -44,7 +44,11 @@ class JSONTest < ActiveSupport::TestCase
           PaperTrail::Version.arel_table[:object], :arg1, "Val 1")
 
         assert matches.instance_of?(Arel::Nodes::Matches)
-        assert_equal matches.right, "%\"arg1\":\"Val 1\"%"
+        if Arel::VERSION >= '6'
+          assert_equal matches.right.val, "%\"arg1\":\"Val 1\"%"
+        else
+          assert_equal matches.right, "%\"arg1\":\"Val 1\"%"
+        end
       end
     end
 
@@ -54,7 +58,11 @@ class JSONTest < ActiveSupport::TestCase
           PaperTrail::Version.arel_table[:object], :arg1, nil)
 
         assert matches.instance_of?(Arel::Nodes::Matches)
-        assert_equal matches.right, "%\"arg1\":null%"
+        if Arel::VERSION >= '6'
+          assert_equal matches.right.val, "%\"arg1\":null%"
+        else
+          assert_equal matches.right, "%\"arg1\":null%"
+        end
       end
     end
 
@@ -67,8 +75,13 @@ class JSONTest < ActiveSupport::TestCase
         matches = grouping.select { |v| v.instance_of?(Arel::Nodes::Matches) }
         # Numeric arguments need to ensure that they match for only the number, not the beginning 
         # of a #, so it uses an Grouping matcher (See notes on `PaperTrail::Serializers::JSON`)
-        assert_equal matches.first.right, "%\"arg1\":-3.5,%"
-        assert_equal matches.last.right, "%\"arg1\":-3.5}%"
+        if Arel::VERSION >= '6'
+          assert_equal matches.first.right.val, "%\"arg1\":-3.5,%"
+          assert_equal matches.last.right.val, "%\"arg1\":-3.5}%"
+        else
+          assert_equal matches.first.right, "%\"arg1\":-3.5,%"
+          assert_equal matches.last.right, "%\"arg1\":-3.5}%"
+        end
       end
     end
   end

data/test/unit/serializers/yaml_test.rb

@@ -42,7 +42,11 @@ class YamlTest < ActiveSupport::TestCase
       matches = PaperTrail::Serializers::YAML.where_object_condition(
         PaperTrail::Version.arel_table[:object], :arg1, "Val 1")
       assert matches.instance_of?(Arel::Nodes::Matches)
-      assert_equal matches.right, "%\narg1: Val 1\n%"
+      if Arel::VERSION >= '6'
+        assert_equal matches.right.val, "%\narg1: Val 1\n%"
+      else
+        assert_equal matches.right, "%\narg1: Val 1\n%"
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paper_trail
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Andy Stewart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -83,16 +83,16 @@ dependencies:
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <=
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 1.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <=
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 1.31.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement