mongoid_revisions 0.0.2 → 0.0.3

data/README.md

@@ -43,7 +43,15 @@ Simply call the revise method
 	last_comment_revision=@comment.revise
  ```
 
-to create a new revision for a document. Please note that the original object will be unchanged!
+to create a new revision for a document. Please note that the original object will be unchanged! 
+
+To create a new branch of a given document, use
+
+```ruby
+  new_comment=@comment.branch
+ ```
+
+and the returned document will have a different token and will be at revision 0.
 
 To access all revisitons for a givent document, use
 
@@ -61,8 +69,8 @@ to change the tag attribute of the document and save it in a single call.
 
 ## Future changes (sort of TODO list)
 
+- Check if linked relations cloning work for all relation's tipologies
 - Recursive revision to linked documents
-- Branching to create a new document at revision a 0 and with a token different from the original
 
 ## Development
 

data/lib/mongoid_revisions/version.rb

@@ -1,3 +1,3 @@
 module MongoidRevisions
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/mongoid_revisions.rb

@@ -33,24 +33,34 @@ module Mongoid
 
 			# CREATE A NEW REVISION FOR THE DOCUMENT
 			def revise
-				new_revision = self.class.create self.attributes.except("_id")
-				new_revision._token = self.token
-				new_revision._revision = (self.revision || 1) + 1
-				new_revision.tag = "#{new_revision.revision}.0.0"
-				new_revision.save
-				self.relations.each do |relation|
+				self._revise_or_branch((self.revision || 1) + 1,self.token)
+	    end
+
+			# CREATE A NEW BRANCH 
+			def branch
+				self._revise_or_branch(0)
+			end
+
+  	  protected
+
+			def _revise_or_branch(revision,token=nil)
+				new = self.class.create self.attributes.except("_id")
+        new._token = token
+        new._revision = revision
+				new.tag = "#{new.revision}.0.0"
+        new.save
+        self.relations.each do |relation|
           metadata = self.class.reflect_on_association(relation[0])
           metadata.class_name.constantize.where(metadata.foreign_key.to_sym=>self.id).each do |child|
             new_child = metadata.class_name.constantize.create child.attributes.except("_id")
             new_child.revision = child.revision+1
             new_child.tag = "#{new_child.revision}.0.0"
-						new_child[metadata.foreign_key.to_sym]=new_revision.id
+            new_child[metadata.foreign_key.to_sym]=new.id
             new_child.save
           end
         end
-	    end
-
-  	  protected
+        new
+			end
 
 			def _revision=(rev)
 				self[:revision]=rev

data/spec/mongoid_revisions/revisions_spec.rb

@@ -65,7 +65,7 @@ describe Mongoid::Revisions do
 
 	describe "when I want a new revision" do
 		before :all do
-			@project.revise
+			@new_revised_project = @project.revise
 		end
 
 		it "has 2 revisions" do
@@ -80,6 +80,10 @@ describe Mongoid::Revisions do
 			@project.revisions.last.revision.should==1
 		end
 
+		it "returned object should be last revision" do
+			@project.revisions.last.should==@new_revised_project
+		end
+
 		it "last revision has the default tag" do
 			@project.revisions.last.tag.should=="1.0.0"
 		end
@@ -93,7 +97,6 @@ describe Mongoid::Revisions do
 		end
 
     it "last revision has a single milestone" do
-			#puts @project.revisions.last.inspect
 			@project.revisions.last.milestones.count.should==1
     end
   end
@@ -107,4 +110,26 @@ describe Mongoid::Revisions do
 			@project.revisions.count.should==(count+2)
 		end
 	end
+
+	describe "when I want a new branch" do
+    before :all do
+      @new_project = @project.branch
+    end
+
+		it "should be at revision 0" do
+			@new_project.revision.should==0
+		end
+
+		it "should change token" do
+			@new_project.token.should_not==@project.token
+		end
+	
+		it "should have 1 milestone" do
+			@new_project.milestones.count.should==1
+		end
+
+		it "should have 1 revision" do
+			@new_project.revisions.count.should==1
+		end
+	end
 end

metadata

@@ -2,7 +2,7 @@
 name: mongoid_revisions
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Emiliano Della Casa