merged 2.0 branch

Author: christkv

lib/aggregation_cursor.js

@@ -139,9 +139,6 @@ var AggregationCursor = function(bson, ns, cmd, options, topology, topologyOptio
 // Inherit from Readable
 inherits(AggregationCursor, Readable);  
 
-// // Map core cursor _next method so we can apply mapping
-// CoreCursor.prototype._next = CoreCursor.prototype.next;
-
 // Extend the Cursor
 for(var name in CoreCursor.prototype) {
   AggregationCursor.prototype[name] = CoreCursor.prototype[name];

lib/command_cursor.js

@@ -143,9 +143,6 @@ inherits(CommandCursor, Readable);
 var methodsToInherit = ['_next', 'next', 'each', 'forEach', 'toArray'
   , 'rewind', 'bufferedCount', 'readBufferedDocuments', 'close', 'isClosed'];
 
-// // Map core cursor _next method so we can apply mapping
-// CoreCursor.prototype._next = CoreCursor.prototype.next;
-
 // Only inherit the types we need
 for(var i = 0; i < methodsToInherit.length; i++) {
   CommandCursor.prototype[methodsToInherit[i]] = CoreCursor.prototype[methodsToInherit[i]];

lib/cursor.js

@@ -524,6 +524,16 @@ 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;
+
 /**
  * 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.

test/functional/cursor_tests.js

@@ -19,7 +19,9 @@ exports.cursorShouldBeAbleToResetOnToArrayRunningQueryAgain = {
 
         collection.insert({'a':1}, configuration.writeConcernMax(), function(err, ids) {
           var cursor = collection.find({});
+          console.log("--------------------------------- TOARRAY 0")
           cursor.toArray(function(err, items) {
+          console.log("--------------------------------- TOARRAY 1")
             // Should fail if called again (cursor should be closed)
             cursor.toArray(function(err, items) {
               test.equal(null, err);