Fix return values for Model.insert

lib/Model.js

@@ -147,38 +147,55 @@ Model.prototype.insert = Model.prototype.create = function (object, callback) {
 
 	var $ = this;
 
-	if(!Array.isArray(object)) object = [object];
+	var returnArray = true;
+
+	if(!Array.isArray(object)) {
+		object = [object];
+		returnArray = false;
+	}
 
 	var created = [];
 
+
+
+	var end = function(err, results) {
+		if(!results) return callback(err);
+
+		if(!Array.isArray(results)) results = [results];
+
+		if(returnArray) return callback(err, results);
+		return callback(err, results[0]);
+	};
+
 	var next = function(err, instance) {
-		if(err) return callback(err, created);
+		if(err) return end(err, created);
 		if(instance) created.push(instance);
 		if(object.length === 0) {
 			$.setupIndexes();
-			return callback(null, created);
+			return end(null, created);
 		}
 
 		var toInsert = object.shift();
 		doHook(toInsert);
 	};
 
-	var doInsert = function(err, object) {
+	var doInsert = function(err) {
 		if(err) return next(err);
 
-		var validation = validate($.options.schema, object);
+		var validation = validate($.options.schema, this);
 
 		if (!validation.passed) return next(validation.toError());
 
-		var instance = $.wrap.call($, object, true);	
+		var instance = $.wrap.call($, this, true);	
 		instance.save(next);
 	};
 
 	var doHook = function(object) {
 		if ($.options.hooks.beforeCreate) {
-		if ($.options.hooks.beforeCreate.length === 0) $.options.hooks.beforeCreate.call(object);
-			else return $.options.hooks.beforeCreate.call(object, doInsert);
-		}
+			if ($.options.hooks.beforeCreate.length === 0) $.options.hooks.beforeCreate.call(object);
+			else return $.options.hooks.beforeCreate.call(object, doInsert.bind(object));
+		} 
+		doInsert.call(object);
 	};
 
 	next();