Passes Model to Instance directly, changes Instance to use Model.properties instead of opts.properties

dresende · dresende · commit 52611e5240bf · 2013-07-04T00:20:07.000+01:00
diff --git a/lib/Instance.js b/lib/Instance.js
@@ -3,7 +3,7 @@ var Hook     = require("./Hook");
 
 exports.Instance = Instance;
 
-function Instance(opts) {
+function Instance(Model, opts) {
 	opts = opts || {};
 	opts.data = opts.data || {};
 	opts.extra = opts.extra || {};
@@ -27,8 +27,8 @@ function Instance(opts) {
 		var pending = [], errors = [], required;
 
 		for (var k in opts.validations) {
-			if (opts.properties[k]) {
-				required = opts.properties[k].required;
+			if (Model.properties[k]) {
+				required = Model.properties[k].required;
 			} else {
 				for (var i = 0; i < opts.one_associations.length; i++) {
 					if (opts.one_associations[i].field == k) {
@@ -60,15 +60,15 @@ function Instance(opts) {
 					err.msg   = msg;
 					err.type  = "validation";
 
-					if (!opts.model.settings.get("instance.returnAllErrors")) {
+					if (!Model.settings.get("instance.returnAllErrors")) {
 						return cb(err);
 					}
 
 					errors.push(err);
 				}
 
 				return checkNextValidation();
-			}, instance, opts.model, validation[0]);
+			}, instance, Model, validation[0]);
 		};
 		return checkNextValidation();
 	};
@@ -89,10 +89,10 @@ function Instance(opts) {
 				return saveError(cb, err);
 			}
 
-			for (var k in opts.properties) {
-				if (!opts.properties.hasOwnProperty(k)) continue;
-				if (opts.data[k] == null && opts.properties[k].hasOwnProperty("defaultValue")) {
-					opts.data[k] = opts.properties[k].defaultValue;
+			for (var k in Model.properties) {
+				if (!Model.properties.hasOwnProperty(k)) continue;
+				if (opts.data[k] == null && Model.properties[k].hasOwnProperty("defaultValue")) {
+					opts.data[k] = Model.properties[k].defaultValue;
 				}
 			}
 
@@ -140,10 +140,10 @@ function Instance(opts) {
 			for (var k in opts.data) {
 				if (!opts.data.hasOwnProperty(k)) continue;
 
-				if (opts.properties[k]) {
-					data[k] = Property.validate(opts.data[k], opts.properties[k]);
+				if (Model.properties[k]) {
+					data[k] = Property.validate(opts.data[k], Model.properties[k]);
 					if (opts.driver.propertyToValue) {
-						data[k] = opts.driver.propertyToValue(data[k], opts.properties[k]);
+						data[k] = opts.driver.propertyToValue(data[k], Model.properties[k]);
 					}
 				} else {
 					data[k] = opts.data[k];
@@ -311,10 +311,10 @@ function Instance(opts) {
 		var changes = {}, conditions = {};
 		changes[key] = value;
 
-		if (opts.properties[key]) {
-			changes[key] = Property.validate(changes[key], opts.properties[key]);
+		if (Model.properties[key]) {
+			changes[key] = Property.validate(changes[key], Model.properties[key]);
 			 if (opts.driver.propertyToValue) {
-				changes[key] = opts.driver.propertyToValue(changes[key], opts.properties[key]);
+				changes[key] = opts.driver.propertyToValue(changes[key], Model.properties[key]);
 			}
 		}
 
@@ -389,15 +389,15 @@ function Instance(opts) {
 		}
 	}
 
-	for (var k in opts.properties) {
-		if (opts.properties.hasOwnProperty(k) && !opts.data.hasOwnProperty(k) && opts.keys.indexOf(k) == -1) {
+	for (var k in Model.properties) {
+		if (Model.properties.hasOwnProperty(k) && !opts.data.hasOwnProperty(k) && opts.keys.indexOf(k) == -1) {
 			opts.data[k] = null;
 		}
 	}
 
 	for (k in opts.data) {
 		if (!opts.data.hasOwnProperty(k)) continue;
-		if (!opts.properties.hasOwnProperty(k) && opts.keys.indexOf(k) == -1 && opts.association_properties.indexOf(k) == -1) {
+		if (!Model.properties.hasOwnProperty(k) && opts.keys.indexOf(k) == -1 && opts.association_properties.indexOf(k) == -1) {
 			if (!opts.extra.hasOwnProperty(k)) continue;
 
 			if (opts.driver.valueToProperty) {
@@ -407,8 +407,8 @@ function Instance(opts) {
 			continue;
 		}
 
-		if (opts.properties[k] && opts.driver.valueToProperty) {
-			opts.data[k] = opts.driver.valueToProperty(opts.data[k], opts.properties[k]);
+		if (Model.properties[k] && opts.driver.valueToProperty) {
+			opts.data[k] = opts.driver.valueToProperty(opts.data[k], Model.properties[k]);
 		}
 
 		addInstanceProperty(k);
diff --git a/lib/Model.js b/lib/Model.js
@@ -65,7 +65,7 @@ function Model(opts) {
 			}
 		}
 
-		var instance = new Instance({
+		var instance = new Instance(model, {
 			uid                    : inst_opts.uid, // singleton unique id
 			id                     : opts.id,
 			keys                   : opts.keys,
@@ -75,10 +75,8 @@ function Model(opts) {
 			autoSave               : inst_opts.autoSave || false,
 			extra                  : inst_opts.extra,
 			extra_info             : inst_opts.extra_info,
-			model                  : model,
 			driver                 : opts.driver,
 			table                  : opts.table,
-			properties             : opts.properties,
 			hooks                  : opts.hooks,
 			methods                : opts.methods,
 			validations            : opts.validations,
