added FunctionNode and added Changelog to README.md

README.md

@@ -179,6 +179,10 @@ var plainConfiguration = config.get();
   - choice(choices)
   - notEmpty()
 
+#### FunctionNode
+  - required()
+  - regex(expression)
+
 ### Single parameter validation
 
 It also possible to create a validator for a single parameter instead using a root object.
@@ -192,10 +196,26 @@ gender.get(); // male
 gender.set('not a gender'); // throws AssertError
 ```
 
+## Changelog
+
+### Dev
+
+  - added FunctionNode
+
+### 0.0.2a
+
+  - added MixedNode
+  - added ChoiceAssert
+  - added NotEmptyAssert
+  - added CountAssert
+
+### 0.0.1a
+
+  - initial commit
+
 ## TODO
 
  - add more assertions
- - add FunctionNode
  - add option to not throw errors
  - add option to not fail on a single error and continue validating (even set validated values?)
  - improve get logics or change it (maybe add property string) i.e. `.get('nested.property1')`

dist/configurator.js

@@ -24,11 +24,11 @@ AssertError.prototype = Object.create(Error.prototype);
 function CountAssert(min, max) {
   this.test = function (node, value) {
     if (typeof min === 'number' && value.length < min) {
-      throw new AssertError(node, 'CountAssert', 'Expected array to contain `' + min + '` or more values');
+      throw new AssertError(node, 'CountAssert', 'Expected array to contain ' + min + ' or more values');
     }
 
     if (typeof max === 'number' && value.length > max) {
-      throw new AssertError(node, 'CountAssert', 'Expected array to contain `' + max + '` or less values');
+      throw new AssertError(node, 'CountAssert', 'Expected array to contain ' + max + ' or less values');
     }
   };
 }
@@ -136,6 +136,15 @@ function ArrayAssert() {
   };
 }
 
+function FunctionAssert() {
+  this.test = function (node, value) {
+    if (typeof value !== 'function') {
+      throw new AssertError(node, 'Function', 'type mismatch expected `function` got `' + typeof value + '`');
+    }
+    return true;
+  };
+}
+
 /**
  * @constructor
  */
@@ -308,6 +317,20 @@ function BooleanNode(name, children, parent) {
 
 BooleanNode.prototype = Object.create(Node.prototype);
 
+/**
+ * @param name
+ * @param [children]
+ * @param [parent]
+ *
+ * @implements Node
+ * @constructor
+ */
+function FunctionNode(name, children, parent) {
+  Node.apply(this, [name, new FunctionAssert(), children, parent, false]);
+}
+
+FunctionNode.prototype = Object.create(Node.prototype);
+
 /**
  * @param name
  * @param [children]
@@ -371,6 +394,10 @@ function NodeChildren(parent) {
     return new MixedNode(name, null, parent);
   };
 
+  this.functionNode = function (name) {
+    return new FunctionNode(name, null, parent);
+  };
+
   this.end = function () {
     return parent;
   };
@@ -473,6 +500,7 @@ configurator.BooleanNode = BooleanNode;
 configurator.ArrayNode = ArrayNode;
 configurator.ObjectNode = ObjectNode;
 configurator.MixedNode = MixedNode;
+configurator.FunctionNode = FunctionNode;
 
 if (typeof define === 'function' && define.amd) {
   define([], configurator);

src/asserts/types.js

@@ -43,4 +43,13 @@ function ArrayAssert() {
     }
     return true;
   };
+}
+
+function FunctionAssert() {
+  this.test = function (node, value) {
+    if (typeof value !== 'function') {
+      throw new AssertError(node, 'Function', 'type mismatch expected `function` got `' + typeof value + '`');
+    }
+    return true;
+  };
 }

src/core.js

@@ -17,4 +17,5 @@ configurator.NumberNode = NumberNode;
 configurator.BooleanNode = BooleanNode;
 configurator.ArrayNode = ArrayNode;
 configurator.ObjectNode = ObjectNode;
-configurator.MixedNode = MixedNode;
+configurator.MixedNode = MixedNode;
+configurator.FunctionNode = FunctionNode;

src/node/function.js

@@ -0,0 +1,13 @@
+/**
+ * @param name
+ * @param [children]
+ * @param [parent]
+ *
+ * @implements Node
+ * @constructor
+ */
+function FunctionNode(name, children, parent) {
+  Node.apply(this, [name, new FunctionAssert(), children, parent, false]);
+}
+
+FunctionNode.prototype = Object.create(Node.prototype);

src/node/nodeChildren.js

@@ -27,6 +27,10 @@ function NodeChildren(parent) {
     return new MixedNode(name, null, parent);
   };
 
+  this.functionNode = function (name) {
+    return new FunctionNode(name, null, parent);
+  };
+
   this.end = function () {
     return parent;
   };

test/helpers/ConfiguratorHelper.js

@@ -41,6 +41,7 @@ function methodConfigHelper() {
         .mixedNode('mixedNode').choice([true, 'string', 5]).end()
         .mixedNode('mixedNodeNotEmpty').notEmpty().end()
         .arrayNode('arrayCount').count(1, 10).end()
+        .functionNode('callback').end()
       .end();
   });
 
@@ -78,7 +79,8 @@ function argConfigHelper() {
       new configurator.MixedNode('mixedNodeWithAssert').greaterThan(0).lessThan(10),
       new configurator.MixedNode('mixedNode').choice([true, 'string', 5]),
       new configurator.MixedNode('mixedNodeNotEmpty').notEmpty(),
-      new configurator.ArrayNode('arrayCount').count(1, 10)
+      new configurator.ArrayNode('arrayCount').count(1, 10),
+      new configurator.FunctionNode('callback')
     ]);
   });
 

test/helpers/SharedPropertiesSpecHelper.js

@@ -95,7 +95,7 @@ function sharedPropertiesSpecHelper() {
 
       expect(function () {
         config.set({
-          property1:             5,
+          property1:         5,
           mixedWithChildren: {
             key1: 'string',
             key2: 'string'
@@ -105,20 +105,37 @@ function sharedPropertiesSpecHelper() {
 
       expect(function () {
         config.set({
-          property1:             5,
+          property1:         5,
           mixedWithChildren: [true, 'anotherstring']
         });
       }).toThrowError(/type mismatch expected `string` got `boolean`/);
 
       expect(function () {
         config.set({
-          property1:             5,
+          property1:         5,
           mixedWithChildren: {
             key1: true,
             key2: 'string'
           }
         });
       }).toThrowError(/type mismatch expected `string` got `boolean`/);
     });
+
+    it('should validate a function nodes', function () {
+      expect(function () {
+        config.set({
+          property1: 5,
+          callback:  function () {
+          }
+        });
+      }).not.toThrow();
+
+      expect(function () {
+        config.set({
+          property1: 5,
+          callback:  'string'
+        });
+      }).toThrowError(/type mismatch expected `function` got `string`/);
+    });
   });
 }