Merge branch 'release/0.1.2'

lib/index.js

@@ -128,8 +128,16 @@ module.exports = function propertyValidation(data, schema) {
     /*
      Regular expression
      */
-    if (rules.regexp && !rules.regexp.test(propertyValue)) return false
-
+    if (rules.regexp) {
+      if (Array.isArray(rules.regexp)) {
+        if (!rules.regexp.every(function(regexp) {return regexp.test(propertyValue)})) {
+          return false
+        }
+      } else if (!rules.regexp.test(propertyValue)) {
+        return false
+      }
+    } 
+
     return true
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple-schema",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Simple object validation framework",
   "keywords": [
     "validation",

test/test.js

@@ -754,6 +754,46 @@ describe('Simple-schema', function () {
         return [1].indexOf(err.rule.error.code) !== -1
       }))
     })
+
+    it('supports array of regexps', function () {
+      var errors
+
+      var schema = {
+        'prop1': {
+          'required': true,
+          'type': 'string',
+          'regexp': [/don't/, /fail/],
+          'error': {'code': 1, 'message': 'one'}
+        }
+      }
+
+      errors = validate({
+        'prop1': 'don\'t fail'
+      }, schema)
+      assert.equal(errors.length, 0)
+    })
+
+    it('if any regexp in array fails - fail validation', function () {
+      var errors
+
+      var schema = {
+        'prop1': {
+          'required': true,
+          'type': 'string',
+          'regexp': [/please/, /fail/],
+          'error': {'code': 1, 'message': 'one'}
+        }
+      }
+
+      errors = validate({
+        'prop1': 'don\'t fail'
+      }, schema)
+      assert.equal(errors.length, 1)
+
+      assert(errors.every(function (err) {
+        return [1].indexOf(err.rule.error.code) !== -1
+      }))
+    })
   })