Refactor variable name.

Rename validator -> scope in validate(), also tidy handling of `errors`
variable.

Author: tmpfs

lib/schema.js

@@ -69,7 +69,7 @@ function validate(source, opts, cb) {
 
   var value
     , rule
-    , validator
+    , scope
     , series = []
     , state = opts.state || {}
     // iterator function series/parallel
@@ -108,7 +108,7 @@ function validate(source, opts, cb) {
     if(typeof rule === 'function') {
       rule.test = rule;
     }else if(typeof rule.test !== 'function') {
-      // validator plugin functions are static methods
+      // scope plugin functions are static methods
       rule.test = Rule[rule.type];
     }
 
@@ -127,7 +127,7 @@ function validate(source, opts, cb) {
 
     var vars = {}
       , k
-      , validator
+      , scope
       , isDeep;
 
     // assign rule fields first
@@ -145,7 +145,7 @@ function validate(source, opts, cb) {
       } 
     }
 
-    // final build in properties
+    // final built in properties
     vars.rule = rule;
     vars.field = rule.field;
     vars.value = rule.value;
@@ -154,7 +154,7 @@ function validate(source, opts, cb) {
     vars.state = state;
     vars.messages = messages;
 
-    validator = Rule(vars);
+    scope = Rule(vars);
 
     isDeep = (rule.type === 'object' || rule.type === 'array')
       && typeof(rule.fields) === 'object';
@@ -166,12 +166,11 @@ function validate(source, opts, cb) {
         return callback(err); 
       }
 
-      var i
-        , errors = validator.errors;
+      //var errors = scope.errors;
 
       // not deep so continue on to next in series
       if(!isDeep) {
-        return callback(err, errors);
+        return callback(err, scope.errors);
 
       // generate temp schema for nested rules
       }else{
@@ -185,6 +184,7 @@ function validate(source, opts, cb) {
             , descriptor = rule.fields[key]
             , value = rule.value[key]
             , schema
+            , i
             , tmp;
 
           // state object is by pointer
@@ -222,7 +222,11 @@ function validate(source, opts, cb) {
           // does not exist fail at the rule level and don't
           // go deeper
           if(descriptor.required && value === undefined) {
-            tmp = Rule({field: key, rule: descriptor, errors: errors});
+            tmp = Rule({
+              field: key,
+              rule: descriptor,
+              errors: scope.errors
+            });
             tmp.raise(tmp.reasons.required, messages.required, key);
             return cb();
           }
@@ -240,22 +244,22 @@ function validate(source, opts, cb) {
 
           schema.validate(value, options, function(err, res) {
             if(res && res.errors.length) {
-              errors = errors.concat(res.errors); 
+              scope.errors = scope.errors.concat(res.errors); 
             }
             cb(err, null);
           });
         }, function(err, result) {
           // bail on first error
-          if(opts.first && errors && errors.length) {
-            return complete(err, errors, opts, cb);
+          if(opts.first && scope.errors && scope.errors.length) {
+            return complete(err, scope.errors, opts, cb);
           }
-          callback(err, errors); 
+          callback(err, scope.errors); 
         })
       }
     }
 
     // invoke rule validation function
-    rule.test.call(validator, onValidate);
+    rule.test.call(scope, onValidate);
 
   }, function(err, results) {
     complete(err, results, opts, cb);