rich-acts_as_revisable 1.0.2 → 1.0.5

data/generators/revisable_migration/revisable_migration_generator.rb

@@ -1,9 +1,21 @@
 class RevisableMigrationGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
-      revisable_columns = [["revisable_original_id", "integer"], ["revisable_branched_from_id", "integer"], ["revisable_number", "integer"], ["revisable_name", "string"], ["revisable_type", "string"], ["revisable_current_at", "datetime"], ["revisable_revised_at", "datetime"], ["revisable_deleted_at", "datetime"], ["revisable_is_current", "boolean"]]
+      revisable_columns = [
+        ["revisable_original_id",      "integer"],
+        ["revisable_branched_from_id", "integer"],
+        ["revisable_number",           "integer", 0],
+        ["revisable_name",             "string"],
+        ["revisable_type",             "string"],
+        ["revisable_current_at",       "datetime"],
+        ["revisable_revised_at",       "datetime"],
+        ["revisable_deleted_at",       "datetime"],
+        ["revisable_is_current",       "boolean", 1]
+      ]
       
-      m.migration_template 'migration.rb', 'db/migrate', :migration_file_name => "make_#{class_name.downcase}_revisable", :assigns => {:cols => revisable_columns}
+      m.migration_template 'migration.rb', 'db/migrate',
+        :migration_file_name => "make_#{class_name.underscore.pluralize}_revisable",
+        :assigns => { :cols => revisable_columns }
     end
   end
 end

data/generators/revisable_migration/templates/migration.rb

@@ -1,13 +1,14 @@
-class Make<%= class_name.underscore.camelize %>Revisable < ActiveRecord::Migration
+<% table_name = class_name.underscore.pluralize -%>
+class Make<%= class_name.underscore.pluralize.camelize %>Revisable < ActiveRecord::Migration
   def self.up
-    <% cols.each do |c| -%>
-    add_column :<%= class_name.downcase.pluralize %>, :<%= c.first %>, :<%= c.last %>
+    <% cols.each do |column_name,column_type,default| -%>
+    add_column :<%= table_name %>, :<%= column_name %>, :<%= column_type %><%= ", :default => #{default}" unless default.blank? %>
     <% end -%>
   end
 
   def self.down
-    <% cols.each do |c| -%>
-    remove_column :<%= class_name.downcase.pluralize %>, :<%= c.first %>
+    <% cols.each do |column_name,_| -%>
+    remove_column :<%= table_name %>, :<%= column_name %>
     <% end -%>
   end
 end

data/lib/acts_as_revisable/acts/common.rb

@@ -20,9 +20,9 @@ module WithoutScope
         
         base.instance_eval do
           define_callbacks :before_branch, :after_branch      
-          has_many :branches, (revisable_options.revision_association_options || {}).merge({:class_name => base.class_name, :foreign_key => :revisable_branched_from_id})
+          has_many :branches, (revisable_options.revision_association_options || {}).merge({:class_name => base.name, :foreign_key => :revisable_branched_from_id})
                     
-          belongs_to :branch_source, :class_name => base.class_name, :foreign_key => :revisable_branched_from_id
+          belongs_to :branch_source, :class_name => base.name, :foreign_key => :revisable_branched_from_id
           after_save :execute_blocks_after_save
         end        
       end

data/lib/acts_as_revisable/acts/revisable.rb

@@ -40,11 +40,11 @@ module WithoutScope
             has_many assoc, (revisable_options.revision_association_options || {}).merge({:class_name => revision_class_name, :foreign_key => :revisable_original_id, :order => "#{quoted_table_name}.#{connection.quote_column_name(:revisable_number)} DESC", :dependent => :destroy})
           end
         end
-        
+
         if !Object.const_defined?(base.revision_class_name) && base.revisable_options.generate_revision_class?
-          Object.const_set(base.revision_class_name, Class.new(ActiveRecord::Base)).class_eval do
+          Object.const_set(base.revision_class_name, Class.new(ActiveRecord::Base)).instance_eval do
             acts_as_revision
-          end            
+          end
         end
       end
       
@@ -446,7 +446,7 @@ module WithoutScope
         # Returns the +revision_class_name+ as configured in
         # +acts_as_revisable+.
         def revision_class_name #:nodoc:
-          self.revisable_options.revision_class_name || "#{self.class_name}Revision"
+          self.revisable_options.revision_class_name || "#{self.name}Revision"
         end
       
         # Returns the actual +Revision+ class based on the 

data/lib/acts_as_revisable/acts/revision.rb

@@ -71,7 +71,7 @@ module WithoutScope
         self[:revisable_current_at] = now + 1.second
         self[:revisable_is_current] = false
         self[:revisable_branched_from_id] = current_revision[:revisable_branched_from_id]
-        self[:revisable_type] = current_revision[:type]
+        self[:revisable_type] = current_revision[:type] || current_revision.class.name
         self[:revisable_number] = (self.class.maximum(:revisable_number, :conditions => {:revisable_original_id => self[:revisable_original_id]}) || 0) + 1
       end
       
@@ -103,7 +103,7 @@ module WithoutScope
         # Returns the +revisable_class_name+ as configured in
         # +acts_as_revisable+.
         def revisable_class_name #:nodoc:
-          self.revisable_options.revisable_class_name || self.class_name.gsub(/Revision/, '')
+          self.revisable_options.revisable_class_name || self.name.gsub(/Revision/, '')
         end
       
         # Returns the actual +Revisable+ class based on the 

data/lib/acts_as_revisable/version.rb

@@ -3,7 +3,7 @@ module WithoutScope #:nodoc:
     module VERSION #:nodoc:
       MAJOR = 1
       MINOR = 0
-      TINY  = 2
+      TINY  = 5
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/general_spec.rb

@@ -7,6 +7,22 @@ describe WithoutScope::ActsAsRevisable do
     
   before(:each) do
     @project = Project.create(:name => "Rich", :notes => "this plugin's author")
+    @post = Post.create(:name => 'a name')
+  end
+  
+  describe "with auto-detected revision class" do
+    it "should find the revision class" do
+      Post.revision_class.should == PostRevision
+    end
+    
+    it "should find the revisable class" do
+      PostRevision.revisable_class.should == Post
+    end
+    
+    it "should use the revision class" do
+      @post.update_attribute(:name, 'another name')
+      @post.revisions(true).first.class.should == PostRevision
+    end
   end
   
   describe "with auto-generated revision class" do

data/spec/spec_helper.rb

@@ -45,6 +45,14 @@ def setup_db
       t.datetime :revisable_current_at, :revisable_revised_at, :revisable_deleted_at
       t.timestamps
     end
+    
+    create_table :posts do |t|
+      t.string :name, :revisable_name, :revisable_type, :type
+      t.boolean :revisable_is_current
+      t.integer :revisable_original_id, :revisable_branched_from_id, :revisable_number
+      t.datetime :revisable_current_at, :revisable_revised_at, :revisable_deleted_at
+      t.timestamps
+    end
   end
 end
 
@@ -90,4 +98,20 @@ end
 
 class Foo < ActiveRecord::Base
   acts_as_revisable :generate_revision_class => true
+end
+
+class Post < ActiveRecord::Base
+  acts_as_revisable
+end
+
+class PostRevision < ActiveRecord::Base
+  acts_as_revision
+end
+
+class Article < Post
+  acts_as_revisable
+end
+
+class ArticleRevision < PostRevision
+  acts_as_revision
 end

data/spec/sti_spec.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe WithoutScope::ActsAsRevisable, "with single table inheritance" do  
+  after(:each) do
+    cleanup_db
+  end
+  
+  before(:each) do
+    @article = Article.create(:name => 'an article')
+    @post = Post.create(:name => 'a post')
+  end
+  
+  describe "after a revision" do
+    it "an article has revisions of the right type" do
+      @article.revise!
+      @article.revisions(true).first.class.should == ArticleRevision
+    end
+    
+    it "a post has revisions of the right type" do
+      @post.revise!
+      @post.revisions(true).first.class.should == PostRevision
+    end
+    
+    it "revisable_type column is nil for the root type" do
+      @post.revise!
+      @post.revisions(true).first.revisable_type.should == 'Post'
+    end
+    
+    it "revisable_type column is set properly" do
+      @article.revise!
+      @article.revisions(true).first.revisable_type.should == 'Article'
+    end
+    
+    it "can find an article by name" do
+      Article.find_by_name('an article').should_not be_nil
+    end
+    
+    it "can find a post by name" do
+      Post.find_by_name('a post').should_not be_nil
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rich-acts_as_revisable
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.5
 platform: ruby
 authors: 
 - Rich Cavanaugh
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 -07:00
+date: 2009-05-16 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +37,7 @@ files:
 - spec/revert_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/sti_spec.rb
 - lib/acts_as_revisable
 - lib/acts_as_revisable/acts
 - lib/acts_as_revisable/acts/common.rb
@@ -56,6 +57,7 @@ files:
 - rails/init.rb
 has_rdoc: true
 homepage: http://github.com/rich/acts_as_revisable
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -77,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: acts_as_revisable enables revision tracking, querying, reverting and branching of ActiveRecord models. Inspired by acts_as_versioned.