Merge pull request #25 from EDMdesigner/#20

#20

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.10",
+  "version": "0.1.11",
   "name": "superdata",
   "description": "A ligth weight data layer module motivated by extjs' data layer. It can be used with any client-side framework.",
   "main": "src/superData.js",

spec/model/modelSpec.js

@@ -134,14 +134,43 @@ describe("model", function() {
 				model.list({}, {}, function(err) {
 					expect(err).toBe("belongsToValues has to have properties for references given in belongsTo");
 				});
-				model.load({}, {}, function(err) {
+				model.load(null, {}, function(err) {
 					expect(err).toBe("belongsToValues has to have properties for references given in belongsTo");
 				});
 				model.create({}, function(err) {
 					expect(err).toBe("modelValues has to have properties for references given in belongsTo");
 				});
 			});
 
+			it("should call callback with error if projectID's type isn't match to fields.projectID.type", function() {
+				model.list(
+					{},
+					{
+						projectID: "notANumber"
+					},
+					function(err) {
+						expect(err).toBe("Each property of belongsToValues has to match type with corresponding property of options.fields");
+					}
+				);
+				model.load(
+					null,
+					{
+						projectID: "notANumber"
+					},
+					function(err) {
+						expect(err).toBe("Each property of belongsToValues has to match type with corresponding property of options.fields");
+					}
+				);
+				model.create(
+					{
+						projectID: "notANumber"
+					},
+					function(err) {
+						expect(err).toBe("Each property of modelValues contained by belongsTo has to match type with corresponding property of options.fields");
+					}
+				);
+			});
+
 			it("should pass belongsToValues as parameter to proxy's functions", function() {
 				model.list({}, {
 					projectID: 2

src/model/model.js

@@ -50,14 +50,23 @@ module.exports = function createModel(options) {
 	// - afterChange
 
 	function checkReferences(belongsToValues) {
-		for(var i=0; i<belongsTo.length; i += 1) {
+		for(var i = 0; i < belongsTo.length; i += 1) {
 			if(!belongsToValues[belongsTo[i]]) {
 				return false;
 			}
 		}
 		return true;
 	}
 
+	function checkReferenceTypes(belongsToValues) {
+		for(var i = 0; i < belongsTo.length; i += 1) {
+			if(typeof belongsToValues[belongsTo[i]] !== fields[belongsTo[i]].type) {
+				return false;
+			}
+		}
+		return true;
+	}
+
 	function list(options, belongsToValues, callback) {
 		if(!callback) {
 			callback = belongsToValues;
@@ -66,6 +75,9 @@ module.exports = function createModel(options) {
 		if(!checkReferences(belongsToValues)) {
 			return callback("belongsToValues has to have properties for references given in belongsTo");
 		}
+		if(!checkReferenceTypes(belongsToValues)) {
+			return callback("Each property of belongsToValues has to match type with corresponding property of options.fields");
+		}
 		var filters = {};
 		for(var i=0; i<belongsTo.length; i += 1) {
 			filters[belongsTo[i]] = belongsToValues[belongsTo[i]];
@@ -102,6 +114,9 @@ module.exports = function createModel(options) {
 		if(!checkReferences(belongsToValues)) {
 			return callback("belongsToValues has to have properties for references given in belongsTo");
 		}
+		if(!checkReferenceTypes(belongsToValues)) {
+			return callback("Each property of belongsToValues has to match type with corresponding property of options.fields");
+		}
 		var filters = {};
 		for(var i=0; i<belongsTo.length; i += 1) {
 			filters[belongsTo[i]] = belongsToValues[belongsTo[i]];
@@ -124,6 +139,9 @@ module.exports = function createModel(options) {
 		if(!checkReferences(modelValues)) {
 			return callback("modelValues has to have properties for references given in belongsTo");
 		}
+		if(!checkReferenceTypes(modelValues)) {
+			return callback("Each property of modelValues contained by belongsTo has to match type with corresponding property of options.fields");
+		}
 		proxy.createOne(modelValues, function(err, result) {
 			if (err) {
 				return callback(err);