rich-acts_as_revisable 1.0.5 → 1.1.0

data/lib/acts_as_revisable/acts/deletable.rb

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

data/lib/acts_as_revisable/acts/revisable.rb

@@ -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])

data/lib/acts_as_revisable/acts/revision.rb

@@ -65,14 +65,13 @@ module WithoutScope
       
       # Sets some initial values for a new revision.
       def revision_setup #:nodoc:
-        now = Time.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_branched_from_id] = current_revision[:revisable_branched_from_id]
         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
       
       def grab_my_branches

data/lib/acts_as_revisable/version.rb

@@ -2,8 +2,8 @@ module WithoutScope #:nodoc:
   module ActsAsRevisable
     module VERSION #:nodoc:
       MAJOR = 1
-      MINOR = 0
-      TINY  = 5
+      MINOR = 1
+      TINY  = 0
 
       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

@@ -70,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
@@ -79,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rich-acts_as_revisable
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors: 
 - Rich Cavanaugh