nested objects beyond first level not validating

dandean · Mar 22, 2011 · c9daac4 · c9daac4
1 parent 4d7765f
commit c9daac4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/lib/validator.js b/lib/validator.js
@@ -25,10 +25,12 @@ function Validator(fieldname, label) {
 
     stack.forEach(function(validate) {
       validate.getValue = function(name) {
-        var match = name.match(/^([^\[]*)(?:\[(.*)\])*$/);
-        var value = formData[match[1] || name];
-        if(match.length > 2) { // if complex property (e.g. user[info][password])
-          for(var mi = 2, mval; mval = match[mi]; mi++) value = value[mval];
+        var match = name.match(/[^\[\]]*/g).filter(function(m){ return !!m; })
+        var value = formData[match[0] || name];
+        if(match.length > 1) { // if complex property (e.g. user[info][password])
+          for(var mi = 1, mval; mval = match[mi]; mi++){
+            value = value[mval];
+          }
         }
         return value;
       };

diff --git a/test/validate.test.js b/test/validate.test.js
@@ -518,11 +518,13 @@ module.exports = {
   },
 
   "validation : complex properties": function() {
-    var request = { body: { field: { inner: "value" }}};
+    var request = { body: { field: { inner: "value", even: { more: { inner: "value" }}}}};
     form(
       validate("field[inner]").required().equals("value"),
-      validate("field[inner]").required().equals("fail")
+      validate("field[inner]").required().equals("fail"),
+      validate("field[even][more][inner]").required().equals("value"),
+      validate("field[even][more][inner]").required().equals("fail")
     )(request, {});
-    assert.equal(request.form.errors.length, 1);
+    assert.equal(request.form.errors.length, 2);
   }
 };