Bump node driver to 3.0.0

Author: durran

lib/fetch.js

@@ -26,9 +26,9 @@ function attach(anything, done) {
  * @param  {object}   results    results from async.auto
  */
 function getIndexes(done, results) {
-  var db = results.db;
+  var client = results.client;
   var ns = mongodbNS(results.namespace);
-  db.db(ns.database, { returnNonCachedInstance: true }).collection(ns.collection).indexes(function(err, indexes) {
+  client.db(ns.database, { returnNonCachedInstance: true }).collection(ns.collection).indexes(function(err, indexes) {
     if (err) {
       done(err);
     }
@@ -46,13 +46,13 @@ function getIndexes(done, results) {
  * @param  {object}   results    results from async.auto
  */
 function getIndexStats(done, results) {
-  var db = results.db;
+  var client = results.client;
   var ns = mongodbNS(results.namespace);
   var pipeline = [
     { $indexStats: { } },
     { $project: { name: 1, usageHost: '$host', usageCount: '$accesses.ops', usageSince: '$accesses.since' } }
   ];
-  var collection = db.db(ns.database, { returnNonCachedInstance: true }).collection(ns.collection);
+  var collection = client.db(ns.database, { returnNonCachedInstance: true }).collection(ns.collection);
   collection.aggregate(pipeline, { cursor: {}}).toArray(function(err, res) {
     if (err) {
       if (isNotAuthorizedError(err)) {
@@ -84,9 +84,9 @@ function getIndexStats(done, results) {
  */
 
 function getIndexSizes(done, results) {
-  var db = results.db;
+  var client = results.client;
   var ns = mongodbNS(results.namespace);
-  db.db(ns.database, { returnNonCachedInstance: true }).collection(ns.collection).stats(function(err, res) {
+  client.db(ns.database, { returnNonCachedInstance: true }).collection(ns.collection).stats(function(err, res) {
     if (err) {
       if (isNotAuthorizedError(err)) {
         debug('Not authorized to get collection stats.  Returning default for indexSizes {}.');
@@ -124,13 +124,13 @@ function combineStatsAndIndexes(done, results) {
  * @param  {String} namespace    namespace for which to get indexes
  * @param  {Function} done       callback
  */
-function getIndexDetails(db, namespace, done) {
+function getIndexDetails(client, namespace, done) {
   var tasks = {
-    db: attach.bind(null, db),
+    client: attach.bind(null, client),
     namespace: attach.bind(null, namespace),
-    getIndexes: ['db', 'namespace', getIndexes],
-    getIndexStats: ['db', 'namespace', getIndexStats],
-    getIndexSizes: ['db', 'namespace', getIndexSizes],
+    getIndexes: ['client', 'namespace', getIndexes],
+    getIndexStats: ['client', 'namespace', getIndexStats],
+    getIndexSizes: ['client', 'namespace', getIndexSizes],
     indexes: ['getIndexes', 'getIndexStats', 'getIndexSizes', combineStatsAndIndexes]
   };
 

package.json

@@ -29,7 +29,7 @@
     "ampersand-rest-collection": "^5.0.0",
     "async": "^1.5.2",
     "lodash": "^4.8.2",
-    "mongodb": "^2.2.11",
+    "mongodb": "^3.0.1",
     "mongodb-js-errors": "^0.2.1",
     "mongodb-ns": "^2.0.0",
     "triejs": "github:rueckstiess/triejs"
@@ -40,7 +40,7 @@
     "mocha": "^3.1.2",
     "mongodb-js-fmt": "^0.0.3",
     "mongodb-js-precommit": "^0.2.9",
-    "mongodb-runner": "^3.3.2",
+    "mongodb-runner": "^3.6.1",
     "pre-commit": "^1.1.2"
   }
 }

test/fetch.test.js

@@ -14,15 +14,15 @@ describe('fetch()', function() {
     this.slow(2000);
     this.timeout(10000);
 
-    var db;
+    var client;
     var collection;
 
     // connect and create collection with index
     before(function(done) {
-      MongoClient.connect('mongodb://localhost:27017/test', function(err, _db) {
+      MongoClient.connect('mongodb://localhost:27017/test', function(err, _client) {
         assert.ifError(err);
-        db = _db;
-        collection = db.collection('_test_index_fetch');
+        client = _client;
+        collection = _client.db('test').collection('_test_index_fetch');
         collection.ensureIndex({loc: '2d'}, {w: 1}, function(err2) {
           assert.ifError(err2);
           done();
@@ -36,7 +36,7 @@ describe('fetch()', function() {
     });
 
     it('should connect to `localhost:27017` and get indexes', function(done) {
-      fetch(db, 'test._test_index_fetch', function(err, res) {
+      fetch(client, 'test._test_index_fetch', function(err, res) {
         assert.ifError(err);
         assert.equal(res[0].name, '_id_');
         assert.ok(_.isNumber(res[0].size));
@@ -47,7 +47,7 @@ describe('fetch()', function() {
     });
 
     it('should populate an index collection', function(done) {
-      fetch(db, 'test._test_index_fetch', function(err2, res) {
+      fetch(client, 'test._test_index_fetch', function(err2, res) {
         assert.ifError(err2);
         var indexes = new IndexCollection(res, {parse: true});
         assert.equal(indexes.length, 2);
@@ -56,7 +56,7 @@ describe('fetch()', function() {
     });
 
     it('should work with fetchIndexes() method', function(done) {
-      var coll = new IndexCollection().fetchIndexes(db, 'test._test_index_fetch');
+      var coll = new IndexCollection().fetchIndexes(client, 'test._test_index_fetch');
       coll.on('sync', function() {
         assert.equal(coll.length, 2);
         done();