Merge pull request #22 from CodingCarlos/develop

v0.2.7 Fix type modifier on boolean

Author: CodingCarlos

lib/modifiers/type.js

@@ -22,10 +22,18 @@ function modify(data, model) {
 		case 'number':
 			if (!isNaN(Number(data))) {
 				parsed = Number(data);
+			} else {
+				parsed = undefined;
 			}
 			break;
 		case 'boolean':
-			parsed = Boolean(data);
+			parsed = String(data).toLowerCase() === 'true';
+			break;
+		case 'object':
+			parsed = (typeof data === 'object') ? data : undefined;
+			break;
+		case 'array':
+			parsed = (Array.isArray(data)) ? data : undefined;
 			break;
 		}
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "modelate",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "A simple data modeling tool for NodeJS",
   "main": "index.js",
   "scripts": {

spec/modifiers/type.spec.js

@@ -0,0 +1,54 @@
+var valid = require('../../lib/modifiers/type');
+
+const str = 'Hello world';
+const obj = {hello: 'world'};
+const num = 42;
+const bool = true;
+const arr = [1, 2, 3];
+
+const types = {
+	string: str,
+	object: obj, 
+	number: num,
+	boolean: bool,
+	array: arr
+};
+const typesKeys = Object.keys(types);
+
+describe(' - Type modifier', () => {
+	it('shall be a function', () => {
+		expect(typeof valid).toEqual('function');
+	});
+
+	for (let key in typesKeys) {
+		it('shall let '+ typesKeys[key] +' when no model set', () => {
+			expect(valid(types[key], {})).toEqual(types[key]);
+		});
+	}
+
+	for (let validType in typesKeys) {
+		let model = {type: typesKeys[validType]};
+		for (let check in typesKeys) {
+			it('shall only validate '+ typesKeys[validType] +' when model set, and '+ typesKeys[check] +' given', () => {
+				const modelated = valid(types[typesKeys[check]], model);
+				let shallBeValid = (typeof modelated === typesKeys[validType]);
+
+				if (typesKeys[validType] === 'object' && typeof modelated === 'undefined') {
+					shallBeValid = true;
+				}
+
+				if ((typesKeys[validType] === 'array' && Array.isArray(modelated))
+				|| (typesKeys[validType] === 'array' && typeof modelated === 'undefined')) {
+					shallBeValid = true;
+				}
+
+				if (typesKeys[validType] === 'number' && typeof modelated === 'undefined') {
+					shallBeValid = true;
+				}
+
+				expect(shallBeValid).toEqual(true);
+			});
+		}
+	}
+
+});