Separate validators

Author: CodingCarlos

lib/modelate.js

@@ -4,8 +4,6 @@ const models = require('./model').models;
 const validate = require('./validate');
 
 function modelate(data) {
-	console.log('modeling', data, 'for object with type', this.modelName);
-
 	const model = util.clone(models[this.name]);
 
 	for(let prop in model) {

lib/validate.js

@@ -1,24 +1,30 @@
 
+const validators = ['type', 'length'];
 
-function validate(data, model) {
-	let isValid = true;
+// Turn validator names to validator instances.
+for(let i = 0; i < validators.length; i++) {
+	validators[i] = validator(validators[i]);
+} 
 
-	if(model.type && typeof(data) === model.type) {
-		isValid = true;
-
-		// maxLength
-		if(model.maxLength && data.length > model.maxLength) {
-			isValid = false;
-		}
-		// minLenght
-		if(model.minLength && data.length < model.minLength) {
-			isValid = false;
+// Validate
+function validate(data, model) {	
+	for(let i = 0; i < validators.length; i++) {
+		if(!validators[i].check(data, model)) {
+			console.error('Validation for "' + data + '" failed! Reason: ', validators[i].name);
+			return false;
 		}
-	} else {
-		isValid = false;
-	}
+	} 
 
-	return isValid;
+	return true;
 }
 
+// Create new validator instances
+function validator(name) {
+	return {
+		name: name,
+		check: require('./validators/' + name)
+	};
+}
+
+
 module.exports = validate;

lib/validators/length.js

@@ -0,0 +1,30 @@
+/**	
+ *	Length validator
+ *
+ *	{
+ *		length: {
+ *			max: Number,	// Maximum allowed value
+ *			min: Number		// Minimum allowed value
+ *		}
+ *	}
+ */
+
+function isValid(data, model) {
+	if(!model.length) {
+		return true;
+	}
+
+	// Data is higher than max 
+	if(model.length.max && data.length > model.length.max) {
+		return false;
+	}
+
+	// Data is lower than min
+	if(model.length.min && data.length < model.length.min) {
+		return false;
+	}
+
+	return true;
+}
+
+module.exports = isValid;

lib/validators/type.js

@@ -0,0 +1,21 @@
+/**	
+ *	Typ(e validator
+  *
+  *	{
+  *		type: String	// Check if data has a JS type (uses typeof)
+ *	}
+ */
+
+function isValid(data, model) {
+	if(!model.type) {
+		return false;
+	}
+
+	if((typeof(data)).toUpperCase() === model.type.toUpperCase()) {
+		return true;
+	} 
+
+	return false;
+}
+
+module.exports = isValid;

test.js

@@ -8,6 +8,13 @@ var model = {
 			max: 10,
 			min: 1
 		}
+	},
+	surname: {
+		type: 'string',
+		length: {		// For now, length do nothng.
+			max: 3,
+			min: 1
+		}
 	}
 };
 var user = Modelate('User').model(model);