updated bunch of file paths and changed the way posts are loaded

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

@@ -2,14 +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.ReplSet
-  , utils = require('../../utils');
+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.
@@ -21,7 +20,7 @@ var MongooseConnection = require('../../connection')
 function NativeConnection() {
   MongooseConnection.apply(this, arguments);
   this._listening = false;
-};
+}
 
 /**
  * Expose the possible connection states.
@@ -44,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();
@@ -72,7 +73,7 @@ NativeConnection.prototype.doOpen = function (fn) {
  * @api public
  */
 
-NativeConnection.prototype.useDb = function (name) {
+NativeConnection.prototype.useDb = function(name) {
   // we have to manually copy all of the attributes...
   var newConn = new this.constructor();
   newConn.name = name;
@@ -106,7 +107,7 @@ NativeConnection.prototype.useDb = function (name) {
     this.once('connected', wireup);
   }
 
-  function wireup () {
+  function wireup() {
     newConn.db = self.db.db(name);
     newConn.onOpen();
     // setup the events appropriately
@@ -126,11 +127,11 @@ NativeConnection.prototype.useDb = function (name) {
  * 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
@@ -143,18 +144,18 @@ function listen (conn) {
     }
     conn.onClose();
   });
-  conn.db.on('error', function(err){
+  conn.db.on('error', function(err) {
     conn.emit('error', err);
   });
   conn.db.on('reconnect', function() {
     conn.readyState = STATES.connected;
     conn.emit('reconnected');
   });
-  conn.db.on('timeout', function(err){
+  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');
@@ -165,20 +166,6 @@ function listen (conn) {
   });
 }
 
-/*!
- * 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;
-}
-
 /**
  * Opens a connection to a MongoDB ReplicaSet.
  *
@@ -189,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);
+    : new ReplSetServers(servers, this.options.replset || 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);
@@ -229,11 +212,10 @@ NativeConnection.prototype.doOpenSet = function (fn) {
  * @api private
  */
 
-NativeConnection.prototype.doClose = function (fn) {
-  this.db.close();
-  if (fn) fn();
+NativeConnection.prototype.doClose = function(fn) {
+  this.db.close(fn);
   return this;
-}
+};
 
 /**
  * Prepares default connection options for the node-mongodb-native driver.
@@ -245,17 +227,17 @@ 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 = {});
   o.server || (o.server = {});
-  o.replset || (o.replset = {});
+  o.replset || (o.replset = o.replSet) || (o.replset = {});
   o.server.socketOptions || (o.server.socketOptions = {});
   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':
@@ -321,8 +303,8 @@ NativeConnection.prototype.parseOptions = function (passed, connStrOpts) {
         }
         break;
       case 'readPreference':
-        if ('undefined' == typeof o.db.read_preference) {
-          o.db.read_preference = opts[name];
+        if ('undefined' == typeof o.db.readPreference) {
+          o.db.readPreference = opts[name];
         }
         break;
       case 'readPreferenceTags':
@@ -331,17 +313,12 @@ NativeConnection.prototype.parseOptions = function (passed, connStrOpts) {
         }
         break;
     }
-  })
+  });
 
   if (!('auto_reconnect' in o.server)) {
     o.server.auto_reconnect = true;
   }
 
-  if (!o.db.read_preference) {
-    // read from primaries by default
-    o.db.read_preference = 'primary';
-  }
-
   // mongoose creates its own ObjectIds
   o.db.forceServerObjectId = false;
 
@@ -353,7 +330,7 @@ NativeConnection.prototype.parseOptions = function (passed, connStrOpts) {
 
   validate(o);
   return o;
-}
+};
 
 /*!
  * Validates the driver db options.
@@ -361,7 +338,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(