paper_trail 1.6.1 → 1.6.2

data/lib/paper_trail/has_paper_trail.rb

@@ -126,7 +126,7 @@ module PaperTrail
         previous = self.clone
         previous.id = id
         changes.each do |attr, ary|
-          previous.send "#{attr}=", ary.first
+          previous.send :write_attribute, attr.to_sym, ary.first
         end
         previous
       end

data/lib/paper_trail/version.rb

@@ -42,7 +42,7 @@ class Version < ActiveRecord::Base
 
       attrs.each do |k, v|
         begin
-          model.send "#{k}=", v
+          model.send :write_attribute, k.to_sym , v
         rescue NoMethodError
           logger.warn "Attribute #{k} does not exist on #{item_type} (Version id: #{id})."
         end
@@ -102,7 +102,7 @@ class Version < ActiveRecord::Base
         # and therefore impossible to know when "just before" was.
         if (child_as_it_was = child.version_at(created_at - lookback.seconds))
           child_as_it_was.attributes.each do |k,v|
-            model.send(assoc.name).send "#{k}=", v rescue nil
+            model.send(assoc.name).send :write_attribute, k.to_sym, v rescue nil
           end
         else
           model.send "#{assoc.name}=", nil

data/lib/paper_trail/version_number.rb

@@ -1,3 +1,3 @@
 module PaperTrail
-  VERSION = '1.6.1'
+  VERSION = '1.6.2'
 end

data/test/paper_trail_model_test.rb

@@ -43,6 +43,19 @@ class Person < ActiveRecord::Base
   has_paper_trail
 end
 
+# Example from 'Overwriting default accessors' in ActiveRecord::Base.
+class Song < ActiveRecord::Base
+  has_paper_trail
+
+  # Uses an integer of seconds to hold the length of the song
+  def length=(minutes)
+    write_attribute(:length, minutes.to_i * 60)
+  end
+  def length
+    read_attribute(:length) / 60
+  end
+end
+
 
 class HasPaperTrailModelTest < Test::Unit::TestCase
   load_schema
@@ -740,6 +753,22 @@ class HasPaperTrailModelTest < Test::Unit::TestCase
     end
   end
 
+
+  context 'An overwritten default accessor' do
+    setup do
+      @song = Song.create :length => 4
+      @song.update_attributes :length => 5
+    end
+
+    should 'return "overwritten" value on live instance' do
+      assert_equal 5, @song.length
+    end
+    should 'return "overwritten" value on reified instance' do
+      assert_equal 4, @song.versions.last.reify.length
+    end
+  end
+
+
   private
 
   # Updates `model`'s last version so it looks like the version was

data/test/schema.rb

@@ -63,4 +63,8 @@ ActiveRecord::Schema.define(:version => 0) do
     t.string :name
   end
 
+  create_table :songs, :force => true do |t|
+    t.integer :length
+  end
+
 end

data/test/test_helper.rb

@@ -9,7 +9,7 @@ require 'action_controller/test_process'
 require 'active_support'
 require 'active_support/test_case'
 
-require 'lib/paper_trail'
+require File.expand_path('../../lib/paper_trail', __FILE__)
 
 def connect_to_database
   ActiveRecord::Base.establish_connection(

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paper_trail
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 1
   - 6
-  - 1
-  version: 1.6.1
+  - 2
+  version: 1.6.2
 platform: ruby
 authors: 
 - Andy Stewart
@@ -15,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 +01:00
+date: 2010-10-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,12 +32,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  type: :development
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -47,12 +48,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  type: :development
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: shoulda
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -63,12 +64,12 @@ dependencies:
         - 10
         - 3
         version: 2.10.3
-  type: :development
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,12 +79,12 @@ dependencies:
         - 2
         - 3
         version: "2.3"
-  type: :development
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
+  type: :development
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,12 +94,12 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  type: :development
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: activerecord
+  type: :runtime
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -108,12 +109,12 @@ dependencies:
         - 2
         - 3
         version: "2.3"
-  type: :runtime
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: actionpack
+  type: :runtime
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -123,8 +124,7 @@ dependencies:
         - 2
         - 3
         version: "2.3"
-  type: :runtime
-  version_requirements: *id007
+  requirement: *id007
 description: Track changes to your models' data.  Good for auditing or versioning.
 email: boss@airbladesoftware.com
 executables: []