mongodb 2.1.0-alpha → 2.1.2

package/lib/cursor.js

@@ -11,7 +11,9 @@ var inherits = require('util').inherits
   , ReadPreference = require('./read_preference')
   , MongoError = require('mongodb-core').MongoError
   , Readable = require('stream').Readable || require('readable-stream').Readable
+  , Define = require('./metadata')
   , CoreCursor = require('mongodb-core').Cursor
+  , Map = require('mongodb-core').BSON.Map
   , Query = require('mongodb-core').Query
   , CoreReadPreference = require('mongodb-core').ReadPreference;
 
@@ -71,7 +73,34 @@ var fields = ['numberOfRetries', 'tailableRetryInterval'];
  * @fires Cursor#readable
  * @return {Cursor} a Cursor instance.
  * @example
- * Some example
+ * Cursor cursor options.
+ *
+ * collection.find({}).project({a:1})                             // Create a projection of field a
+ * collection.find({}).skip(1).limit(10)                          // Skip 1 and limit 10
+ * collection.find({}).batchSize(5)                               // Set batchSize on cursor to 5
+ * collection.find({}).filter({a:1})                              // Set query on the cursor
+ * collection.find({}).comment('add a comment')                   // Add a comment to the query, allowing to correlate queries
+ * collection.find({}).addCursorFlag('tailable', true)            // Set cursor as tailable
+ * collection.find({}).addCursorFlag('oplogReplay', true)         // Set cursor as oplogReplay
+ * collection.find({}).addCursorFlag('noCursorTimeout', true)     // Set cursor as noCursorTimeout
+ * collection.find({}).addCursorFlag('awaitData', true)           // Set cursor as awaitData
+ * collection.find({}).addCursorFlag('exhaust', true)             // Set cursor as exhaust
+ * collection.find({}).addCursorFlag('partial', true)             // Set cursor as partial
+ * collection.find({}).addQueryModifier('$orderby', {a:1})        // Set $orderby {a:1}
+ * collection.find({}).max(10)                                    // Set the cursor maxScan
+ * collection.find({}).maxScan(10)                                // Set the cursor maxScan
+ * collection.find({}).maxTimeMS(1000)                            // Set the cursor maxTimeMS
+ * collection.find({}).min(100)                                   // Set the cursor min
+ * collection.find({}).returnKey(10)                              // Set the cursor returnKey
+ * collection.find({}).setReadPreference(ReadPreference.PRIMARY)  // Set the cursor readPreference
+ * collection.find({}).showRecordId(true)                         // Set the cursor showRecordId
+ * collection.find({}).snapshot(true)                             // Set the cursor snapshot
+ * collection.find({}).sort([['a', 1]])                           // Sets the sort order of the cursor query
+ * collection.find({}).hint('a_1')                                // Set the cursor hint
+ *
+ * All options are chainable, so one can do the following.
+ *
+ * collection.find({}).maxTimeMS(1000).maxScan(100).skip(1).toArray(..)
  */
 var Cursor = function(bson, ns, cmd, options, topology, topologyOptions) {
   CoreCursor.apply(this, Array.prototype.slice.call(arguments, 0));
@@ -119,7 +148,7 @@ var Cursor = function(bson, ns, cmd, options, topology, topologyOptions) {
     // Topology options
     , topologyOptions: topologyOptions
     // Promise library
-    , promiseLibrary: promiseLibrary 
+    , promiseLibrary: promiseLibrary
     // Current doc
     , currentDoc: null
   }
@@ -127,7 +156,6 @@ var Cursor = function(bson, ns, cmd, options, topology, topologyOptions) {
   // Legacy fields
   this.timeout = self.s.options.noCursorTimeout == true;
   this.sortValue = self.s.cmd.sort;
-  this.readPreference = self.s.options.readPreference;
 }
 
 /**
@@ -168,43 +196,54 @@ for(var name in CoreCursor.prototype) {
   Cursor.prototype[name] = CoreCursor.prototype[name];
 }
 
+var define = Cursor.define = new Define('Cursor', Cursor, true);
+
 /**
  * Check if there is any document still available in the cursor
  * @method
- * @param {Cursor~resultCallback} callback The result callback.
+ * @param {Cursor~resultCallback} [callback] The result callback.
  * @throws {MongoError}
- * @deprecated
  * @return {Promise} returns Promise if no callback passed
  */
 Cursor.prototype.hasNext = function(callback) {
   var self = this;
 
   // Execute using callback
-  if(typeof callback == 'function') return nextObject(self, function(err, doc) {
-    if(!doc) return callback(null, false);
-    self.s.currentDoc = doc;
-    callback(null, true);
-  });
+  if(typeof callback == 'function') {
+    if(self.s.currentDoc){
+      return callback(null, true);
+    } else {
+      return nextObject(self, function(err, doc) {
+        if(!doc) return callback(null, false);
+        self.s.currentDoc = doc;
+        callback(null, true);
+      });
+    }
+  }
 
   // Return a Promise
   return new this.s.promiseLibrary(function(resolve, reject) {
-    nextObject(self, function(err, doc) {
-      if(self.s.state == Cursor.CLOSED || self.isDead()) return resolve(false);
-      if(err) return reject(err);
-      if(!doc) return resolve(false);
-      self.s.currentDoc = doc;
-      resolve(true); 
-    });
+    if(self.s.currentDoc){
+      resolve(true);
+    } else {
+      nextObject(self, function(err, doc) {
+        if(self.s.state == Cursor.CLOSED || self.isDead()) return resolve(false);
+        if(err) return reject(err);
+        if(!doc) return resolve(false);
+        self.s.currentDoc = doc;
+        resolve(true);
+      });
+    }
   });
 }
 
+define.classMethod('hasNext', {callback: true, promise:true});
 
 /**
  * Get the next available document from the cursor, returns null if no more documents are available.
  * @method
- * @param {Cursor~resultCallback} callback The result callback.
+ * @param {Cursor~resultCallback} [callback] The result callback.
  * @throws {MongoError}
- * @deprecated
  * @return {Promise} returns Promise if no callback passed
  */
 Cursor.prototype.next = function(callback) {
@@ -234,11 +273,13 @@ Cursor.prototype.next = function(callback) {
 
     nextObject(self, function(err, r) {
       if(err) return reject(err);
-      resolve(r); 
+      resolve(r);
     });
   });
 }
 
+define.classMethod('next', {callback: true, promise:true});
+
 /**
  * Set the cursor query
  * @method
@@ -246,11 +287,111 @@ Cursor.prototype.next = function(callback) {
  * @return {Cursor}
  */
 Cursor.prototype.filter = function(filter) {
-  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw new MongoError("Cursor is closed");
+  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
   this.s.cmd.query = filter;
   return this;
 }
 
+define.classMethod('filter', {callback: false, promise:false, returns: [Cursor]});
+
+/**
+ * Set the cursor maxScan
+ * @method
+ * @param {object} maxScan Constrains the query to only scan the specified number of documents when fulfilling the query
+ * @return {Cursor}
+ */
+Cursor.prototype.maxScan = function(maxScan) {
+  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
+  this.s.cmd.maxScan = maxScan;
+  return this;
+}
+
+define.classMethod('maxScan', {callback: false, promise:false, returns: [Cursor]});
+
+/**
+ * Set the cursor hint
+ * @method
+ * @param {object} hint If specified, then the query system will only consider plans using the hinted index.
+ * @return {Cursor}
+ */
+Cursor.prototype.hint = function(hint) {
+  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
+  this.s.cmd.hint = hint;
+  return this;
+}
+
+define.classMethod('hint', {callback: false, promise:false, returns: [Cursor]});
+
+/**
+ * Set the cursor min
+ * @method
+ * @param {object} min Specify a $min value to specify the inclusive lower bound for a specific index in order to constrain the results of find(). The $min specifies the lower bound for all keys of a specific index in order.
+ * @return {Cursor}
+ */
+Cursor.prototype.min = function(min) {
+  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
+  this.s.cmd.min = min;
+  return this;
+}
+
+define.classMethod('min', {callback: false, promise:false, returns: [Cursor]});
+
+/**
+ * Set the cursor max
+ * @method
+ * @param {object} max Specify a $max value to specify the exclusive upper bound for a specific index in order to constrain the results of find(). The $max specifies the upper bound for all keys of a specific index in order.
+ * @return {Cursor}
+ */
+Cursor.prototype.max = function(max) {
+  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
+  this.s.cmd.max = max;
+  return this;
+}
+
+define.classMethod('max', {callback: false, promise:false, returns: [Cursor]});
+
+/**
+ * Set the cursor returnKey
+ * @method
+ * @param {object} returnKey Only return the index field or fields for the results of the query. If $returnKey is set to true and the query does not use an index to perform the read operation, the returned documents will not contain any fields. Use one of the following forms:
+ * @return {Cursor}
+ */
+Cursor.prototype.returnKey = function(value) {
+  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
+  this.s.cmd.returnKey = value;
+  return this;
+}
+
+define.classMethod('returnKey', {callback: false, promise:false, returns: [Cursor]});
+
+/**
+ * Set the cursor showRecordId
+ * @method
+ * @param {object} showRecordId The $showDiskLoc option has now been deprecated and replaced with the showRecordId field. $showDiskLoc will still be accepted for OP_QUERY stye find.
+ * @return {Cursor}
+ */
+Cursor.prototype.showRecordId = function(value) {
+  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
+  this.s.cmd.showDiskLoc = value;
+  return this;
+}
+
+define.classMethod('showRecordId', {callback: false, promise:false, returns: [Cursor]});
+
+/**
+ * Set the cursor snapshot
+ * @method
+ * @param {object} snapshot The $snapshot operator prevents the cursor from returning a document more than once because an intervening write operation results in a move of the document.
+ * @return {Cursor}
+ */
+Cursor.prototype.snapshot = function(value) {
+  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
+  this.s.cmd.snapshot = value;
+  return this;
+}
+
+define.classMethod('snapshot', {callback: false, promise:false, returns: [Cursor]});
+
 /**
  * Set a node.js specific cursor option
  * @method
@@ -260,14 +401,16 @@ Cursor.prototype.filter = function(filter) {
  * @return {Cursor}
  */
 Cursor.prototype.setCursorOption = function(field, value) {
-  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw new MongoError("Cursor is closed");
-  if(fields.indexOf(field) == -1) throw new MongoError(f("option %s not a supported option %s", field, fields));
+  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
+  if(fields.indexOf(field) == -1) throw MongoError.create({message: f("option %s not a supported option %s", field, fields), driver:true });
   this.s[field] = value;
-  if(field == 'numberOfRetries') 
+  if(field == 'numberOfRetries')
     this.s.currentNumberOfRetries = value;
   return this;
 }
 
+define.classMethod('setCursorOption', {callback: false, promise:false, returns: [Cursor]});
+
 /**
  * Add a cursor flag to the cursor
  * @method
@@ -277,13 +420,15 @@ Cursor.prototype.setCursorOption = function(field, value) {
  * @return {Cursor}
  */
 Cursor.prototype.addCursorFlag = function(flag, value) {
-  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw new MongoError("Cursor is closed");
-  if(flags.indexOf(flag) == -1) throw new MongoError(f("flag %s not a supported flag %s", flag, flags));
-  if(typeof value != 'boolean') throw new MongoError(f("flag %s must be a boolean value", flag));
+  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
+  if(flags.indexOf(flag) == -1) throw MongoError.create({message: f("flag %s not a supported flag %s", flag, flags), driver:true });
+  if(typeof value != 'boolean') throw MongoError.create({message: f("flag %s must be a boolean value", flag), driver:true});
   this.s.cmd[flag] = value;
   return this;
 }
 
+define.classMethod('addCursorFlag', {callback: false, promise:false, returns: [Cursor]});
+
 /**
  * Add a query modifier to the cursor query
  * @method
@@ -293,8 +438,8 @@ Cursor.prototype.addCursorFlag = function(flag, value) {
  * @return {Cursor}
  */
 Cursor.prototype.addQueryModifier = function(name, value) {
-  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw new MongoError("Cursor is closed");
-  if(name[0] != '$') throw new MongoError(f("%s is not a valid query modifier"));
+  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
+  if(name[0] != '$') throw MongoError.create({message: f("%s is not a valid query modifier"), driver:true});
   // Strip of the $
   var field = name.substr(1);
   // Set on the command
@@ -304,6 +449,8 @@ Cursor.prototype.addQueryModifier = function(name, value) {
   return this;
 }
 
+define.classMethod('addQueryModifier', {callback: false, promise:false, returns: [Cursor]});
+
 /**
  * Add a comment to the cursor query allowing for tracking the comment in the log.
  * @method
@@ -312,11 +459,29 @@ Cursor.prototype.addQueryModifier = function(name, value) {
  * @return {Cursor}
  */
 Cursor.prototype.comment = function(value) {
-  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw new MongoError("Cursor is closed");
+  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
   this.s.cmd.comment = value;
   return this;
 }
 
+define.classMethod('comment', {callback: false, promise:false, returns: [Cursor]});
+
+/**
+ * Set a maxAwaitTimeMS on a tailing cursor query to allow to customize the timeout value for the option awaitData (Only supported on MongoDB 3.2 or higher, ignored otherwise)
+ * @method
+ * @param {number} value Number of milliseconds to wait before aborting the tailed query.
+ * @throws {MongoError}
+ * @return {Cursor}
+ */
+Cursor.prototype.maxAwaitTimeMS = function(value) {
+  if(typeof value != 'number') throw MongoError.create({message: "maxAwaitTimeMS must be a number", driver:true});
+  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
+  this.s.cmd.maxAwaitTimeMS = value;
+  return this;
+}
+
+define.classMethod('maxAwaitTimeMS', {callback: false, promise:false, returns: [Cursor]});
+
 /**
  * Set a maxTimeMS on the cursor query, allowing for hard timeout limits on queries (Only supported on MongoDB 2.6 or higher)
  * @method
@@ -325,14 +490,18 @@ Cursor.prototype.comment = function(value) {
  * @return {Cursor}
  */
 Cursor.prototype.maxTimeMS = function(value) {
-  if(typeof value != 'number') throw new MongoError("maxTimeMS must be a number");
-  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw new MongoError("Cursor is closed");
+  if(typeof value != 'number') throw MongoError.create({message: "maxTimeMS must be a number", driver:true});
+  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
   this.s.cmd.maxTimeMS = value;
   return this;
 }
 
+define.classMethod('maxTimeMS', {callback: false, promise:false, returns: [Cursor]});
+
 Cursor.prototype.maxTimeMs = Cursor.prototype.maxTimeMS;
 
+define.classMethod('maxTimeMs', {callback: false, promise:false, returns: [Cursor]});
+
 /**
  * Sets a field projection for the query.
  * @method
@@ -341,11 +510,13 @@ Cursor.prototype.maxTimeMs = Cursor.prototype.maxTimeMS;
  * @return {Cursor}
  */
 Cursor.prototype.project = function(value) {
-  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw new MongoError("Cursor is closed");
+  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
   this.s.cmd.fields = value;
   return this;
 }
 
+define.classMethod('project', {callback: false, promise:false, returns: [Cursor]});
+
 /**
  * Sets the sort order of the cursor query.
  * @method
@@ -355,10 +526,29 @@ Cursor.prototype.project = function(value) {
  * @return {Cursor}
  */
 Cursor.prototype.sort = function(keyOrList, direction) {
-  if(this.s.options.tailable) throw new MongoError("Tailable cursor doesn't support sorting");
-  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw new MongoError("Cursor is closed");
+  if(this.s.options.tailable) throw MongoError.create({message: "Tailable cursor doesn't support sorting", driver:true});
+  if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
   var order = keyOrList;
 
+  // We have an array of arrays, we need to preserve the order of the sort
+  // so we will us a Map
+  if(Array.isArray(order) && Array.isArray(order[0])) {
+    order = new Map(order.map(function(x) {
+      var value = [x[0], null];
+      if(x[1] == 'asc') {
+        value[1] = 1;
+      } else if(x[1] == 'desc') {
+        value[1] = -1;
+      } else if(x[1] == 1 || x[1] == -1) {
+        value[1] = x[1];
+      } else {
+        throw new MongoError("Illegal sort clause, must be of the form [['field1', '(ascending|descending)'], ['field2', '(ascending|descending)']]");
+      }
+
+      return value;
+    }));
+  }
+
   if(direction != null) {
     order = [[keyOrList, direction]];
   }
@@ -368,6 +558,8 @@ Cursor.prototype.sort = function(keyOrList, direction) {
   return this;
 }
 
+define.classMethod('sort', {callback: false, promise:false, returns: [Cursor]});
+
 /**
  * Set the batch size for the cursor.
  * @method
@@ -376,14 +568,16 @@ Cursor.prototype.sort = function(keyOrList, direction) {
  * @return {Cursor}
  */
 Cursor.prototype.batchSize = function(value) {
-  if(this.s.options.tailable) throw new MongoError("Tailable cursor doesn't support limit");
-  if(this.s.state == Cursor.CLOSED || this.isDead()) throw new MongoError("Cursor is closed");
-  if(typeof value != 'number') throw new MongoError("batchSize requires an integer");
+  if(this.s.options.tailable) throw MongoError.create({message: "Tailable cursor doesn't support batchSize", driver:true});
+  if(this.s.state == Cursor.CLOSED || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
+  if(typeof value != 'number') throw MongoError.create({message: "batchSize requires an integer", driver:true});
   this.s.cmd.batchSize = value;
   this.setCursorBatchSize(value);
   return this;
 }
 
+define.classMethod('batchSize', {callback: false, promise:false, returns: [Cursor]});
+
 /**
  * Set the limit for the cursor.
  * @method
@@ -392,15 +586,17 @@ Cursor.prototype.batchSize = function(value) {
  * @return {Cursor}
  */
 Cursor.prototype.limit = function(value) {
-  if(this.s.options.tailable) throw new MongoError("Tailable cursor doesn't support limit");
-  if(this.s.state == Cursor.OPEN || this.s.state == Cursor.CLOSED || this.isDead()) throw new MongoError("Cursor is closed");
-  if(typeof value != 'number') throw new MongoError("limit requires an integer");
+  if(this.s.options.tailable) throw MongoError.create({message: "Tailable cursor doesn't support limit", driver:true});
+  if(this.s.state == Cursor.OPEN || this.s.state == Cursor.CLOSED || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
+  if(typeof value != 'number') throw MongoError.create({message: "limit requires an integer", driver:true});
   this.s.cmd.limit = value;
   // this.cursorLimit = value;
   this.setCursorLimit(value);
   return this;
 }
 
+define.classMethod('limit', {callback: false, promise:false, returns: [Cursor]});
+
 /**
  * Set the skip for the cursor.
  * @method
@@ -409,14 +605,16 @@ Cursor.prototype.limit = function(value) {
  * @return {Cursor}
  */
 Cursor.prototype.skip = function(value) {
-  if(this.s.options.tailable) throw new MongoError("Tailable cursor doesn't support skip");
-  if(this.s.state == Cursor.OPEN || this.s.state == Cursor.CLOSED || this.isDead()) throw new MongoError("Cursor is closed");
-  if(typeof value != 'number') throw new MongoError("skip requires an integer");
+  if(this.s.options.tailable) throw MongoError.create({message: "Tailable cursor doesn't support skip", driver:true});
+  if(this.s.state == Cursor.OPEN || this.s.state == Cursor.CLOSED || this.isDead()) throw MongoError.create({message: "Cursor is closed", driver:true});
+  if(typeof value != 'number') throw MongoError.create({message: "skip requires an integer", driver:true});
   this.s.cmd.skip = value;
   this.setCursorSkip(value);
   return this;
 }
 
+define.classMethod('skip', {callback: false, promise:false, returns: [Cursor]});
+
 /**
  * The callback format for results
  * @callback Cursor~resultCallback
@@ -424,48 +622,6 @@ Cursor.prototype.skip = function(value) {
  * @param {(object|null|boolean)} result The result object if the command was executed successfully.
  */
 
-/**
- * Set the new batchSize of the cursor
- * @function Cursor.prototype.setBatchSize
- * @param {number} value The new batchSize for the cursor
- * @return {null}
- */
-
-/**
- * Get the batchSize of the cursor
- * @function Cursor.prototype.batchSize
- * @param {number} value The current batchSize for the cursor
- * @return {null}
- */
-
-/**
- * Set the new skip value of the cursor
- * @function Cursor.prototype.setCursorSkip
- * @param {number} value The new skip for the cursor
- * @return {null}
- */
-
-/**
- * Get the skip value of the cursor
- * @function Cursor.prototype.cursorSkip
- * @param {number} value The current skip value for the cursor
- * @return {null}
- */
-
-/**
- * Set the new limit value of the cursor
- * @function Cursor.prototype.setCursorLimit
- * @param {number} value The new limit for the cursor
- * @return {null}
- */
-
-/**
- * Get the limit value of the cursor
- * @function Cursor.prototype.cursorLimit
- * @param {number} value The current limit value for the cursor
- * @return {null}
- */
-
 /**
  * Clone the cursor
  * @function external:CoreCursor#clone
@@ -481,7 +637,7 @@ Cursor.prototype.skip = function(value) {
 /**
  * Get the next available document from the cursor, returns null if no more documents are available.
  * @method
- * @param {Cursor~resultCallback} callback The result callback.
+ * @param {Cursor~resultCallback} [callback] The result callback.
  * @throws {MongoError}
  * @deprecated
  * @return {Promise} returns Promise if no callback passed
@@ -489,7 +645,7 @@ Cursor.prototype.skip = function(value) {
 Cursor.prototype.nextObject = Cursor.prototype.next;
 
 var nextObject = function(self, callback) {
-  if(self.s.state == Cursor.CLOSED || self.isDead()) return handleCallback(callback, new MongoError("Cursor is closed"));
+  if(self.s.state == Cursor.CLOSED || self.isDead && self.isDead()) return handleCallback(callback, MongoError.create({message: "Cursor is closed", driver:true}));
   if(self.s.state == Cursor.INIT && self.s.cmd.sort) {
     try {
       self.s.cmd.sort = formattedOrderClause(self.s.cmd.sort);
@@ -497,12 +653,17 @@ var nextObject = function(self, callback) {
       return handleCallback(callback, err);
     }
   }
+
   // Get the next object
   self._next(function(err, doc) {
     if(err && err.tailable && self.s.currentNumberOfRetries == 0) return callback(err);
     if(err && err.tailable && self.s.currentNumberOfRetries > 0) {
       self.s.currentNumberOfRetries = self.s.currentNumberOfRetries - 1;
+
       return setTimeout(function() {
+        // Rewind the cursor only when it has not actually read any documents yet
+        if(self.cursorState.currentLimit == 0) self.rewind();
+        // Read the next document, forcing a re-issue of query if no cursorId exists
         self.nextObject(callback);
       }, self.s.tailableRetryInterval);
     }
@@ -510,9 +671,11 @@ var nextObject = function(self, callback) {
     self.s.state = Cursor.OPEN;
     if(err) return handleCallback(callback, err);
     handleCallback(callback, null, doc);
-  });  
+  });
 }
 
+define.classMethod('nextObject', {callback: true, promise:true});
+
 // Trampoline emptying the number of retrieved items
 // without incurring a nextTick operation
 var loop = function(self, callback) {
@@ -524,16 +687,10 @@ var loop = function(self, callback) {
   return loop;
 }
 
-/**
- * Get the next available document from the cursor, returns null if no more documents are available.
- * @method
- * @param {Cursor~resultCallback} callback The result callback.
- * @throws {MongoError}
- * @deprecated
- * @return {Promise} returns Promise if no callback passed
- */
 Cursor.prototype.next = Cursor.prototype.nextObject;
 
+define.classMethod('next', {callback: true, promise:true});
+
 /**
  * Iterates over all the documents for this cursor. As with **{cursor.toArray}**,
  * not all of the elements will be iterated if this cursor had been previouly accessed.
@@ -556,12 +713,14 @@ Cursor.prototype.each = function(callback) {
   _each(this, callback);
 };
 
+define.classMethod('each', {callback: true, promise:false});
+
 // Run the each loop
 var _each = function(self, callback) {
-  if(!callback) throw new MongoError('callback is mandatory');
+  if(!callback) throw MongoError.create({message: 'callback is mandatory', driver:true});
   if(self.isNotified()) return;
   if(self.s.state == Cursor.CLOSED || self.isDead()) {
-    return handleCallback(callback, new MongoError("Cursor is closed"), null);
+    return handleCallback(callback, MongoError.create({message: "Cursor is closed", driver:true}));
   }
 
   if(self.s.state == Cursor.INIT) self.s.state = Cursor.OPEN;
@@ -573,7 +732,7 @@ var _each = function(self, callback) {
     while(fn = loop(self, callback)) fn(self, callback);
     _each(self, callback);
   } else {
-    self._next(function(err, item) {
+    self.next(function(err, item) {
       if(err) return handleCallback(callback, err);
       if(item == null) {
         self.s.state = Cursor.CLOSED;
@@ -619,6 +778,8 @@ Cursor.prototype.forEach = function(iterator, callback) {
   });
 }
 
+define.classMethod('forEach', {callback: true, promise:false});
+
 /**
  * Set the ReadPreference for the cursor.
  * @method
@@ -627,7 +788,7 @@ Cursor.prototype.forEach = function(iterator, callback) {
  * @return {Cursor}
  */
 Cursor.prototype.setReadPreference = function(r) {
-  if(this.s.state != Cursor.INIT) throw new MongoError('cannot change cursor readPreference after cursor has been accessed');
+  if(this.s.state != Cursor.INIT) throw MongoError.create({message: 'cannot change cursor readPreference after cursor has been accessed', driver:true});
   if(r instanceof ReadPreference) {
     this.s.options.readPreference = new CoreReadPreference(r.mode, r.tags);
   } else {
@@ -637,6 +798,8 @@ Cursor.prototype.setReadPreference = function(r) {
   return this;
 }
 
+define.classMethod('setReadPreference', {callback: false, promise:false, returns: [Cursor]});
+
 /**
  * The callback format for results
  * @callback Cursor~toArrayResultCallback
@@ -650,13 +813,13 @@ Cursor.prototype.setReadPreference = function(r) {
  * results when this cursor had been previouly accessed. In that case,
  * cursor.rewind() can be used to reset the cursor.
  * @method
- * @param {Cursor~toArrayResultCallback} callback The result callback.
+ * @param {Cursor~toArrayResultCallback} [callback] The result callback.
  * @throws {MongoError}
  * @return {Promise} returns Promise if no callback passed
  */
 Cursor.prototype.toArray = function(callback) {
   var self = this;
-  if(self.s.options.tailable) throw new MongoError('Tailable cursor cannot be converted to array');
+  if(self.s.options.tailable) throw MongoError.create({message: 'Tailable cursor cannot be converted to array', driver:true});
 
   // Execute using callback
   if(typeof callback == 'function') return toArray(self, callback);
@@ -665,7 +828,7 @@ Cursor.prototype.toArray = function(callback) {
   return new this.s.promiseLibrary(function(resolve, reject) {
     toArray(self, function(err, r) {
       if(err) return reject(err);
-      resolve(r); 
+      resolve(r);
     });
   });
 }
@@ -677,7 +840,6 @@ var toArray = function(self, callback) {
   self.rewind();
   self.s.state = Cursor.INIT;
 
-
   // Fetch all the documents
   var fetchDocs = function() {
     self._next(function(err, doc) {
@@ -689,6 +851,7 @@ var toArray = function(self, callback) {
 
       // Add doc to items
       items.push(doc)
+
       // Get all buffered objects
       if(self.bufferedCount() > 0) {
         var docs = self.readBufferedDocuments(self.bufferedCount())
@@ -706,9 +869,11 @@ var toArray = function(self, callback) {
     })
   }
 
-  fetchDocs();  
+  fetchDocs();
 }
 
+define.classMethod('toArray', {callback: true, promise:true});
+
 /**
  * The callback format for results
  * @callback Cursor~countResultCallback
@@ -726,12 +891,12 @@ var toArray = function(self, callback) {
  * @param {number} [options.maxTimeMS=null] Number of miliseconds to wait before aborting the query.
  * @param {string} [options.hint=null] An index name hint for the query.
  * @param {(ReadPreference|string)} [options.readPreference=null] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
- * @param {Cursor~countResultCallback} callback The result callback.
+ * @param {Cursor~countResultCallback} [callback] The result callback.
  * @return {Promise} returns Promise if no callback passed
  */
 Cursor.prototype.count = function(applySkipLimit, opts, callback) {
   var self = this;
-  if(self.s.cmd.query == null) throw new MongoError("count can only be used with find command");
+  if(self.s.cmd.query == null) throw MongoError.create({message: "count can only be used with find command", driver:true});
   if(typeof opts == 'function') callback = opts, opts = {};
   opts = opts || {};
 
@@ -742,7 +907,7 @@ Cursor.prototype.count = function(applySkipLimit, opts, callback) {
   return new this.s.promiseLibrary(function(resolve, reject) {
     count(self, applySkipLimit, opts, function(err, r) {
       if(err) return reject(err);
-      resolve(r); 
+      resolve(r);
     });
   });
 };
@@ -767,8 +932,8 @@ var count = function(self, applySkipLimit, opts, callback) {
 
   if(typeof opts.maxTimeMS == 'number') {
     command.maxTimeMS = opts.maxTimeMS;
-  } else if(typeof self.s.maxTimeMS == 'number') {
-    command.maxTimeMS = self.s.maxTimeMS;
+  } else if(self.s.cmd && typeof self.s.cmd.maxTimeMS == 'number') {
+    command.maxTimeMS = self.s.cmd.maxTimeMS;
   }
 
   // Get a server
@@ -795,14 +960,18 @@ var count = function(self, applySkipLimit, opts, callback) {
     if(result.documents.length == 1
       && (result.documents[0].errmsg
       || result.documents[0].err
-      || result.documents[0]['$err'])) return callback(MongoError.create(result.documents[0]));
+      || result.documents[0]['$err'])) {
+      return handleCallback(callback, MongoError.create(result.documents[0]));
+    }
     handleCallback(callback, null, result.documents[0].n);
   });
 
   // Write the initial command out
-  connection.write(query.toBin());  
+  connection.write(query.toBin());
 }
 
+define.classMethod('count', {callback: true, promise:true});
+
 /**
  * Close the cursor, sending a KillCursor command and emitting close.
  * @method
@@ -823,6 +992,8 @@ Cursor.prototype.close = function(callback) {
   });
 }
 
+define.classMethod('close', {callback: true, promise:true});
+
 /**
  * Map all documents using the provided function
  * @method
@@ -834,6 +1005,8 @@ Cursor.prototype.map = function(transform) {
   return this;
 }
 
+define.classMethod('map', {callback: false, promise:false, returns: [Cursor]});
+
 /**
  * Is the cursor closed
  * @method
@@ -843,12 +1016,16 @@ Cursor.prototype.isClosed = function() {
   return this.isDead();
 }
 
+define.classMethod('isClosed', {callback: false, promise:false, returns: [Boolean]});
+
 Cursor.prototype.destroy = function(err) {
   this.pause();
   this.close();
   if(err) this.emit('error', err);
 }
 
+define.classMethod('destroy', {callback: false, promise:false});
+
 /**
  * Return a modified Readable stream including a possible transform method.
  * @method
@@ -861,6 +1038,8 @@ Cursor.prototype.stream = function(options) {
   return this;
 }
 
+define.classMethod('stream', {callback: false, promise:false, returns: [Cursor]});
+
 /**
  * Execute the explain for the cursor
  * @method
@@ -871,6 +1050,11 @@ Cursor.prototype.explain = function(callback) {
   var self = this;
   this.s.cmd.explain = true;
 
+  // Do we have a readConcern
+  if(this.s.cmd.readConcern) {
+    delete this.s.cmd['readConcern'];
+  }
+
   // Execute using callback
   if(typeof callback == 'function') return this._next(callback);
 
@@ -878,11 +1062,13 @@ Cursor.prototype.explain = function(callback) {
   return new this.s.promiseLibrary(function(resolve, reject) {
     self._next(function(err, r) {
       if(err) return reject(err);
-      resolve(r); 
+      resolve(r);
     });
   });
 }
 
+define.classMethod('explain', {callback: true, promise:true});
+
 Cursor.prototype._read = function(n) {
   var self = this;
   if(self.s.state == Cursor.CLOSED || self.isDead()) {
@@ -898,7 +1084,8 @@ Cursor.prototype._read = function(n) {
       }
 
       // Emit end event
-      return self.emit('end');
+      self.emit('end');
+      return self.emit('finish');
     }
 
     // If we provided a transformation method
@@ -916,6 +1103,17 @@ Cursor.prototype._read = function(n) {
   });
 }
 
+Object.defineProperty(Cursor.prototype, 'readPreference', {
+  enumerable:true,
+  get: function() {
+    if (!this || !this.s) {
+      return null;
+    }
+
+    return this.s.options.readPreference;
+  }
+});
+
 Object.defineProperty(Cursor.prototype, 'namespace', {
   enumerable: true,
   get: function() {