Add inherited models and bugfix

Author: CodingCarlos

examples/chat.js

@@ -0,0 +1,86 @@
+/* Just a first basic test */
+var Modelate = require('../index');
+
+// Models
+var userModel = {
+	name: {
+		type: 'string',
+		length: {		// For now, length do nothng.
+			max: 10,
+			min: 1
+		},
+		value: {
+			eq: 'Paco'
+		}
+	},
+	surname: {
+		type: 'string',
+		length: {		// For now, length do nothng.
+			max: 3,
+			min: 1
+		},
+		value: {
+			contains: 'os'
+		}
+	},
+	age: {
+		type: 'number',
+		value: {
+			max: 95,
+			min: 18
+		}
+	},
+	dni: {
+		type: 'string',
+		value: {
+			max: 95,
+			min: 18
+		},
+		func: function startOnFive(value) {
+			if(value.charAt(0) === '5') {
+				return true;
+			}
+
+			return false;
+		}
+	}
+};
+var User = Modelate('User').set(userModel);
+
+// Modelate a user
+var myUserData = {
+	name: 'Paco',
+	surname: 'santos',
+	age: 19,
+	dni: '51402430A'
+};
+var myUser = User.modelate(myUserData);
+console.log('........ myUser:');	
+console.log(myUser);	
+console.log('................');	
+
+var messageModel = {
+	user: {
+		model: 'User'
+	},
+	// date: {
+	// 	type: 'date'
+	// },
+	message: {
+		type: 'string',
+		length: {
+			min: 1,
+			max: 255
+		}
+	}
+};
+var Message = Modelate('Message').set(messageModel);
+
+// Modelate a message
+var myMessageData = {
+	message: 'I am using models inside models. Crazy.',
+	// date: new Date(),
+	user: myUser
+};
+var myMessage = Message.modelate(myMessageData);
+console.log(myMessage);	

index.js

@@ -2,27 +2,21 @@
 const model = require('./lib/model');
 const modelate = require('./lib/modelate');
 
-const models = model.models;
+// const models = model.models;
 
 
 function Modelate(name) {
 	const self = this;
 
 	self.modelName = name;
-	self.model = model.add;
+	self.model = model.get;
+	self.set = model.add;
 	self.modelate = modelate;
 
-	models[name] = {};
+	// models[name] = {};
 
 	return this;
 }
 
 
 module.exports = Modelate;
-/*{
-	add: function () { },
-	remove: null,
-	list: null,
-	modelate: null
-};*/
-

lib/model.js

@@ -3,12 +3,24 @@ const models = {};
 function model(data) {
 	// ToDo: Validate model
 	// ToDo: Check if model already exists to merge instead of set
-	models[this.name] = data;
+	for(let prop in data) {
+		if(data[prop].model) {
+			data[prop] = models[data[prop].model];
+		}
+	}
+
+	models[this.modelName] = data;
 
 	return this;
 }
 
+function get() {
+	return models[this.modelName];
+}
+
+
 module.exports = {
 	models: models,
-	add: model
+	add: model,
+	get: get
 };

lib/modelate.js

@@ -3,8 +3,11 @@ const util = require('./util');
 const models = require('./model').models;
 const validate = require('./validate');
 
+// var modelate = function modelate(data) {
 function modelate(data) {
-	const model = util.clone(models[this.name]);
+
+	console.log(this.modelName);
+	const model = util.clone(models[this.modelName]);
 
 	for(let prop in model) {
 		if(validate(data[prop], model[prop])) {

lib/validators/type.js

@@ -8,7 +8,7 @@
 
 function isValid(data, model) {
 	if(!model.type) {
-		return false;
+		return true;
 	}
 
 	if((typeof(data)).toUpperCase() === model.type.toUpperCase()) {