paper_trail 2.2.2 → 2.2.3

data/README.md

@@ -603,6 +603,8 @@ Many thanks to:
 * [Tom Derks](https://github.com/EgoH)
 * [Jonas Hoglund](https://github.com/jhoglund)
 * [Stefan Huber](https://github.com/MSNexploder)
+* [thinkcast](https://github.com/thinkcast)
+* [Dominik Sander](https://github.com/dsander)
 
 
 ## Inspirations

data/lib/paper_trail/has_paper_trail.rb

@@ -41,7 +41,7 @@ module PaperTrail
         cattr_accessor :paper_trail_enabled_for_model
         self.paper_trail_enabled_for_model = true
 
-        has_many :versions, :class_name => version_class_name, :as => :item, :order => 'created_at ASC, id ASC'
+        has_many :versions, :class_name => version_class_name, :as => :item, :order => "created_at ASC, #{self.primary_key} ASC"
 
         after_create  :record_create
         before_update :record_update
@@ -143,7 +143,7 @@ module PaperTrail
       end
 
       def item_before_change
-        self.clone.tap do |previous|
+        self.dup.tap do |previous|
           previous.id = id
           changed_attributes.each { |attr, before| previous[attr] = before }
         end

data/lib/paper_trail/version.rb

@@ -7,16 +7,16 @@ class Version < ActiveRecord::Base
   end
 
   scope :subsequent, lambda { |version|
-    where(["id > ?", version.is_a?(self) ? version.id : version]).order("id ASC")
+    where(["#{self.primary_key} > ?", version.is_a?(self) ? version.id : version]).order("#{self.primary_key} ASC")
   }
 
   scope :preceding, lambda { |version|
-    where(["id < ?", version.is_a?(self) ? version.id : version]).order("id DESC")
+    where(["#{self.primary_key} < ?", version.is_a?(self) ? version.id : version]).order("#{self.primary_key} DESC")
   }
 
   scope :after, lambda { |timestamp|
     # TODO: is this :order necessary, considering its presence on the has_many :versions association?
-    where(['created_at > ?', timestamp]).order('created_at ASC, id ASC')
+    where(['created_at > ?', timestamp]).order("created_at ASC, #{self.primary_key} ASC")
   }
 
   # Restore the item from this version.

data/lib/paper_trail/version_number.rb

@@ -1,3 +1,3 @@
 module PaperTrail
-  VERSION = '2.2.2'
+  VERSION = '2.2.3'
 end

data/test/unit/model_test.rb

@@ -212,11 +212,11 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
     end
 
     should 'handle datetimes' do
-      assert_equal @date_time.to_time.utc, @previous.a_datetime.to_time.utc
+      assert_equal @date_time.to_time.utc.to_i, @previous.a_datetime.to_time.utc.to_i
     end
 
     should 'handle times' do
-      assert_equal @time, @previous.a_time
+      assert_equal @time.utc.to_i, @previous.a_time.utc.to_i
     end
 
     should 'handle dates' do
@@ -241,14 +241,14 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
       end
 
       should 'restore all forward-compatible attributes' do
-        assert_equal    'Warble',               @last.reify.name
-        assert_equal    'The quick brown fox',  @last.reify.a_text
-        assert_equal    42,                     @last.reify.an_integer
-        assert_in_delta 153.01,                 @last.reify.a_float,   0.001
-        assert_in_delta 2.71828,                @last.reify.a_decimal, 0.00001
-        assert_equal    @date_time.to_time.utc, @last.reify.a_datetime.to_time.utc
-        assert_equal    @time,                  @last.reify.a_time
-        assert_equal    @date,                  @last.reify.a_date
+        assert_equal    'Warble',                    @last.reify.name
+        assert_equal    'The quick brown fox',       @last.reify.a_text
+        assert_equal    42,                          @last.reify.an_integer
+        assert_in_delta 153.01,                      @last.reify.a_float,   0.001
+        assert_in_delta 2.71828,                     @last.reify.a_decimal, 0.00001
+        assert_equal    @date_time.to_time.utc.to_i, @last.reify.a_datetime.to_time.utc.to_i
+        assert_equal    @time.utc.to_i,              @last.reify.a_time.utc.to_i
+        assert_equal    @date,                       @last.reify.a_date
         assert          @last.reify.a_boolean
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paper_trail
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 2
   - 2
-  - 2
-  version: 2.2.2
+  - 3
+  version: 2.2.3
 platform: ruby
 authors: 
 - Andy Stewart
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-07 00:00:00 +01:00
+date: 2011-05-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency