Updated Model to support new preprocessor framework

lib/Model.js

@@ -4,9 +4,10 @@
 /// <reference path="utils/validation.js"/>
 
 var _ = require('lodash');
+var Database = require('./Database');
 var Instance = require('./Instance');
 var validate = require('./utils/validation');
-var transform = require('./utils/transforms');
+var Preprocessors = require('./preprocessors');
 var ObjectID = require('mongodb').ObjectID;
 
 
@@ -20,15 +21,20 @@ function Model(database, collection, schema, options) {
 	/// <param name="options" type="Object">Additional options configuring the behaviour of this model's instances</param>
 
 	if (!options) options = {};
-	if (!options.hooks) options.hooks = {};
 
-	options.transforms = options.transforms || {};
-
-	_.defaults(options.transforms, {
-		_id: {
-			$down: function (value) { return new ObjectID(value.id).toHexString(); },
-			$up: function (value) { return value ? ObjectID.createFromHexString(value) : undefined; }
-		}
+	_.defaults(options, {
+		hooks: {},
+		preprocessors: [
+			new Preprocessors.Rename({
+				_id: 'id'
+			}),
+			new Preprocessors.Convert({
+				id: {
+					$down: function (value) { return new ObjectID(value.id).toHexString(); },
+					$up: function (value) { return value ? ObjectID.createFromHexString(value) : undefined; }
+				}
+			})
+		]
 	});
 
 	options.schema = schema;
@@ -50,6 +56,22 @@ function Model(database, collection, schema, options) {
 	});
 }
 
+Model.prototype.fromSource = function(document) {
+	/// <summary>Applies the model's preprocessors to convert the document from the source</summary>
+	/// <param name="document" type="Object">The object to apply the preprocessors to</param>
+
+	for(var i = 0; i < this.options.preprocessors.length; i++)
+		this.options.preprocessors[i].fromSource(document);
+};
+
+Model.prototype.toSource = function(document) {
+	/// <summary>Applies the model's preprocessors to convert the document from the source</summary>
+	/// <param name="document" type="Object">The object to apply the preprocessors to</param>
+
+	for(var i = this.options.preprocessors.length - 1; i >= 0; i--)
+		this.options.preprocessors[i].toSource(document);
+};
+
 Model.prototype.wrap = function (document, isNew) {
 	/// <signature>
 	/// <summary>Wraps the given database object in this model's Instance wrapper</summary>
@@ -63,7 +85,7 @@ Model.prototype.wrap = function (document, isNew) {
 	/// <returns type="Instance"/>
 	/// </signature>
 
-	return new Instance(this.collection, document, this.options, isNew);
+	return new Instance(this, document, isNew);
 };
 
 Model.prototype.find = function (conditions, callback) {
@@ -102,7 +124,7 @@ Model.prototype.find = function (conditions, callback) {
 		}
 	}
 
-	transform.up(this.options.transforms, conditions);
+	this.toSource(conditions);
 
 	this.collection.find(conditions).toArray(function (err, results) {
 		if (err) return callback(err);
@@ -147,7 +169,7 @@ Model.prototype.findOne = Model.prototype.get = function (conditions, callback)
 		}
 	}
 
-	transform.up(this.options.transforms, conditions);
+	this.toSource(conditions);
 
 	this.collection.findOne(conditions, function (err, results) {
 		if (err) return callback(err);
@@ -233,7 +255,7 @@ Model.prototype.insert = Model.prototype.create = function (object, callback) {
 			}
 
 			// Transform the object
-			transform.up($.options.transforms, obj);
+			$.toSource(obj);
 
 			prepped.push(obj);
 			return prepNext();
@@ -279,7 +301,7 @@ Model.prototype.update = function (conditions, changes, callback) {
 		}
 	}
 
-	transform.up(this.options.transforms, conditions);
+	this.toSource(conditions);
 
 	this.collection.update(conditions, changes, { w: callback ? 1 : 0, multi: true }, callback);
 };
@@ -312,7 +334,7 @@ Model.prototype.count = function (conditions, callback) {
 		}
 	}
 
-	transform.up(this.options.transforms, conditions);
+	this.toSource(conditions);
 
 	this.collection.count(conditions, callback);
 };
@@ -352,7 +374,7 @@ Model.prototype.remove = function (conditions, callback) {
 		}
 	}
 
-	transform.up(this.options.transforms, conditions);
+	this.toSource(conditions);
 
 	this.collection.remove(conditions, { w: callback ? 1 : 0 }, callback);
 };