Merge branch 'develop' into v1-candidate

Author: CodingCarlos

lib/modifiers/type.js

@@ -0,0 +1,46 @@
+/**
+ *	Type modifier
+ *
+ *	{
+ *		type: value	// Parse to expected type if possible.
+ *	}
+ */
+
+function modify(data, model) {
+	if (!model.type || !data || model.typeStrict == true) {
+		return data;
+	}
+
+	let parsed = data;
+
+	switch (model.type.toLowerCase()) {
+		case 'string':
+			if (data) {
+				parsed = String(data);
+			}
+			break;
+		case 'number':
+			if (!isNaN(Number(data))) {
+				parsed = Number(data);
+			}
+			break;
+		case 'boolean':
+			parsed = String(data).toLowerCase() === 'true';
+			break;
+		case 'object':
+		case 'array':
+			if(typeof data === 'string') {
+				try {
+					data = JSON.parse(data)
+				} catch (e) {
+					console.error('Tried to parse invalid json string to ' + model.type.toLowerCase());
+				}
+			}
+			break;
+		}
+
+	return parsed;
+}
+
+
+module.exports = modify;

lib/modify.js

@@ -17,12 +17,12 @@ const modifiers = fs.readdirSync(directory).map(function(file) {
  *	@param model {Object} Model to apply validations
  */
 function modify(data, model) {
+	let newValue = data;
 	for (let i = 0; i < modifiers.length; i++) {
-		const newValue = modifiers[i].check(data, model);
-		return newValue ? newValue : data;
+		newValue = modifiers[i].check(data, model);
 	}
-
-	return true;
+	
+	return newValue;
 }
 
 module.exports = {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "modelate",
-  "version": "0.2.5",
+  "version": "0.2.9",
   "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);
+			});
+		}
+	}
+
+});