@@ -2,17 +2,17 @@ var File = require("jack/file").File, ContentLength = require("jack/contentlength").ContentLength, ShowExceptions = require("jack/showexceptions").ShowExceptions, Lint = require("jack/lint").Lint, - Cascade = require("jack/cascade").Cascade; + Cascade = require("jack/cascade").Cascade, + CookieSessions = require("jack/session/cookie").Cookie; var Dispatch = require("nitro/dispatch").Dispatch, Path = require("nitro/path").Path, - Render = require("nitro/render").Render, - SessionManager = require("nitro/sessionmanager").SessionManager; + Render = require("nitro/render").Render; var Wrap = require("./src/wrap").Wrap; // The application. -exports.app = ShowExceptions(Lint(ContentLength(Path(SessionManager(Render(Wrap(Dispatch())), "s3cr3t"))))); +exports.app = ShowExceptions(Lint(ContentLength(Path(CookieSessions(Render(Wrap(Dispatch())), {secret: "s3cr3t"}))))); // The default jackup environment is 'development'. exports.development = function(app) { example/jackconfig.js @@ -5,9 +5,9 @@ var render = require("nitro/response").render; exports.GET = function(env) { var session = new Session(env); - var counter = session.get("counter") || 0; + var counter = session.counter || 0; counter += 1; - session.put("counter", counter); + session.counter = counter; return {data: { time: new Date(), example/src/apps/index.js @@ -1,42 +1 @@ -/** - * Session variables live throughout a user's session. - * - * HTTP is a stateless protocol for a *good* reason. Try to avoid using - * session variables. - * - * The framework explicitly makes session manipulation 'painful' to discourage - * users from using them. - */ -var Session = exports.Session = function(env) { - if (env["jsgi.session"]) - return env["jsgi.session"]; - - this.data = env["jsgi.session.load"](env); - this.dirty = false; - - env["jsgi.session"] = this; -} - -/** - * Get a variable from the session. - */ -Session.prototype.get = function(key) { - return this.data[key]; -} - -/** - * Set a session variable to the given value. - */ -Session.prototype.put = function(key, value) { - this.data[key] = value; - this.dirty = true; -} - -/** - * Remove a session variable. - */ -Session.prototype.remove = function(key) { - delete this.data[key]; - this.dirty = true; -} - +var Session = exports.Session = require("jack/session").Session; lib/nitro/session.js @@ -1,6 +1,6 @@ require("date"); -var escapeHTML = require("./html").escapeHTML; +var escapeHTML = require("html").escapeHTML; /** * Atom codec. lib/nitro/utils/atom.js @@ -1,5 +1,4 @@ exports.testSession = require("./nitro/session-tests"); -exports.testHTML = require("./nitro/utils/html-tests"); exports.testPaginator = require("./nitro/utils/paginator-tests"); if (require.main === module.id) tests/all-tests.js tests/nitro/utils/html-tests.js 73b2233a00f9b758da77df499cd1b08f40f87956 George Moschovitis george.moschovitis@gmail.com http://github.com/gmosx/nitro/commit/1ac36913674835b77ddcc41402d11855b55c18b8 1ac36913674835b77ddcc41402d11855b55c18b8 2009-10-13T03:13:24-07:00 2009-10-13T03:13:24-07:00 Updated example to use the new session. Removed old files. c3629fae7b5d21869783670c52e5d54f42be66d3 George Moschovitis george.moschovitis@gmail.com