Adding before/after validation callbacks

lib/mongoid/commands.rb

@@ -4,6 +4,7 @@
 require "mongoid/commands/destroy"
 require "mongoid/commands/destroy_all"
 require "mongoid/commands/save"
+require "mongoid/commands/validate"
 
 module Mongoid #:nodoc:
 

lib/mongoid/commands/save.rb

@@ -10,7 +10,7 @@ class Save
       #
       # Returns: +Document+ if validation passes, +false+ if not.
       def self.execute(doc)
-        return false unless doc.valid?
+        return false unless Validate.execute(doc)
         doc.run_callbacks :before_save
         parent = doc.parent
         parent ? Save.execute(parent) : doc.collection.save(doc.attributes)

lib/mongoid/commands/validate.rb

@@ -0,0 +1,20 @@
+module Mongoid #:nodoc:
+  module Commands
+    class Validate
+      # Performs validation of the supplied +Document+, handling all associated
+      # callbacks.
+      #
+      # Options:
+      #
+      # doc: A +Document+ that is going to be persisted.
+      #
+      # Returns: +true+ if validation passes, +false+ if not.
+      def self.execute(doc)
+        doc.run_callbacks(:before_validation)
+        validated = doc.valid?
+        doc.run_callbacks(:after_validation)
+        return validated
+      end
+    end
+  end
+end

lib/mongoid/document.rb

@@ -11,10 +11,12 @@ class Document
       :after_destroy,
       :after_save,
       :after_update,
+      :after_validation,
       :before_create,
       :before_destroy,
       :before_save,
-      :before_update
+      :before_update,
+      :before_validation
 
     class << self
 

spec/unit/mongoid/commands/validate_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../spec_helper.rb"))
+
+describe Mongoid::Commands::Validate do
+
+  describe "#execute" do
+
+    before do
+      @document = stub(:run_callbacks)
+    end
+
+    it "validates the document" do
+      @document.expects(:valid?).returns(true)
+      Mongoid::Commands::Validate.execute(@document).should be_true
+    end
+
+    it "runs the before and after validate callbacks" do
+      @document.expects(:valid?).returns(true)
+      @document.expects(:run_callbacks).with(:before_validation)
+      @document.expects(:run_callbacks).with(:after_validation)
+      Mongoid::Commands::Validate.execute(@document)
+    end
+
+  end
+
+end