Session is now a string. Upgraded mongodb package

Author: masylum

Readme.md

@@ -4,7 +4,7 @@ connect-mongodb is a mongoDB session store backed by [node-mongodb-native](http:
 
 Originally written by [dvv](http://github.com/dvv)
 
-## Version 1.0
+## Version 1.*
 
 This version is not compatible with `0.*` versions. Now you must pass a mongodb connection, or server configuration.
 On updating, i recomment to delete your current sessions collection data.

lib/connect-mongodb.js

@@ -8,12 +8,13 @@
 var Store = require('connect').session.Store
   , mongo = require('mongodb')
   , _collection = null
-  , _default = function (callback) {
-      callback = typeof(callback) === 'function' ? callback : function () { };
-      return callback;
-    }
   , _defaults = {host: '127.0.0.1', port: 27017, dbname: 'dev', collection: 'sessions', reapInterval: 60 * 1000};
 
+function _default(callback) {
+  callback = typeof(callback) === 'function' ? callback : function () { };
+  return callback;
+}
+
 /**
  * Initialize MongoStore with the given `options`.
  *
@@ -81,7 +82,7 @@ var MONGOSTORE = module.exports = function MongoStore(options, callback) {
     }, options.reapInterval || _defaults.reapInterval, this); // _defaults to each minute
   }
 
-  if (server_config.isConnected()) {
+  if (server_config.connected) {
     authenticateAndGetCollection(callback);
   } else {
     server_config.connect(db, function (err) {
@@ -109,9 +110,8 @@ MONGOSTORE.prototype.get = function (sid, cb) {
   _collection.findOne({_id: sid}, function (err, data) {
     try {
       if (data) {
-        var sess =
-            typeof data.session === 'string' ? JSON.parse(data.session)
-                                             : data.session;
+        var sess = typeof data.session === 'string' ? JSON.parse(data.session)
+                                                    : data.session;
         cb(null, sess);
       } else {
         cb();
@@ -126,29 +126,21 @@ MONGOSTORE.prototype.get = function (sid, cb) {
 /**
  * Commit the given `sess` object associated with the given `sid`.
  *
- *   With connect-session, `sess.cookie` has a getter `data`, and if we
- *   store sess.cookie.data in the DB, problems occur. Run sess through
- *   JSON.stringify(), which strips out the getter.
- *
  * @param {String} sid
  * @param {Session} sess
  * @param {Function} cb
  * @api public
  */
 MONGOSTORE.prototype.set = function (sid, sess, cb) {
   cb = _default(cb);
-  try {
-    var update = {_id: sid, session: JSON.parse(JSON.stringify(sess))};
-    if (sess && sess.cookie && sess.cookie.expires) {
-      update.expires = Date.parse(sess.cookie.expires);
-    }
-
-    _collection.update({_id: sid}, update, {upsert: true}, function (err, data) {
-      cb.apply(this, arguments);
-    });
-  } catch (exc) {
-    cb(exc);
+  var update = {_id: sid, session: JSON.stringify(sess)};
+  if (sess && sess.cookie && sess.cookie.expires) {
+    update.expires = Date.parse(sess.cookie.expires);
   }
+
+  _collection.update({_id: sid}, update, {upsert: true}, function (err, data) {
+    cb.apply(this, arguments);
+  });
 };
 
 /**

package.json

@@ -1,12 +1,11 @@
 {
   "name": "connect-mongodb",
   "description": "mongodb session store for connect",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "author": "Vladimir Dronnikov <[email protected]>",
   "contributors": ["Pau Ramon <[email protected]>", "ramv"],
   "repository": {"type": "git", "url": "git://github.com/masylum/connect-mongodb.git"},
-  "dependencies": {"mongodb": "0.9.6-7", "connect": "1.5.1"},
+  "dependencies": {"mongodb": "0.9.7", "connect": "1.5.1"},
   "devDependencies": {"testosterone": "1.2.0", "gently": "0.9.1", "funk": "1.5.0"},
-  "main": "./lib/connect-mongodb",
-  "engines": {"node": ">= 0.4.0"}
+  "main": "./lib/connect-mongodb"
 }

tests/core.js

@@ -5,6 +5,7 @@ var testosterone = require('testosterone')({title: 'models/advertiser'})
   , Server = require('mongodb').Server
   , server_config = new Server('localhost', 27017, {auto_reconnect: true, native_parser: true})
   , url = 'mongodb://localhost:27017/test'
+  , connect_mongodb = require('..')
   , db = new Db('test', server_config, {});
 
 testosterone
@@ -13,11 +14,11 @@ testosterone
     var funk = require('funk')('parallel');
 
     db.open(function () {
-      require('..')(null, funk.add(assert.ok));
-      require('..')({db: null}, funk.add(assert.ok));
-      require('..')({db: db, setInterval: -1}, funk.add(assert.ifError));
-      require('..')({server_config: server_config, setInterval: -1}, funk.add(assert.ifError));
-      require('..')({url: url, setInterval: -1}, funk.add(assert.ifError));
+      connect_mongodb(null, funk.add(assert.ok));
+      connect_mongodb({db: null}, funk.add(assert.ok));
+      connect_mongodb({db: db, setInterval: -1}, funk.add(assert.ifError));
+      connect_mongodb({server_config: server_config, setInterval: -1}, funk.add(assert.ifError));
+      connect_mongodb({url: url, setInterval: -1}, funk.add(assert.ifError));
       funk.run(done);
     });
   })