mongoid_versioned_atomic 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6859e384eb204360d022be2f91b8057abbe852eb
-  data.tar.gz: 84f61d00dd36b314e501ecaba475943becea95cc
+  metadata.gz: d83eb64a3ce02734d1d23bb0a68774ac009088a1
+  data.tar.gz: 12d3ddf6e8b9c379191b86d7505c354aca79e0fc
 SHA512:
-  metadata.gz: 8f17e52372a7ee52beac5f27daed48cdbeca51e3199642788f540e0089fc3894bd7ac42677d9a566605c2e4b08a6b59d7552cc186c207948d7b672f239ea8bc8
-  data.tar.gz: 5adb80e64c304229f049b4b20fec32b66e6c935f49757d8c0546d5f4b89cfebac4f5e9bb12c2e6ee46bb5017de0a681df8e13f53ea94220b8fb90e8a5ce38ed2
+  metadata.gz: f2e65e4bc80c43b1b3683a9390cbc52a30f9f60fa793c875c63ee2b425da4f0d33cc670619b8f9fc37b17fa99d48ad0434bbb46e68aba73e55931c79bd7fa079
+  data.tar.gz: 7b8dbd095df5136ccb0ee7ab7abae9905fd961edd2ffe35ae2957a321e7c5f3668d01bc5b62533c448c0ce524a5d874b90ad55f261ae712e4e64ffcbb0093ffd

data/lib/mongoid_versioned_atomic/v_atomic.rb

@@ -1,4 +1,8 @@
 module MongoidVersionedAtomic
+	
+	class DbUnchanged < StandardError
+	end
+
 	module VAtomic
 
 		extend ActiveSupport::Concern
@@ -10,6 +14,10 @@ module MongoidVersionedAtomic
 	    	attr_accessor :modified_count
 	    	attr_accessor :upserted_id
 	    	#before_save :filter_fields
+	    	after_create :check_upserted_id
+	    	after_update :check_modified_count
+
+
 	    end
 
 	    def self.included(base)
@@ -156,6 +164,15 @@ module MongoidVersionedAtomic
 	    	
 	    end
 
+	    ## after create callback , ensures that callback chain is halted if nothing was created.
+	    def check_upserted_id
+	    	raise DbUnchanged if !self.upserted_id
+	    end
+
+	    ## after update callback ensures that callback chain is halted if nothing was modified.
+	    def check_modified_count
+	    	raise DbUnchanged if !self.modified_count == 1
+	    end
 
 		## @param query[Hash] : optional query hash.
 		## @param log[Boolean] : defaults to false, set true if you want to print out the final command sent to mongo.
@@ -198,44 +215,42 @@ module MongoidVersionedAtomic
 						
 			 			expected_version = 1
 
-						prepare_insert(options) do
-							
-							as_document.keys.each do |k|
-				 				if (k != "version" && k != "op_success")
-				 					update["$setOnInsert"][k] = self.send(k.to_sym)
-				 				end
-				 			end
+			 			begin
+							prepare_insert(options) do
+								
+								as_document.keys.each do |k|
+					 				if (k != "version" && k != "op_success")
+					 					update["$setOnInsert"][k] = self.send(k.to_sym)
+					 				end
+					 			end
 
-				 			update["$setOnInsert"]["version"] = 1
+					 			update["$setOnInsert"]["version"] = 1
 
-							options,update = self.class.before_persist(options,update,true)
+								options,update = self.class.before_persist(options,update,true)
 
-							self.class.log_opts(query,update,options,"create",log)
-							
-							write_result = collection.update_one(query,update,options)
+								self.class.log_opts(query,update,options,"create",log)
+								
+								write_result = collection.update_one(query,update,options)
 
 
-								
-							self.matched_count = write_result.matched_count
-							self.modified_count = write_result.modified_count
-							self.upserted_id = write_result.upserted_id
-							##as long as it matched a document, or it inserted a document
-							if write_result.matched_count > 0 || write_result.upserted_id
-									self.send("op_success=",true)
-									self.version = 1
-							else
-									self.send("op_success",false)
-							end
-							#if !write_result.upserted_id.nil?
 									
-							#		self.send("op_success=",true)
-							#		self.version = 1
-							#else
-							#		self.send("op_success=",false)
-							#end
+								self.matched_count = write_result.matched_count
+								self.modified_count = write_result.modified_count
+								self.upserted_id = write_result.upserted_id
+								##as long as it matched a document, or it inserted a document
+								if write_result.matched_count > 0 || write_result.upserted_id
+										self.send("op_success=",true)
+										self.version = 1
+								else
+										self.send("op_success",false)
+								end
 								
 									
-						end
+										
+							end
+						rescue DbUnchanged => error
+							puts "caught db unchanged error, so callbacks will be halted.-------------------------------------------------------------"
+						end 
 					
 				end	        
 
@@ -297,7 +312,7 @@ module MongoidVersionedAtomic
 				expected_version = curr_doc["version"] + 1
 
 				##what happens is that we send the update["$set"][k] to whatever was stored in the dirty_fields.
-
+				begin
 				prepare_update(options) do
 					
 					dirty_fields.keys.each do |k|
@@ -325,6 +340,9 @@ module MongoidVersionedAtomic
 					end
 
 				end
+				rescue DbUnchanged => error
+					#puts "Rescued db unchanged error, so remaining after update callbacks will be halted."
+				end 
 				
 			end
 

data/lib/mongoid_versioned_atomic/version.rb

@@ -1,3 +1,3 @@
 module MongoidVersionedAtomic
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/dummy/app/models/user.rb

@@ -37,7 +37,8 @@ class User
   end
 
   def do_after_create
-  	self.after_create_field = 1
+    
+  	self.after_create_field = 1 
   end
 
   def do_before_update