mongoid 0.7.7 → 0.7.8

data/VERSION

@@ -1 +1 @@
-0.7.7
+0.7.8

data/lib/mongoid/document.rb

@@ -205,6 +205,12 @@ module Mongoid #:nodoc:
         other.attributes.except(:modified_at).except(:created_at)
     end
 
+    # Clone the current +Document+. This will return all attributes with the
+    # exception of the document's id and versions.
+    def clone
+      self.class.new(@attributes.except(:_id).except(:versions).dup)
+    end
+
     # Get the Mongo::Collection associated with this Document.
     def collection
       self.class.collection

data/lib/mongoid/versioning.rb

@@ -16,9 +16,9 @@ module Mongoid #:nodoc:
       # document from the database and set it as the next version before saving
       # the current document. It then increments the version number.
       def revise
-        last_version = self.class.find(id)
+        last_version = self.class.first(:conditions => { :_id => id, :version => version })
         if last_version
-          self.versions << last_version
+          self.versions << last_version.clone
           self.version = version + 1
         end
       end

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.7.7"
+  s.version = "0.7.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]

data/spec/integration/mongoid/document_spec.rb

@@ -252,12 +252,35 @@ describe Mongoid::Document do
       @comment.save
     end
 
-    it "versions on save" do
-      @from_db = Comment.find(@comment.id)
-      @from_db.text = "New"
-      @from_db.save
-      @from_db.versions.size.should == 1
-      @from_db.version.should == 2
+    context "first save" do
+
+      it "creates a new version" do
+        @from_db = Comment.find(@comment.id)
+        @from_db.text = "New"
+        @from_db.save
+        @from_db.versions.size.should == 1
+        @from_db.version.should == 2
+      end
+
+    end
+
+    context "multiple saves" do
+
+      before do
+        5.times do |n|
+          @comment.text = "#{n}"
+          @comment.save
+        end
+      end
+
+      it "creates new versions" do
+        p @comment
+        @from_db = Comment.find(@comment.id)
+        @from_db.version.should == 6
+        p @from_db
+        @from_db.versions.size.should == 5
+      end
+
     end
 
   end

data/spec/unit/mongoid/document_spec.rb

@@ -85,6 +85,20 @@ describe Mongoid::Document do
 
   end
 
+  describe "#clone" do
+
+    before do
+      @comment = Comment.new(:text => "Woooooo")
+      @clone = @comment.clone
+    end
+
+    it "returns a new document sans id and versions" do
+      @clone.id.should_not == @comment.id
+      @clone.versions.should be_empty
+    end
+
+  end
+
   describe "#collection" do
 
     before do

data/spec/unit/mongoid/versioning_spec.rb

@@ -17,7 +17,7 @@ describe Mongoid::Versioning do
       before do
         @post.title = "New"
         @version = Post.new(:title => "Test")
-        Post.expects(:find).at_least(1).with(@post.id).returns(@version)
+        Post.expects(:first).at_least(1).with(:conditions => { :_id => @post.id, :version => 1 }).returns(@version)
         @post.revise
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors: 
 - Durran Jordan