Session() casts object into Session

senchalabs · Jun 28, 2010 · 29275ac · 29275ac
1 parent 10b6c5a
commit 29275ac
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/lib/connect/middleware/session/session.js b/lib/connect/middleware/session/session.js
@@ -12,15 +12,26 @@
 var utils = require('./../../utils');
 
 /**
- * Initialize Session with the given sid.
+ * Initialize Session with the given sid, or cast a session-like
+ * object into a Session. This is useful when your data is serialized
+ * and stuffed into a database.
+ *
+ * Examples:
+ *
+ *     new Session(123);
+ *     Session({ id: 123, lastAccess: 4324394 });
  *
  * @param {String} sid
  * @api public
  */
 
 var Session = exports.Session = function Session(sid) {
-    this.id = sid;
-    this.touch();
+    if (this === global) {
+        return utils.merge(new Session, sid);
+    } else if (sid) {
+        this.id = sid;
+        this.touch();
+    }
 };
 
 /**

diff --git a/test/session.test.js b/test/session.test.js
@@ -8,11 +8,22 @@ var connect = require('connect'),
     assert = require('assert'),
     http = require('http');
 
+// Session
+
+var Session = require('connect/middleware/session/session').Session;
+
 // Stores
 
 var MemoryStore = require('connect/middleware/session/memory').MemoryStore;
 
 module.exports = {
+    'test Session() cast': function(){
+        var sess = Session({ id: '123', lastAccess: 123 });
+        assert.ok(sess instanceof Session, 'Test Session() cast');
+        assert.equal('123', sess.id);
+        assert.equal(123, sess.lastAccess);
+    },
+
     'test MemoryStore': function(){
         var n = 0, sid;
         var server = helpers.run(