paper_trail 2.2.3 → 2.2.4

data/README.md

@@ -605,6 +605,7 @@ Many thanks to:
 * [Stefan Huber](https://github.com/MSNexploder)
 * [thinkcast](https://github.com/thinkcast)
 * [Dominik Sander](https://github.com/dsander)
+* [Burke Libbey](https://github.com/burke)
 
 
 ## Inspirations

data/lib/paper_trail/has_paper_trail.rb

@@ -143,9 +143,14 @@ module PaperTrail
       end
 
       def item_before_change
-        self.dup.tap do |previous|
-          previous.id = id
-          changed_attributes.each { |attr, before| previous[attr] = before }
+        previous = self.dup
+        # `dup` clears timestamps so we add them back.
+        all_timestamp_attributes.each do |column|
+          previous[column] = send(column) if respond_to?(column) && !send(column).nil?
+        end
+        previous.tap do |prev|
+          prev.id = id
+          changed_attributes.each { |attr, before| prev[attr] = before }
         end
       end
 

data/lib/paper_trail/version.rb

@@ -31,48 +31,50 @@ class Version < ActiveRecord::Base
   #              set to a float to change the lookback time (check whether your db supports
   #              sub-second datetimes if you want them).
   def reify(options = {})
-    options.reverse_merge! :has_one => 3
-
-    unless object.nil?
-      attrs = YAML::load object
-
-      # Normally a polymorphic belongs_to relationship allows us
-      # to get the object we belong to by calling, in this case,
-      # +item+.  However this returns nil if +item+ has been
-      # destroyed, and we need to be able to retrieve destroyed
-      # objects.
-      #
-      # In this situation we constantize the +item_type+ to get hold of
-      # the class...except when the stored object's attributes
-      # include a +type+ key.  If this is the case, the object
-      # we belong to is using single table inheritance and the
-      # +item_type+ will be the base class, not the actual subclass.
-      # If +type+ is present but empty, the class is the base class.
-
-      if item
-        model = item
-      else
-        inheritance_column_name = item_type.constantize.inheritance_column
-        class_name = attrs[inheritance_column_name].blank? ? item_type : attrs[inheritance_column_name]
-        klass = class_name.constantize
-        model = klass.new
-      end
+    without_identity_map do
+      options.reverse_merge! :has_one => 3
+
+      unless object.nil?
+        attrs = YAML::load object
+
+        # Normally a polymorphic belongs_to relationship allows us
+        # to get the object we belong to by calling, in this case,
+        # +item+.  However this returns nil if +item+ has been
+        # destroyed, and we need to be able to retrieve destroyed
+        # objects.
+        #
+        # In this situation we constantize the +item_type+ to get hold of
+        # the class...except when the stored object's attributes
+        # include a +type+ key.  If this is the case, the object
+        # we belong to is using single table inheritance and the
+        # +item_type+ will be the base class, not the actual subclass.
+        # If +type+ is present but empty, the class is the base class.
+
+        if item
+          model = item
+        else
+          inheritance_column_name = item_type.constantize.inheritance_column
+          class_name = attrs[inheritance_column_name].blank? ? item_type : attrs[inheritance_column_name]
+          klass = class_name.constantize
+          model = klass.new
+        end
 
-      attrs.each do |k, v|
-        begin
-          model.send :write_attribute, k.to_sym , v
-        rescue NoMethodError
-          logger.warn "Attribute #{k} does not exist on #{item_type} (Version id: #{id})."
+        attrs.each do |k, v|
+          begin
+            model.send :write_attribute, k.to_sym , v
+          rescue NoMethodError
+            logger.warn "Attribute #{k} does not exist on #{item_type} (Version id: #{id})."
+          end
         end
-      end
 
-      model.version = self
+        model.version = self
 
-      unless options[:has_one] == false
-        reify_has_ones model, options[:has_one]
-      end
+        unless options[:has_one] == false
+          reify_has_ones model, options[:has_one]
+        end
 
-      model
+        model
+      end
     end
   end
 
@@ -105,6 +107,16 @@ class Version < ActiveRecord::Base
 
   private
 
+  # In Rails 3.1+, calling reify on a previous version confuses the
+  # IdentityMap, if enabled. This prevents insertion into the map.
+  def without_identity_map(&block)
+    if defined?(ActiveRecord::IdentityMap) && ActiveRecord::IdentityMap.respond_to?(:without)
+      ActiveRecord::IdentityMap.without(&block)
+    else
+      block.call
+    end
+  end
+
   # Restore the `model`'s has_one associations as they were when this version was
   # superseded by the next (because that's what the user was looking at when they
   # made the change).

data/lib/paper_trail/version_number.rb

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

data/test/unit/model_test.rb

@@ -97,6 +97,22 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
           assert @widget.versions.map(&:reify).compact.all? { |w| !w.live? }
         end
 
+        if defined?(ActiveRecord::IdentityMap) && ActiveRecord::IdentityMap.respond_to?(:without)
+          should 'not clobber the IdentityMap when reifying' do
+            module ActiveRecord::IdentityMap
+              class << self
+                alias :__without :without
+                def without(&block)
+                  @unclobbered = true
+                  __without(&block)
+                end
+              end
+            end
+
+            @widget.versions.last.reify
+            assert ActiveRecord::IdentityMap.instance_variable_get("@unclobbered")
+          end
+        end
 
         context 'and has one associated object' do
           setup do

metadata

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