mongoid_versioned_atomic 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d392b2da40b54482e91d89731eed624efb083c76
-  data.tar.gz: d6685e1bb4bbc37bd5fbc8057afc953ec6215203
+  metadata.gz: 337375f358e129874924ae39cad647f60f56cba7
+  data.tar.gz: 8f74ef7dab61d6612ba465dc2464cb9918c9db2c
 SHA512:
-  metadata.gz: a8970d3797693063c263d6a2f0318e8c3a3054d7c50e03c7b3735f58dde28024c112c4379b22c89ed1b94c4e3825ef2636befbce90be115325ee7edbee002e1f
-  data.tar.gz: 4db81d6277285e3ea2111c6628ef39791ddb1da9fe3913d8395086db7954fc3d4d3a94b59bb59ce9264711b4c7cf50aab0b67b92cc2b300f8adb1e391ff1e029
+  metadata.gz: d4fe6168503237763d71060638b69fb67df2cc08a53df03b3bd5e9de305ec0d1b11f4dbebe561c62036d89c7ca78a3b75eca1e1a3ba3ee9d4878b93d93b42b67
+  data.tar.gz: 8ee69f14064cfc0bdb1a2db21f957c06673b670ce1c78d426cd9711f5c5f7914bdbb528876145cf40fda9e63d8c38cf56a41abb49bd911a1303c1ac43320c597

data/lib/mongoid_versioned_atomic/v_atomic.rb

@@ -13,9 +13,17 @@ module MongoidVersionedAtomic
 	    	attr_accessor :matched_count
 	    	attr_accessor :modified_count
 	    	attr_accessor :upserted_id
-	    	#before_save :filter_fields
-	    	after_create :check_upserted_id
-	    	after_update :check_modified_count
+	    	
+	    	## a flag should be set if this was attempted, and it failed.
+	    	## if it wasnt even attempted, it shouldnt be a problem.
+	    	## so before_create => make something on.
+	    	## after create make it "failed" if on and didnt go through.
+	    	## otherwise make it nil.
+
+	    	
+
+	    	#after_create :check_upserted_id
+	    	#after_update :check_modified_count
 
 
 	    end
@@ -164,23 +172,33 @@ module MongoidVersionedAtomic
 	    	
 	    end
 
+=begin
 	    ## after create callback , ensures that callback chain is halted if nothing was created.
 	    def check_upserted_id
-	    	raise DbUnchanged if !self.upserted_id
+	    	if !self.upserted_id && self.versioned_create_result
+	    		self.versioned_create_result = "fail"
+	    	else 
+	    		self.versioned_create_result = nil
+	    	end
 	    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
+	    	if !self.modified_count == 1 && self.versioned_update_result
+	    		self.versioned_update_result = "fail"
+	    	else
+	    		self.versioned_update_result = nil
+	    	end
 	    end
-
+=end
 	    ## overrides the save method on the model.
 	    ## calls versioned_create if it is a new record
 	    ## otherwise calls versioned_update.
+=begin
 	    def save(options = {})
 	    	self.new_record? ? self.versioned_create(options) : self.versioned_update(options)
 	    end
-
+=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.
@@ -223,7 +241,7 @@ module MongoidVersionedAtomic
 						
 			 			expected_version = 1
 
-			 			begin
+			 			
 							prepare_insert(options) do
 								
 								as_document.keys.each do |k|
@@ -245,6 +263,7 @@ module MongoidVersionedAtomic
 								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)
@@ -256,9 +275,7 @@ module MongoidVersionedAtomic
 									
 										
 							end
-						rescue DbUnchanged => error
-							puts "caught db unchanged error, so callbacks will be halted.-------------------------------------------------------------"
-						end 
+						
 					
 				end	        
 
@@ -320,7 +337,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|
@@ -348,9 +365,7 @@ 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.3"
+  VERSION = "0.0.4"
 end