paper_trail 2.1.0 → 2.1.1

data/README.md

@@ -582,6 +582,7 @@ Many thanks to:
 * [Emmanuel Gomez](https://github.com/emmanuel)
 * [Matthew MacLeod](https://github.com/mattmacleod)
 * [benzittlau](https://github.com/benzittlau)
+* [Tom Derks](https://github.com/EgoH)
 
 
 ## Inspirations

data/lib/paper_trail/has_paper_trail.rb

@@ -25,9 +25,9 @@ module PaperTrail
 
         # The version this instance was reified from.
         attr_accessor :version
-        
+
         cattr_accessor :version_class_name
-        self.version_class_name = options[:class_name] || "Version"
+        self.version_class_name = options[:class_name] || 'Version'
 
         cattr_accessor :ignore
         self.ignore = ([options[:ignore]].flatten.compact || []).map &:to_s
@@ -72,7 +72,7 @@ module PaperTrail
 
       # Returns who put the object into its current state.
       def originator
-        version_class_name.constantize.with_item_keys(self.class.name, id).last.try :whodunnit
+        version_class.with_item_keys(self.class.name, id).last.try :whodunnit
       end
 
       # Returns the object (not a Version) as it was at the given timestamp.
@@ -99,6 +99,10 @@ module PaperTrail
 
       private
 
+      def version_class
+        version_class_name.constantize
+      end
+
       def record_create
         if switched_on?
           versions.create merge_metadata(:event => 'create', :whodunnit => PaperTrail.whodunnit)
@@ -115,7 +119,7 @@ module PaperTrail
 
       def record_destroy
         if switched_on? and not new_record?
-          version_class_name.constantize.create merge_metadata(:item_id   => self.id,
+          version_class.create merge_metadata(:item_id   => self.id,
                                         :item_type => self.class.name,
                                         :event     => 'destroy',
                                         :object    => object_to_string(item_before_change),

data/lib/paper_trail/version.rb

@@ -52,7 +52,8 @@ class Version < ActiveRecord::Base
       if item
         model = item
       else
-        class_name = attrs['type'].blank? ? item_type : attrs['type']
+        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

data/lib/paper_trail/version_number.rb

@@ -1,3 +1,3 @@
 module PaperTrail
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/test/dummy/app/models/animal.rb

@@ -0,0 +1,3 @@
+class Animal < ActiveRecord::Base
+  has_paper_trail
+end

data/test/dummy/app/models/cat.rb

@@ -0,0 +1,3 @@
+class Cat < Animal
+  set_inheritance_column 'species'
+end

data/test/dummy/app/models/dog.rb

@@ -0,0 +1,3 @@
+class Dog < Animal
+  set_inheritance_column 'species'
+end

data/test/dummy/db/migrate/20110208155312_set_up_test_tables.rb

@@ -82,14 +82,20 @@ class SetUpTestTables < ActiveRecord::Migration
     create_table :songs, :force => true do |t|
       t.integer :length
     end
-    
+
     create_table :posts, :force => true do |t|
       t.string :title
       t.string :content
     end
+
+    create_table :animals, :force => true do |t|
+      t.string :name
+      t.string :species   # single table inheritance column
+    end
   end
 
   def self.down
+    drop_table :animals
     drop_table :posts
     drop_table :songs
     drop_table :people

data/test/unit/inheritance_column_test.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+
+class InheritanceColumnTest < ActiveSupport::TestCase
+
+  context 'STI models' do
+    setup do
+      @animal = Animal.create :name => 'Animal'
+      @animal.update_attributes :name => 'Animal from the Muppets'
+      @animal.update_attributes :name => 'Animal Muppet'
+
+      @dog = Dog.create :name => 'Snoopy'
+      @dog.update_attributes :name => 'Scooby'
+      @dog.update_attributes :name => 'Scooby Doo'
+
+      @cat = Cat.create :name => 'Garfield'
+      @cat.update_attributes :name => 'Garfield (I hate Mondays)'
+      @cat.update_attributes :name => 'Garfield The Cat'
+    end
+
+    should 'work with custom STI inheritance column' do
+      assert_equal 9, Version.count
+      assert_equal 3, @animal.versions.count
+      assert_equal 3, @dog.versions.count
+      assert_equal 3, @cat.versions.count
+
+      assert_equal 'Animal from the Muppets',   @animal.versions.last.reify.name
+      assert_equal 'Scooby',       @dog.versions.last.reify.name
+      assert_equal 'Garfield (I hate Mondays)', @cat.versions.last.reify.name
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paper_trail
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - Andy Stewart
@@ -108,9 +108,12 @@ files:
 - test/dummy/app/controllers/test_controller.rb
 - test/dummy/app/controllers/widgets_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/models/animal.rb
 - test/dummy/app/models/article.rb
 - test/dummy/app/models/authorship.rb
 - test/dummy/app/models/book.rb
+- test/dummy/app/models/cat.rb
+- test/dummy/app/models/dog.rb
 - test/dummy/app/models/fluxor.rb
 - test/dummy/app/models/foo_widget.rb
 - test/dummy/app/models/person.rb
@@ -157,6 +160,7 @@ files:
 - test/paper_trail_test.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
+- test/unit/inheritance_column_test.rb
 - test/unit/model_test.rb
 has_rdoc: true
 homepage: http://github.com/airblade/paper_trail
@@ -198,9 +202,12 @@ test_files:
 - test/dummy/app/controllers/test_controller.rb
 - test/dummy/app/controllers/widgets_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/models/animal.rb
 - test/dummy/app/models/article.rb
 - test/dummy/app/models/authorship.rb
 - test/dummy/app/models/book.rb
+- test/dummy/app/models/cat.rb
+- test/dummy/app/models/dog.rb
 - test/dummy/app/models/fluxor.rb
 - test/dummy/app/models/foo_widget.rb
 - test/dummy/app/models/person.rb
@@ -247,4 +254,5 @@ test_files:
 - test/paper_trail_test.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
+- test/unit/inheritance_column_test.rb
 - test/unit/model_test.rb