Fix STI bug affecting destroyed models.

paper-trail-gem · Jul 11, 2011 · f51eb08 · f51eb08
1 parent 6511eea
commit f51eb08
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/paper_trail/has_paper_trail.rb b/lib/paper_trail/has_paper_trail.rb
@@ -118,7 +118,7 @@ def record_update
       def record_destroy
         if switched_on? and not new_record?
           version_class.create merge_metadata(:item_id   => self.id,
-                                              :item_type => self.class.name,
+                                              :item_type => self.class.base_class.name,
                                               :event     => 'destroy',
                                               :object    => object_to_string(item_before_change),
                                               :whodunnit => PaperTrail.whodunnit)

diff --git a/test/unit/model_test.rb b/test/unit/model_test.rb
@@ -387,17 +387,20 @@ def without(&block)
     end
 
     should 'reify with the correct type' do
-      thing = @foo.versions.last.reify
+      thing = Version.last.reify
       assert_kind_of FooWidget, thing
+      assert_equal @foo.versions.first, Version.last.previous
+      assert_nil Version.last.next
     end
 
-
     context 'when destroyed' do
       setup { @foo.destroy }
 
       should 'reify with the correct type' do
-        thing = @foo.versions.last.reify
+        thing = Version.last.reify
         assert_kind_of FooWidget, thing
+        assert_equal @foo.versions[1], Version.last.previous
+        assert_nil Version.last.next
       end
     end
   end