Updated mongoose

node_modules/mongoose/lib/drivers/node-mongodb-native/ReadPreference.js

@@ -0,0 +1,45 @@
+/*!
+ * Module dependencies.
+ */
+
+var mongodb = require('mongodb');
+var ReadPref = mongodb.ReadPreference;
+
+/*!
+ * Converts arguments to ReadPrefs the driver
+ * can understand.
+ *
+ * @param {String|Array} pref
+ * @param {Array} [tags]
+ */
+
+module.exports = function readPref(pref, tags) {
+  if (Array.isArray(pref)) {
+    tags = pref[1];
+    pref = pref[0];
+  }
+
+  if (pref instanceof ReadPref) {
+    return pref;
+  }
+
+  switch (pref) {
+    case 'p':
+      pref = 'primary';
+      break;
+    case 'pp':
+      pref = 'primaryPreferred';
+      break;
+    case 's':
+      pref = 'secondary';
+      break;
+    case 'sp':
+      pref = 'secondaryPreferred';
+      break;
+    case 'n':
+      pref = 'nearest';
+      break;
+  }
+
+  return new ReadPref(pref, tags);
+};

node_modules/mongoose/lib/drivers/node-mongodb-native/binary.js

@@ -3,6 +3,6 @@
  * Module dependencies.
  */
 
-var Binary = require('mongodb').BSONPure.Binary;
+var Binary = require('mongodb').Binary;
 
 module.exports = exports = Binary;

node_modules/mongoose/lib/drivers/node-mongodb-native/collection.js

@@ -3,10 +3,9 @@
  * Module dependencies.
  */
 
-var MongooseCollection = require('../../collection')
-  , Collection = require('mongodb').Collection
-  , STATES = require('../../connectionstate')
-  , utils = require('../../utils')
+var MongooseCollection = require('../../collection'),
+    Collection = require('mongodb').Collection,
+    utils = require('../../utils');
 
 /**
  * A [node-mongodb-native](https://github.com/mongodb/node-mongodb-native) collection implementation.
@@ -17,7 +16,7 @@ var MongooseCollection = require('../../collection')
  * @api private
  */
 
-function NativeCollection () {
+function NativeCollection() {
   this.collection = null;
   MongooseCollection.apply(this, arguments);
 }
@@ -34,7 +33,7 @@ NativeCollection.prototype.__proto__ = MongooseCollection.prototype;
  * @api private
  */
 
-NativeCollection.prototype.onOpen = function () {
+NativeCollection.prototype.onOpen = function() {
   var self = this;
 
   // always get a new collection in case the user changed host:port
@@ -46,21 +45,25 @@ NativeCollection.prototype.onOpen = function () {
   }
 
   // capped
-  return self.conn.db.collection(self.name, function (err, c) {
+  return self.conn.db.collection(self.name, function(err, c) {
     if (err) return callback(err);
 
     // discover if this collection exists and if it is capped
-    c.options(function (err, exists) {
-      if (err) return callback(err);
+    self.conn.db.listCollections({ name: self.name }).toArray(function(err, docs) {
+      if (err) {
+        return callback(err);
+      }
+      var doc = docs[0];
+      var exists = !!doc;
 
       if (exists) {
-        if (exists.capped) {
+        if (doc.options && doc.options.capped) {
           callback(null, c);
         } else {
-          var msg = 'A non-capped collection exists with the name: '+ self.name +'\n\n'
+          var msg = 'A non-capped collection exists with the name: ' + self.name + '\n\n'
                   + ' To use this collection as a capped collection, please '
                   + 'first convert it.\n'
-                  + ' http://www.mongodb.org/display/DOCS/Capped+Collections#CappedCollections-Convertingacollectiontocapped'
+                  + ' http://www.mongodb.org/display/DOCS/Capped+Collections#CappedCollections-Convertingacollectiontocapped';
           err = new Error(msg);
           callback(err);
         }
@@ -73,7 +76,7 @@ NativeCollection.prototype.onOpen = function () {
     });
   });
 
-  function callback (err, collection) {
+  function callback(err, collection) {
     if (err) {
       // likely a strict mode error
       self.conn.emit('error', err);
@@ -81,7 +84,7 @@ NativeCollection.prototype.onOpen = function () {
       self.collection = collection;
       MongooseCollection.prototype.onOpen.call(self);
     }
-  };
+  }
 };
 
 /**
@@ -90,7 +93,7 @@ NativeCollection.prototype.onOpen = function () {
  * @api private
  */
 
-NativeCollection.prototype.onClose = function () {
+NativeCollection.prototype.onClose = function() {
   MongooseCollection.prototype.onClose.call(this);
 };
 
@@ -99,68 +102,92 @@ NativeCollection.prototype.onClose = function () {
  */
 
 for (var i in Collection.prototype) {
-  (function(i){
-    NativeCollection.prototype[i] = function () {
+  // Janky hack to work around gh-3005 until we can get rid of the mongoose
+  // collection abstraction
+  try {
+    if (typeof Collection.prototype[i] !== 'function') {
+      continue;
+    }
+  } catch (e) {
+    continue;
+  }
+
+  (function(i) {
+    NativeCollection.prototype[i] = function() {
       if (this.buffer) {
         this.addQueue(i, arguments);
         return;
       }
 
-      var collection = this.collection
-        , args = arguments
-        , self = this
-        , debug = self.conn.base.options.debug;
+      var collection = this.collection,
+          args = arguments,
+          self = this,
+          debug = self.conn.base.options.debug;
 
       if (debug) {
         if ('function' === typeof debug) {
           debug.apply(debug
-            , [self.name, i].concat(utils.args(args, 0, args.length-1)));
+            , [self.name, i].concat(utils.args(args, 0, args.length - 1)));
         } else {
-          console.error('\x1B[0;36mMongoose:\x1B[0m %s.%s(%s) %s %s %s'
-            , self.name
-            , i
-            , print(args[0])
-            , print(args[1])
-            , print(args[2])
-            , print(args[3]))
+          this.$print(self.name, i, args);
         }
       }
 
-      collection[i].apply(collection, args);
+      return collection[i].apply(collection, args);
     };
   })(i);
 }
 
-/*!
+/**
  * Debug print helper
+ *
+ * @api public
  */
 
-function print (arg) {
+NativeCollection.prototype.$print = function(name, i, args) {
+  console.error(
+    '\x1B[0;36mMongoose:\x1B[0m %s.%s(%s) %s %s %s',
+    name,
+    i,
+    this.$format(args[0]),
+    this.$format(args[1]),
+    this.$format(args[2]),
+    this.$format(args[3]));
+};
+
+/**
+ * Formatter for debug print args
+ *
+ * @api public
+ */
+
+NativeCollection.prototype.$format = function(arg) {
   var type = typeof arg;
   if ('function' === type || 'undefined' === type) return '';
   return format(arg);
-}
+};
 
 /*!
  * Debug print helper
  */
 
-function format (obj, sub) {
-  var x = utils.clone(obj);
+function format(obj, sub) {
+  var x = utils.clone(obj, { retainKeyOrder: 1 });
+  var representation;
   if (x) {
     if ('Binary' === x.constructor.name) {
       x = '[object Buffer]';
     } else if ('ObjectID' === x.constructor.name) {
-      var representation = 'ObjectId("' + x.toHexString() + '")';
+      representation = 'ObjectId("' + x.toHexString() + '")';
       x = { inspect: function() { return representation; } };
     } else if ('Date' === x.constructor.name) {
-      var representation = 'new Date("' + x.toUTCString() + '")';
+      representation = 'new Date("' + x.toUTCString() + '")';
       x = { inspect: function() { return representation; } };
     } else if ('Object' === x.constructor.name) {
-      var keys = Object.keys(x)
-        , i = keys.length
-        , key
-      while (i--) {
+      var keys = Object.keys(x);
+      var numKeys = keys.length;
+      var key;
+      for (var i = 0; i < numKeys; ++i) {
         key = keys[i];
         if (x[key]) {
           if ('Binary' === x[key].constructor.name) {
@@ -168,18 +195,18 @@ function format (obj, sub) {
           } else if ('Object' === x[key].constructor.name) {
             x[key] = format(x[key], true);
           } else if ('ObjectID' === x[key].constructor.name) {
-            ;(function(x){
+            (function(x) {
               var representation = 'ObjectId("' + x[key].toHexString() + '")';
               x[key] = { inspect: function() { return representation; } };
-            })(x)
+            })(x);
           } else if ('Date' === x[key].constructor.name) {
-            ;(function(x){
+            (function(x) {
               var representation = 'new Date("' + x[key].toUTCString() + '")';
               x[key] = { inspect: function() { return representation; } };
-            })(x)
+            })(x);
           } else if (Array.isArray(x[key])) {
-            x[key] = x[key].map(function (o) {
-              return format(o, true)
+            x[key] = x[key].map(function(o) {
+              return format(o, true);
             });
           }
         }
@@ -191,7 +218,7 @@ function format (obj, sub) {
   return require('util')
     .inspect(x, false, 10, true)
     .replace(/\n/g, '')
-    .replace(/\s{2,}/g, ' ')
+    .replace(/\s{2,}/g, ' ');
 }
 
 /**

node_modules/mongoose/lib/drivers/node-mongodb-native/connection.js

@@ -2,13 +2,13 @@
  * Module dependencies.
  */
 
-var MongooseConnection = require('../../connection')
-  , mongo = require('mongodb')
-  , Db = mongo.Db
-  , Server = mongo.Server
-  , Mongos = mongo.Mongos
-  , STATES = require('../../connectionstate')
-  , ReplSetServers = mongo.ReplSetServers;
+var MongooseConnection = require('../../connection'),
+    mongo = require('mongodb'),
+    Db = mongo.Db,
+    Server = mongo.Server,
+    Mongos = mongo.Mongos,
+    STATES = require('../../connectionstate'),
+    ReplSetServers = mongo.ReplSet;
 
 /**
  * A [node-mongodb-native](https://github.com/mongodb/node-mongodb-native) connection implementation.
@@ -20,7 +20,14 @@ var MongooseConnection = require('../../connection')
 function NativeConnection() {
   MongooseConnection.apply(this, arguments);
   this._listening = false;
-};
+}
+
+/**
+ * Expose the possible connection states.
+ * @api public
+ */
+
+NativeConnection.STATES = STATES;
 
 /*!
  * Inherits from Connection.
@@ -36,16 +43,18 @@ NativeConnection.prototype.__proto__ = MongooseConnection.prototype;
  * @api private
  */
 
-NativeConnection.prototype.doOpen = function (fn) {
-  if (this.db) {
-    mute(this);
+NativeConnection.prototype.doOpen = function(fn) {
+  var server = new Server(this.host, this.port, this.options.server);
+
+  if (this.options && this.options.mongos) {
+    var mongos = new Mongos([server], this.options.mongos);
+    this.db = new Db(this.name, mongos, this.options.db);
+  } else {
+    this.db = new Db(this.name, server, this.options.db);
   }
 
-  var server = new Server(this.host, this.port, this.options.server);
-  this.db = new Db(this.name, server, this.options.db);
-
   var self = this;
-  this.db.open(function (err) {
+  this.db.open(function(err) {
     if (err) return fn(err);
     listen(self);
     fn();
@@ -54,15 +63,75 @@ NativeConnection.prototype.doOpen = function (fn) {
   return this;
 };
 
+/**
+ * Switches to a different database using the same connection pool.
+ *
+ * Returns a new connection object, with the new db.
+ *
+ * @param {String} name The database name
+ * @return {Connection} New Connection Object
+ * @api public
+ */
+
+NativeConnection.prototype.useDb = function(name) {
+  // we have to manually copy all of the attributes...
+  var newConn = new this.constructor();
+  newConn.name = name;
+  newConn.base = this.base;
+  newConn.collections = {};
+  newConn.models = {};
+  newConn.replica = this.replica;
+  newConn.hosts = this.hosts;
+  newConn.host = this.host;
+  newConn.port = this.port;
+  newConn.user = this.user;
+  newConn.pass = this.pass;
+  newConn.options = this.options;
+  newConn._readyState = this._readyState;
+  newConn._closeCalled = this._closeCalled;
+  newConn._hasOpened = this._hasOpened;
+  newConn._listening = false;
+
+  // First, when we create another db object, we are not guaranteed to have a
+  // db object to work with. So, in the case where we have a db object and it
+  // is connected, we can just proceed with setting everything up. However, if
+  // we do not have a db or the state is not connected, then we need to wait on
+  // the 'open' event of the connection before doing the rest of the setup
+  // the 'connected' event is the first time we'll have access to the db object
+
+  var self = this;
+
+  if (this.db && this._readyState === STATES.connected) {
+    wireup();
+  } else {
+    this.once('connected', wireup);
+  }
+
+  function wireup() {
+    newConn.db = self.db.db(name);
+    newConn.onOpen();
+    // setup the events appropriately
+    listen(newConn);
+  }
+
+  newConn.name = name;
+
+  // push onto the otherDbs stack, this is used when state changes
+  this.otherDbs.push(newConn);
+  newConn.otherDbs.push(this);
+
+  return newConn;
+};
+
 /*!
  * Register listeners for important events and bubble appropriately.
  */
 
-function listen (conn) {
+function listen(conn) {
   if (conn._listening) return;
   conn._listening = true;
 
-  conn.db.on('close', function(){
+  conn.db.on('close', function() {
     if (conn._closeCalled) return;
 
     // the driver never emits an `open` event. auto_reconnect still
@@ -75,33 +144,26 @@ function listen (conn) {
     }
     conn.onClose();
   });
-  conn.db.on('error', function(err){
+  conn.db.on('error', function(err) {
     conn.emit('error', err);
   });
-  conn.db.on('timeout', function(err){
+  conn.db.on('reconnect', function() {
+    conn.readyState = STATES.connected;
+    conn.emit('reconnected');
+  });
+  conn.db.on('timeout', function(err) {
     var error = new Error(err && err.err || 'connection timeout');
     conn.emit('error', error);
   });
-  conn.db.on('open', function (err, db) {
+  conn.db.on('open', function(err, db) {
     if (STATES.disconnected === conn.readyState && db && db.databaseName) {
       conn.readyState = STATES.connected;
-      conn.emit('reconnected')
+      conn.emit('reconnected');
     }
-  })
-}
-
-/*!
- * Remove listeners registered in `listen`
- */
-
-function mute (conn) {
-  if (!conn.db) throw new Error('missing db');
-  conn.db.removeAllListeners("close");
-  conn.db.removeAllListeners("error");
-  conn.db.removeAllListeners("timeout");
-  conn.db.removeAllListeners("open");
-  conn.db.removeAllListeners("fullsetup");
-  conn._listening = false;
+  });
+  conn.db.on('parseError', function(err) {
+    conn.emit('parseError', err);
+  });
 }
 
 /**
@@ -114,30 +176,26 @@ function mute (conn) {
  * @return {Connection} this
  */
 
-NativeConnection.prototype.doOpenSet = function (fn) {
-  if (this.db) {
-    mute(this);
-  }
+NativeConnection.prototype.doOpenSet = function(fn) {
+  var servers = [],
+      self = this;
 
-  var servers = []
-    , self = this;
-
-  this.hosts.forEach(function (server) {
+  this.hosts.forEach(function(server) {
     var host = server.host || server.ipc;
     var port = server.port || 27017;
     servers.push(new Server(host, port, self.options.server));
-  })
+  });
 
   var server = this.options.mongos
     ? new Mongos(servers, this.options.mongos)
     : new ReplSetServers(servers, this.options.replset);
   this.db = new Db(this.name, server, this.options.db);
 
-  this.db.on('fullsetup', function () {
-    self.emit('fullsetup')
+  this.db.on('fullsetup', function() {
+    self.emit('fullsetup');
   });
 
-  this.db.open(function (err) {
+  this.db.open(function(err) {
     if (err) return fn(err);
     fn();
     listen(self);
@@ -154,11 +212,11 @@ NativeConnection.prototype.doOpenSet = function (fn) {
  * @api private
  */
 
-NativeConnection.prototype.doClose = function (fn) {
+NativeConnection.prototype.doClose = function(fn) {
   this.db.close();
   if (fn) fn();
   return this;
-}
+};
 
 /**
  * Prepares default connection options for the node-mongodb-native driver.
@@ -170,7 +228,7 @@ NativeConnection.prototype.doClose = function (fn) {
  * @api private
  */
 
-NativeConnection.prototype.parseOptions = function (passed, connStrOpts) {
+NativeConnection.prototype.parseOptions = function(passed, connStrOpts) {
   var o = passed || {};
   o.db || (o.db = {});
   o.auth || (o.auth = {});
@@ -180,11 +238,12 @@ NativeConnection.prototype.parseOptions = function (passed, connStrOpts) {
   o.replset.socketOptions || (o.replset.socketOptions = {});
 
   var opts = connStrOpts || {};
-  Object.keys(opts).forEach(function (name) {
+  Object.keys(opts).forEach(function(name) {
     switch (name) {
+      case 'ssl':
       case 'poolSize':
-        if ('undefined' == typeof o.server.poolSize) {
-          o.server.poolSize = o.replset.poolSize = opts[name];
+        if ('undefined' == typeof o.server[name]) {
+          o.server[name] = o.replset[name] = opts[name];
         }
         break;
       case 'slaveOk':
@@ -197,7 +256,6 @@ NativeConnection.prototype.parseOptions = function (passed, connStrOpts) {
           o.server.auto_reconnect = opts[name];
         }
         break;
-      case 'ssl':
       case 'socketTimeoutMS':
       case 'connectTimeoutMS':
         if ('undefined' == typeof o.server.socketOptions[name]) {
@@ -256,7 +314,7 @@ NativeConnection.prototype.parseOptions = function (passed, connStrOpts) {
         }
         break;
     }
-  })
+  });
 
   if (!('auto_reconnect' in o.server)) {
     o.server.auto_reconnect = true;
@@ -278,7 +336,7 @@ NativeConnection.prototype.parseOptions = function (passed, connStrOpts) {
 
   validate(o);
   return o;
-}
+};
 
 /*!
  * Validates the driver db options.
@@ -286,7 +344,7 @@ NativeConnection.prototype.parseOptions = function (passed, connStrOpts) {
  * @param {Object} o
  */
 
-function validate (o) {
+function validate(o) {
   if (-1 === o.db.w || 0 === o.db.w) {
     if (o.db.journal || o.db.fsync || o.db.safe) {
       throw new Error(

node_modules/mongoose/lib/drivers/node-mongodb-native/index.js

@@ -0,0 +1,7 @@
+/*!
+ * Module exports.
+ */
+
+exports.Binary = require('./binary');
+exports.ObjectId = require('./objectid');
+exports.ReadPreference = require('./ReadPreference');

node_modules/mongoose/lib/drivers/node-mongodb-native/objectid.js

@@ -5,25 +5,10 @@
  * @see ObjectId
  */
 
-var ObjectId = require('mongodb').BSONPure.ObjectID;
+var ObjectId = require('mongodb').ObjectId;
 
 /*!
  * ignore
  */
 
-var ObjectIdToString = ObjectId.toString.bind(ObjectId);
 module.exports = exports = ObjectId;
-
-ObjectId.fromString = function(str){
-  // patch native driver bug in V0.9.6.4
-  if (!('string' === typeof str && 24 === str.length)) {
-    throw new Error("Invalid ObjectId");
-  }
-
-  return ObjectId.createFromHexString(str);
-};
-
-ObjectId.toString = function(oid){
-  if (!arguments.length) return ObjectIdToString();
-  return oid.toHexString();
-};