lib/mongomapper/save_with_validation.rb in jnunemaker-mongomapper-0.1.1 vs lib/mongomapper/save_with_validation.rb in jnunemaker-mongomapper-0.1.2

@@ -2,26 +2,48 @@
   module SaveWithValidation
     def self.included(base)
       base.class_eval do
         alias_method_chain :valid?, :callbacks
         alias_method_chain :save, :validation
+        
+        define_callbacks  :before_validation_on_create,   :before_validation_on_update,
+                          :before_validation,             :after_validation,
+                          :validate, :validate_on_create, :validate_on_update
       end
     end
     
     def save!
       save_with_validation || raise(DocumentNotValid.new(self))
     end
     
     private
-      def save_with_validation
-        new? ? run_callbacks(:before_validation_on_create) : 
-               run_callbacks(:before_validation_on_update)
-      
-        valid? ? save_without_validation : false
+      def save_with_validation        
+        if valid?
+          save_without_validation
+        else
+          false
+        end
       end
     
       def valid_with_callbacks?
         run_callbacks(:before_validation)
-        run_callbacks(:after_validation) if valid_without_callbacks?
+        
+        if new?
+          run_callbacks(:before_validation_on_create)
+        else
+          run_callbacks(:before_validation_on_update)
+        end
+        
+        run_callbacks(:validate)
+        
+        if new?
+          run_callbacks(:validate_on_create)
+        else
+          run_callbacks(:validate_on_update)
+        end
+        
+        is_valid = valid_without_callbacks?
+        run_callbacks(:after_validation) if is_valid
+        is_valid 
       end
   end  
 end
\ No newline at end of file