Normalize callback arguments. Same as shell.

index.js

@@ -25,11 +25,23 @@ var ensureCallback = function(args) {
 	return args;
 };
 
+var ensureTruncatedCallback =  function(args) {
+	args = ensureCallback(args);
+	args[args.length - 1] = truncateCallback(args[args.length - 1]);
+	return args;
+};
+
 var getCallback = function(args) {
 	var callback = args[args.length-1];
 	return typeof callback === 'function' ? callback : noop;
 };
 
+var truncateCallback = function(callback) {
+	return function(err) {
+		callback(err);
+	};
+};
+
 // Proxy for the native cursor prototype that normalizes method names and
 // arguments to fit the mongo shell.
 
@@ -152,7 +164,10 @@ Collection.prototype.findAndModify = function(options, callback) {
 		remove:!!options.remove,
 		upsert:!!options.upsert,
 		fields:options.fields
-	}, callback || noop]);
+	}, function(err, doc) {
+		// Ensure arity
+		(callback || noop)(err, doc);
+	}]);
 };
 
 Collection.prototype.group = function(group, callback) {
@@ -166,13 +181,25 @@ Collection.prototype.remove = function() {
 	if (arguments.length > 1 && arguments[1] === true) { // the justOne parameter
 		this.findOne(arguments[0], function(err, doc) {
 			if (err) return callback(err);
-			if (!doc) return callback(null, 0);
-			self._apply(DRIVER_COLLECTION_PROTO.remove, [doc, callback]);
+			if (!doc) return callback();
+			self._apply(DRIVER_COLLECTION_PROTO.remove, [doc, truncateCallback(callback)]);
 		});
 		return;
 	}
 
-	this._apply(DRIVER_COLLECTION_PROTO.remove, arguments.length === 0 ? [{}, noop] : ensureCallback(arguments));
+	this._apply(DRIVER_COLLECTION_PROTO.remove, arguments.length === 0 ? [{}, noop] : ensureTruncatedCallback(arguments));
+};
+
+Collection.prototype.insert = function() {
+	this._apply(DRIVER_COLLECTION_PROTO.insert, ensureTruncatedCallback(arguments));
+};
+
+Collection.prototype.save = function() {
+	this._apply(DRIVER_COLLECTION_PROTO.save, ensureTruncatedCallback(arguments));
+};
+
+Collection.prototype.update = function() {
+	this._apply(DRIVER_COLLECTION_PROTO.update, ensureTruncatedCallback(arguments));
 };
 
 Collection.prototype.getIndexes = function() {

tests/test-find-and-modify.js

@@ -0,0 +1,46 @@
+var assert = require('assert');
+var insert = require('./insert');
+
+insert([{
+	id: 1,
+	hello: 'you'
+}, {
+	id: 2,
+	hello: 'other'
+}], function(db, done) {
+	// Update and find the old document
+	db.a.findAndModify({
+		query: { id: 1 },
+		update: { $set: { hello: 'world' } },
+	},
+	function(err, doc) {
+		assert.ok(!err);
+		assert.equal(arguments.length, 2);
+		assert.equal(doc.id, 1);
+		assert.equal(doc.hello, 'you');
+
+		// Update and find the new document
+		db.a.findAndModify({
+			query: { id: 2 },
+			'new': true,
+			update: { $set: { hello: 'me' } }
+		}, function(err, doc) {
+			assert.ok(!err);
+			assert.equal(arguments.length, 2);
+			assert.equal(doc.id, 2);
+			assert.equal(doc.hello, 'me');
+
+			// Remove and find document
+			db.a.findAndModify({
+				query: { id: 1 },
+				remove: true
+			}, function(err, doc) {
+				assert.ok(!err);
+				assert.equal(arguments.length, 2);
+				assert.equal(doc.id, 1);
+
+				done();
+			});
+		});
+	});
+});

tests/test-get-collection-names.js

@@ -1,4 +1,3 @@
-
 var assert = require('assert');
 var insert = require('./insert');
 

tests/test-remove.js

@@ -3,20 +3,24 @@ var insert = require('./insert');
 
 // Delete just one
 insert([{
-	name:'Squirtle', type:'water' 
+	name:'Squirtle', type:'water'
 }, {
-	name:'Starmie' , type:'water' 
+	name:'Starmie' , type:'water'
 }, {
-	name:'Lapras'  , type:'water' 
+	name:'Lapras'  , type:'water'
 }], function(db, done) {
 	// Remove just one
 	db.a.remove({type:'water'}, true, function(err) {
+		assert.ok(arguments.length <= 1);
+
 		db.a.find({type:'water'}, function(err, docs) {
 			assert.equal(docs.length, 2);
 			assert.equal(docs[0].name, 'Starmie')
 
 			// Normal remove
 			db.a.remove({type:'water'}, function(err) {
+				assert.ok(arguments.length <= 1);
+
 				db.a.find({type:'water'}, function(err, docs) {
 					assert.equal(docs.length, 0);
 					done();

tests/test-update-and-callback.js

@@ -8,6 +8,7 @@ insert([{
 	db.a.update({hello:'world'}, {$set:{hello:'verden'}}, function(err) {
 		assert.ok(!sync);
 		assert.ok(!err);
+		assert.ok(arguments.length <= 1);
 		done();
 	});
 	sync = false;

tests/test-update-multi.js

@@ -8,6 +8,8 @@ insert([{
 }], function(db, done) {
 	db.a.update({}, {$set:{updated:true}}, {multi:true}, function(err) {
 		assert.ok(!err);
+		assert.ok(arguments.length <= 1);
+
 		db.a.find(function(err, docs) {
 			assert.ok(!err);
 			assert.equal(docs.length, 2);

tests/test-update.js

@@ -6,6 +6,8 @@ insert([{
 }], function(db, done) {
 	db.a.update({hello:'world'}, {$set:{hello:'verden'}}, function(err) {
 		assert.ok(!err);
+		assert.ok(arguments.length <= 1);
+
 		db.a.findOne(function(err, doc) {
 			assert.ok(!err);
 			assert.equal(doc.hello, 'verden');