added mongodb credential options

Author: shannon

README.md

@@ -24,8 +24,12 @@ process, you should use [socket.io-emitter](http:///github.com/Automattic/socket
 
 ### adapter(uri[, opts])
 
-`uri` is a string like `localhost:27017` where your mongo server
-is located. For a list of options see below.
+`uri` is a string that matches a mongodb connection string
+```
+mongodb://localhost:27017
+mongodb://user:pass@localhost:27017/test
+localhost:27017
+```
 
 ### adapter(opts)
 
@@ -35,6 +39,8 @@ The following options are allowed:
 - `host`: host to connect to mongo on (`localhost`)
 - `port`: port to connect to mongo on (`27017`)
 - `db`: db to use in mongo (`mubsub`)
+- `username`: username to connect to mongo with
+- `password`: password to connect to mongo with
 - `socket`: unix domain socket to connect to mongo (`"/tmp/mongo.sock"`). Will
   be used instead of the host and port options if specified.
 - `client`: optional, the mubsub client to publish events on

index.js

@@ -10,6 +10,8 @@ var uid2    = require('uid2')
   , debug   = require('debug')('socket.io-mongo')
 ;
 
+var URI_MATCH = /(?:mongodb\:\/\/)?(?:(.*)\:(.*)\@)?(.*)\:(\d+)(?:\/(.*))?/i;
+
 /**
  * Module exports.
  */
@@ -34,22 +36,27 @@ function adapter(uri, opts){
   }
 
   // handle uri string
+  uri = (uri || '').match(URI_MATCH);
   if (uri) {
-    uri = uri.split(':');
-    opts.host = uri[0];
-    opts.port = uri[1];
+    opts.username = uri[1];
+    opts.password = uri[2];
+    opts.host = uri[3];
+    opts.port = uri[4];
+    opts.db   = uri[5];
   }
 
   // opts
   var socket  = opts.socket;
+  var creds   = (opts.username && opts.password) ? opts.username + ':' + opts.password + '@' : '';
   var host    = opts.host || '127.0.0.1';
   var port    = Number(opts.port || 27017);
   var db      = opts.db || 'mubsub';
+  
   var client  = opts.client;
   var key     = opts.key || 'socket.io';
 
   // init clients if needed
-  if (!client) client = socket ? mubsub(socket) : mubsub('mongodb://' + host + ':' + port + '/' + db);
+  if (!client) client = socket ? mubsub(socket) : mubsub('mongodb://' + creds + host + ':' + port + '/' + db);
 
   // this server's key
   var uid = uid2(6);
@@ -66,7 +73,6 @@ function adapter(uri, opts){
   function Mongo(nsp){
     Adapter.call(this, nsp);
 
-    var self = this;
     channel.subscribe(key, this.onmessage.bind(this));
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "socket.io-adapter-mongo",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "",
   "scripts": {
     "test": "mocha"

test/index.js

@@ -23,21 +23,24 @@ function client(srv, nsp, opts){
 
 describe('socket.io-mongo', function(){
   beforeEach(function(done){ //initialize collection
-    var cli = mubsub('mongodb://localhost:27017/test');
+    var cli = mubsub('mongodb://test:test@localhost:27017/test');
     var channel = cli.channel('socket.io');
     channel.publish('socket.io', 'init', done);
   });
 
   describe('broadcast', function(){
     beforeEach(function(done){
-      this.mubsubClients = [];
       var self = this;
-
-      async.times(2, function(n, next){
-        var cli = mubsub('mongodb://localhost:27017/test');
+      
+      var connectOpts = [
+        'mongodb://test:test@localhost:27017/test',
+        'test:test@localhost:27017/test',
+        { host: 'localhost', port: '27017', username: 'test', password: 'test', db: 'test'}
+      ];
+      
+      async.times(3, function(n, next){
         var srv = http();
-        var sio = io(srv, { adapter: mongoAdapter({ client: cli }) });
-        self.mubsubClients.push(cli);
+        var sio = io(srv, { adapter:  mongoAdapter(connectOpts[n]) });
 
         srv.listen(function(){
           ['/', '/nsp'].forEach(function(name){
@@ -99,12 +102,6 @@ describe('socket.io-mongo', function(){
       });
     });
 
-    afterEach(function(){
-      this.mubsubClients.forEach(function(cli){
-        cli.close();
-      });
-    });
-
     it('should broadcast from a socket', function(done){
       async.each(this.sockets.slice(1), function(socket, next){
         socket.on('broadcast', function(message){