The global options object is now passed to custom validators

The is to help the issue raised in ansman#63

Author: ansman

index.html

@@ -401,6 +401,7 @@
       <li>
         <a href="#changelog">Changelog</a>
         <ul>
+          <li><a href="#changelog-wip">WIP</a></li>
           <li><a href="#changelog-0-8-0">0.8.0</a></li>
           <li><a href="#changelog-0-7-1">0.7.1</a></li>
           <li><a href="#changelog-0-7-0">0.7.0</a></li>
@@ -972,6 +973,10 @@ <h2>Writing your own validator</h2>
             <li>
               <b>attributes</b> - The entire attributes object.
             </li>
+            <li>
+              <b>globalOptions</b> - The options passed when calling
+              <code>validate</code> (will always be an object, non null).
+            </li>
           </ol>
           <p class="description">
             If the validator passes simply return <code>null</code> or <code>undefined</code>.
@@ -2114,6 +2119,17 @@ <h2>Utilities</h2>
         </div>
         <div id="changelog">
           <h2>Changelog</h2>
+          <div id="changelog-wip">
+            <h3>
+              <b class="version">WIP</b>
+            </h3>
+            <ul>
+              <li>
+                The global validation options are now passed to custom
+                validators.
+              </li>
+            </ul>
+          </div>
           <div id="changelog-0-8-0">
             <h3>
               <b class="version">0.8.0</b>

specs/validate-spec.js

@@ -100,15 +100,17 @@ describe("validate", function() {
       expect(pass).toHaveBeenCalledWithContext(pass);
     });
 
-    it("calls the validator with the val, opts, key and attributes", function() {
+    it("calls the validator with the val, opts, key, attributes and global options", function() {
       var options = {someOption: true}
         , attributes = {someAttribute: 'some value'}
-        , constraints = {someAttribute: {pass: options}};
-      validate.runValidations(attributes, constraints, {});
+        , constraints = {someAttribute: {pass: options}}
+        , globalOptions = {someOption: 'some value'};
+      validate.runValidations(attributes, constraints, globalOptions);
       expect(pass).toHaveBeenCalledWith('some value',
                                         options,
                                         'someAttribute',
-                                        attributes);
+                                        attributes,
+                                        globalOptions);
     });
 
     it("returns an array of results", function() {
@@ -179,7 +181,7 @@ describe("validate", function() {
         , globalOptions = {foo: "bar"};
       validate.runValidations(attrs, constraints, globalOptions);
       expect(spy).toHaveBeenCalledWith("Nicklas", attrs, "name", globalOptions, constraints);
-      expect(pass).toHaveBeenCalledWith("Nicklas", options.pass, "name", attrs);
+      expect(pass).toHaveBeenCalledWith("Nicklas", options.pass, "name", attrs, globalOptions);
     });
 
     it("allows the options for a validator to be a function", function() {
@@ -190,7 +192,7 @@ describe("validate", function() {
         , globalOptions = {foo: "bar"};
       validate.runValidations(attrs, constraints, globalOptions);
       expect(spy).toHaveBeenCalledWith("Nicklas", attrs, "name", globalOptions, constraints);
-      expect(pass).toHaveBeenCalledWith("Nicklas", options, "name", attrs);
+      expect(pass).toHaveBeenCalledWith("Nicklas", options, "name", attrs, globalOptions);
     });
 
     it("doesnt run the validations if the options are falsy", function() {
@@ -213,7 +215,8 @@ describe("validate", function() {
         "bar",
         true,
         "foo",
-        {foo: "bar"}
+        {foo: "bar"},
+        {}
       );
 
       validate($form, constraints);
@@ -222,7 +225,8 @@ describe("validate", function() {
         "bar",
         true,
         "foo",
-        {foo: "bar"}
+        {foo: "bar"},
+        {}
       );
     });
   });

validate.js

@@ -131,8 +131,12 @@
             value: value,
             validator: validatorName,
             options: validatorOptions,
-            error: validator.call(validator, value, validatorOptions, attr,
-                                  attributes)
+            error: validator.call(validator,
+                value,
+                validatorOptions,
+                attr,
+                attributes,
+                options)
           });
         }
       }