kb-acts_as_revisable 1.0.4 → 1.1.1

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/deletable.rb

@@ -8,8 +8,7 @@ module WithoutScope
       end
       
       def destroy
-        now = Time.zone.now
-        
+        now = Time.current
         prev = self.revisions.first
         self.revisable_deleted_at = now
         self.revisable_is_current = false

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
       
@@ -77,7 +77,7 @@ module WithoutScope
           by
         when :first
           revisions.last
-        when :previous
+        when :previous, :last
           revisions.first
         when Time
           revisions.find(:first, :conditions => ["? >= ? and ? <= ?", :revisable_revised_at, by, :revisable_current_at, by])
@@ -329,7 +329,13 @@ module WithoutScope
           self.revisable_revision = nil
           return true
         elsif self.revisable_revision
-          self.revisable_revision.save
+          if self.class.revision_class.respond_to?(:without_stamps)
+            self.class.revision_class.without_stamps do
+              self.revisable_revision.save
+            end
+          else
+            self.revisable_revision.save
+          end
           revisions.reload
           run_callbacks(:after_revise)
         end
@@ -446,7 +452,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

@@ -29,15 +29,7 @@ module WithoutScope
           [:current_revision, revisable_association_name.to_sym].each do |a|
             belongs_to a, :class_name => revisable_class_name, :foreign_key => :revisable_original_id
           end
-
-          # add an author association if there is such a class
-          begin
-            if User.is_a?(Class) && User.respond_to?('current_user')
-              belongs_to :author, :class_name => 'User', :foreign_key => 'revisable_author_id'
-            end
-          rescue NameError
-          end
-
+          
           [[:ancestors, "<"], [:descendants, ">"]].each do |a|
             # Jumping through hoops here to try and make sure the
             # :finder_sql is cross-database compatible. :finder_sql
@@ -73,15 +65,13 @@ module WithoutScope
       
       # Sets some initial values for a new revision.
       def revision_setup #:nodoc:
-        now = Time.zone.now
+        now = Time.current
         prev = current_revision.revisions.first
         prev.update_attribute(:revisable_revised_at, now) if prev
         self[:revisable_current_at] = now + 1.second
         self[:revisable_is_current] = false
-        self[:revisable_author_id] = (User.current_user.id rescue nil)
         self[:revisable_branched_from_id] = current_revision[:revisable_branched_from_id]
-        self[:revisable_type] = current_revision[:type]
-        self[:revisable_number] = (self.class.maximum(:revisable_number, :conditions => {:revisable_original_id => self[:revisable_original_id]}) || 0) + 1
+        self[:revisable_type] = current_revision[:type] || current_revision.class.name
       end
       
       def grab_my_branches
@@ -112,7 +102,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/base.rb

@@ -1,5 +1,6 @@
 require 'acts_as_revisable/options'
 require 'acts_as_revisable/quoted_columns'
+require 'acts_as_revisable/validations'
 require 'acts_as_revisable/acts/common'
 require 'acts_as_revisable/acts/revision'
 require 'acts_as_revisable/acts/revisable'
@@ -45,6 +46,7 @@ module WithoutScope
           self.revisable_options = Options.new(options, &block)
           
           self.send(:include, Common)
+          self.send(:extend, Validations) unless self.revisable_options.no_validation_scoping?
           self.send(:include, WithoutScope::QuotedColumnConditions)
         end
     end

data/lib/acts_as_revisable/validations.rb

@@ -0,0 +1,11 @@
+module WithoutScope
+  module ActsAsRevisable
+    module Validations
+      def validates_uniqueness_of(*args)
+        options = args.extract_options!
+        (options[:scope] ||= []) << :revisable_is_current
+        super(*(args << options))
+      end
+    end
+  end
+end

data/lib/acts_as_revisable/version.rb

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

data/spec/find_spec.rb

@@ -26,5 +26,9 @@ describe WithoutScope::ActsAsRevisable do
     it "should find revisions with conditions" do
       Project.find(:all, :conditions => {:name => "Rich"}, :with_revisions => true).should == [@project1.find_revision(:previous)]
     end
+
+		it "should find last revision" do
+			@project1.find_revision(:last).should == @project1.find_revision(:previous)
+		end
   end
 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
@@ -54,6 +70,10 @@ describe WithoutScope::ActsAsRevisable do
       @project.sessions.size.should == 1
     end
     
+    it "should have a single revision with a revision_number of zero" do
+      @project.revisions.collect{ |rev| rev.revision_number }.should == [0]
+    end
+    
     it "should return an instance of the revision class" do
       @project.revisions.first.should be_an_instance_of(Session)
     end
@@ -63,6 +83,22 @@ describe WithoutScope::ActsAsRevisable do
     end    
   end
   
+  describe "with multiple revisions" do
+    before(:each) do
+      @project.update_attribute(:name, "Stephen")
+      @project.update_attribute(:name, "Michael")
+    end
+    
+    it "should have a revision_number of two" do
+      @project.revision_number.should == 2
+    end
+    
+    it "should have revisions with revision_number values of zero and one" do
+      @project.revisions.collect{ |rev| rev.revision_number }.should == [1,0]
+    end
+  end
+      
+  
   describe "with excluded columns modified" do
     before(:each) do
       @project.update_attribute(:unimportant, "a new value")

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ end
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'acts_as_revisable'
 
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
 def setup_db
   ActiveRecord::Schema.define(:version => 1) do
@@ -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
 
@@ -89,5 +97,25 @@ class Session < ActiveRecord::Base
 end
 
 class Foo < ActiveRecord::Base
-  acts_as_revisable :generate_revision_class => true
+  acts_as_revisable :generate_revision_class => true, :no_validation_scoping => true
+  
+  validates_uniqueness_of :name
+end
+
+class Post < ActiveRecord::Base
+  acts_as_revisable 
+  
+  validates_uniqueness_of :name
+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

data/spec/validations_spec.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe WithoutScope::ActsAsRevisable, "with validations" do  
+  after(:each) do
+    cleanup_db
+  end
+  
+  before(:each) do
+    @post = Post.create(:name => 'a post')
+    @foo = Foo.create(:name => 'a foo')
+    
+  end
+  
+  describe "unique fields" do
+    it "should allow revisions" do
+      lambda {@post.revise!; @post.revise!}.should_not raise_error
+    end    
+  end
+  
+  describe "unique fields with validation scoping off" do
+    it "should not allow revisions" do
+      lambda {@foo.revise!; @foo.revise!}.should raise_error
+    end    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kb-acts_as_revisable
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.1.1
 platform: ruby
 authors: 
 - Rich Cavanaugh
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-16 00:00:00 -07:00
+date: 2009-10-06 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -37,8 +37,8 @@ files:
 - spec/revert_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- lib/acts_as_revisable
-- lib/acts_as_revisable/acts
+- spec/sti_spec.rb
+- spec/validations_spec.rb
 - lib/acts_as_revisable/acts/common.rb
 - lib/acts_as_revisable/acts/deletable.rb
 - lib/acts_as_revisable/acts/revisable.rb
@@ -47,16 +47,16 @@ files:
 - lib/acts_as_revisable/gem_spec_options.rb
 - lib/acts_as_revisable/options.rb
 - lib/acts_as_revisable/quoted_columns.rb
+- lib/acts_as_revisable/validations.rb
 - lib/acts_as_revisable/version.rb
 - lib/acts_as_revisable.rb
-- generators/revisable_migration
 - generators/revisable_migration/revisable_migration_generator.rb
-- generators/revisable_migration/templates
 - generators/revisable_migration/templates/migration.rb
 - rails/init.rb
 has_rdoc: true
 homepage: http://github.com/rich/acts_as_revisable
-licenses: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -80,7 +80,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: acts_as_revisable enables revision tracking, querying, reverting and branching of ActiveRecord models. Inspired by acts_as_versioned.
 test_files: []