collection: make findAndModify accept _id as the target

lib/collection.js

@@ -6,7 +6,7 @@
 var util = require('./util')
   , debug = require('debug')('monk:queries')
   , EventEmitter = require('events').EventEmitter
-  , Promise = require('./promise')
+  , Promise = require('./promise');
 
 /**
  * Module exports
@@ -89,7 +89,7 @@ Collection.prototype.ensureIndex = function (fields, opts, fn) {
 
   var fields = util.fields(fields)
     , opts = opts || {}
-    , promise = new Promise(this, 'index')
+    , promise = new Promise(this, 'index');
 
   if (fn) {
     promise.complete(fn);
@@ -246,6 +246,10 @@ Collection.prototype.findAndModify = function (query, update, opts, fn) {
     fn = opts;
   }
 
+  if ('string' == typeof query.query || 'function' == typeof query.query.toHexString) {
+    query.query = { _id: query.query };
+  }
+
   if ('function' == typeof opts) {
     fn = opts;
     opts = {};
@@ -345,7 +349,7 @@ Collection.prototype.find = function (query, opts, fn) {
     opts = {};
   }
 
-  var promise = new Promise(this, 'find')
+  var promise = new Promise(this, 'find');
 
   if (fn) {
     promise.complete(fn);
@@ -400,7 +404,7 @@ Collection.prototype.find = function (query, opts, fn) {
  */
 
 Collection.prototype.count = function (query, fn) {
-  var promise = new Promise(this, 'find')
+  var promise = new Promise(this, 'find');
 
   if (fn) {
     promise.complete(fn);