fixed pattern callback bug

mikestopcontinues · Aug 30, 2014 · 7e19727 · 7e19727
1 parent adacf42
commit 7e19727
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,7 @@
+0.1.3 - August 30, 2014
+-----------------------
+* fixed pattern callback bug
+
 0.1.2 - August 30, 2014
 -----------------------
 * allow default value to take callback function(file, data) returning default value

diff --git a/lib/index.js b/lib/index.js
@@ -94,7 +94,10 @@ function plugin(matchers) {
 							}
 						}
 
-						if ('pattern' in validator && ((typeof validator.pattern === 'function' && !validator.pattern(data[key])) || !data[key].match(validator.pattern))) {
+						if ('pattern' in validator && (
+							(typeof validator.pattern === 'function' && !validator.pattern(data[key])) ||
+							(typeof validator.pattern !== 'function' && !data[key].match(validator.pattern))
+							)) {
 							err = new Error('File "' + file + '" value "' + key + '" does not match ' + validator.pattern + '.');
 							return false;
 						}

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "metalsmith-validate",
   "description": "A Metalsmith plugin that allows you to easily validate file metadata, checking existence, type, and regex pattern.",
   "repository": "git://github.com/mikestopcontinues/metalsmith-validate.git",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "author": "Mike Stop Continues <mikestopcontinues@gmail.com>",
   "license": "MIT",
   "main": "lib/index.js",