A little clean up in Callbacks

lib/mongo_mapper/callbacks.rb

@@ -1,53 +1,41 @@
 module MongoMapper
-  module Callbacks    
+  module Callbacks
     def self.included(model) #:nodoc:
       model.class_eval do
         extend Observable
         include ActiveSupport::Callbacks
-        
+
         define_callbacks *%w(
-          before_save after_save before_create after_create before_update after_update before_validation
-          after_validation before_validation_on_create after_validation_on_create before_validation_on_update
-          after_validation_on_update before_destroy after_destroy
+          before_save
+          after_save
+          before_create
+          after_create
+          before_update
+          after_update
+          before_validation
+          after_validation
+          before_validation_on_create
+          after_validation_on_create
+          before_validation_on_update
+          after_validation_on_update
+          before_destroy
+          after_destroy
         )
       end
     end
 
     def before_save() end
 
     def after_save()  end
-    def create_or_update #:nodoc:
-      return false if callback(:before_save) == false
-      if result = super
-        callback(:after_save)
-      end
-      result
-    end
-    private :create_or_update
 
     def before_create() end
 
     def after_create() end
-    def create #:nodoc:
-      return false if callback(:before_create) == false
-      result = super
-      callback(:after_create)
-      result
-    end
-    private :create
 
     def before_update() end
 
     def after_update() end
 
-    def update(*args) #:nodoc:
-      return false if callback(:before_update) == false
-      result = super
-      callback(:after_update)
-      result
-    end
-    private :update
-
     def before_validation() end
 
     def after_validation() end
@@ -64,17 +52,18 @@ def valid? #:nodoc:
       return false if callback(:before_validation) == false
       result = new? ? callback(:before_validation_on_create) : callback(:before_validation_on_update)
       return false if false == result
-      
+
       result = super
       callback(:after_validation)
-      
+
       new? ? callback(:after_validation_on_create) : callback(:after_validation_on_update)
       return result
     end
 
     def before_destroy() end
 
     def after_destroy()  end
+
     def destroy #:nodoc:
       return false if callback(:before_destroy) == false
       result = super
@@ -85,18 +74,40 @@ def destroy #:nodoc:
     private
       def callback(method)
         result = run_callbacks(method) { |result, object| false == result }
-        
+
         if result != false && respond_to?(method)
           result = send(method)
         end
-        
+
         notify(method)
         return result
       end
-      
+
       def notify(method) #:nodoc:
         self.class.changed
         self.class.notify_observers(method, self)
       end
+
+      def create_or_update #:nodoc:
+        return false if callback(:before_save) == false
+        if result = super
+          callback(:after_save)
+        end
+        result
+      end
+
+      def create #:nodoc:
+        return false if callback(:before_create) == false
+        result = super
+        callback(:after_create)
+        result
+      end
+
+      def update(*args) #:nodoc:
+        return false if callback(:before_update) == false
+        result = super
+        callback(:after_update)
+        result
+      end
   end
 end