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

node_modules/mongo-express/db.js

@@ -1,16 +1,16 @@
 'use strict';
 
-var async = require('async');
+var async   = require('async');
 var mongodb = require('mongodb');
-var _ = require('underscore');
+var _       = require('underscore');
 
 var connect = function(config) {
   // set up database stuff
-  var host = config.mongodb.server || 'localhost';
-  var port = config.mongodb.port || mongodb.Connection.DEFAULT_PORT;
+  var host = config.mongodb.server  || 'localhost';
+  var port = config.mongodb.port    || mongodb.Connection.DEFAULT_PORT;
   var dbOptions = {
     auto_reconnect: config.mongodb.autoReconnect,
-    poolSize: config.mongodb.poolSize
+    poolSize: config.mongodb.poolSize,
   };
 
   var db;
@@ -19,22 +19,23 @@ var connect = function(config) {
     host = host.map(function(host) {
       return new mongodb.Server(host, port, dbOptions);
     });
+
     db = new mongodb.Db('local', new mongodb.ReplSet(host), { safe: true, w: 0 });
   } else {
     db = new mongodb.Db('local', new mongodb.Server(host, port, dbOptions), {safe:true});
   }
 
   var connections = {};
-  var databases = [];
+  var databases   = [];
   var collections = {};
+
   //get admin instance
   var adminDb = db.admin();
   var mainConn; // main db connection
 
-
   // update the collections list
   var updateCollections = function(db, dbName, callback) {
-    db.listCollections().toArray(function (err, result) {
+    db.listCollections().toArray(function(err, result) {
       var names = [];
 
       for (var r in result) {
@@ -56,50 +57,50 @@ var connect = function(config) {
       if (err) {
         //TODO: handle error
         console.error(err);
-      }
+        databases = _.pluck(config.mongodb.auth, 'database');
+      } else {
+        for (var i = 0; i < dbs.databases.length; i++) {
+          var dbName = dbs.databases[i].name;
 
-      for (var key in dbs.databases) {
-        var dbName = dbs.databases[key].name;
-
-        //'local' is special database, ignore it
-        if (dbName === 'local') {
-          continue;
-        }
-
-        if (config.mongodb.whitelist.length !== 0) {
-          if (!_.include(config.mongodb.whitelist, dbName)) {
+          //'local' is special database, ignore it
+          if (dbName === 'local') {
             continue;
           }
-        }
-        if (config.mongodb.blacklist.length !== 0) {
-          if (_.include(config.mongodb.blacklist, dbName)) {
-            continue;
+
+          if (config.mongodb.whitelist.length !== 0) {
+            if (!_.include(config.mongodb.whitelist, dbName)) {
+              continue;
+            }
           }
+
+          if (config.mongodb.blacklist.length !== 0) {
+            if (_.include(config.mongodb.blacklist, dbName)) {
+              continue;
+            }
+          }
+
+          connections[dbName] = mainConn.db(dbName);
+          databases.push(dbName);
+          updateCollections(connections[dbName], dbName);
         }
-
-        connections[dbName] = mainConn.db(dbName);
-        databases.push(dbName);
-
-        updateCollections(connections[dbName], dbName);
       }
 
       //Sort database names
       databases = databases.sort();
-      
-      if(callback){
+
+      if (callback) {
         callback(databases);
       }
     });
   };
 
-
   // connect to mongodb database
   db.open(function(err, db) {
     if (err) {
       throw err;
     }
 
-    console.log('Database connected!');
+    console.log('Database connected');
 
     mainConn = db;
 
@@ -143,12 +144,12 @@ var connect = function(config) {
             }
 
             updateCollections(connections[auth.database], auth.database);
-            console.log('Connected!');
+            console.log('Database ' + auth.database + ' connected');
             callback();
           });
         } else {
           updateCollections(connections[auth.database], auth.database);
-          console.log('Connected!');
+          console.log('Database ' + auth.database + ' connected');
           callback();
         }
       });
@@ -156,15 +157,14 @@ var connect = function(config) {
   });
 
   return {
-    updateCollections: updateCollections,
-    updateDatabases: updateDatabases,
-    connections: connections,
-    databases: databases,
-    collections: collections,
-    adminDb: adminDb,
-    mainConn: mainConn
+    adminDb:            adminDb,
+    collections:        collections,
+    connections:        connections,
+    databases:          databases,
+    mainConn:           mainConn,
+    updateCollections:  updateCollections,
+    updateDatabases:    updateDatabases,
   };
 };
 
 module.exports = connect;
-