upgraded to express 3.x, converted jade templates, and worked out array notation for articles/exercises

test/node_modules/express/lib/express.js

@@ -1,77 +1,90 @@
-
-/*!
- * Express
- * Copyright(c) 2010 TJ Holowaychuk <tj@vision-media.ca>
- * MIT Licensed
- */
-
 /**
  * Module dependencies.
  */
 
 var connect = require('connect')
-  , HTTPSServer = require('./https')
-  , HTTPServer = require('./http')
+  , proto = require('./application')
   , Route = require('./router/route')
+  , Router = require('./router')
+  , req = require('./request')
+  , res = require('./response')
+  , utils = connect.utils;
 
 /**
- * Re-export connect auto-loaders.
- * 
- * This prevents the need to `require('connect')` in order
- * to access core middleware, so for example `express.logger()` instead
- * of `require('connect').logger()`.
+ * Expose `createApplication()`.
  */
 
-var exports = module.exports = connect.middleware;
+exports = module.exports = createApplication;
 
 /**
  * Framework version.
  */
 
-exports.version = '2.5.11';
+exports.version = '3.0.5';
 
 /**
- * Shortcut for `new Server(...)`.
+ * Expose mime.
+ */
+
+exports.mime = connect.mime;
+
+/**
+ * Create an express application.
  *
- * @param {Function} ...
- * @return {Server}
+ * @return {Function}
  * @api public
  */
 
-exports.createServer = function(options){
-  if ('object' == typeof options) {
-    return new HTTPSServer(options, Array.prototype.slice.call(arguments, 1));
-  } else {
-    return new HTTPServer(Array.prototype.slice.call(arguments));
-  }
+function createApplication() {
+  var app = connect();
+  utils.merge(app, proto);
+  app.request = { __proto__: req };
+  app.response = { __proto__: res };
+  app.init();
+  return app;
+}
+
+/**
+ * Expose connect.middleware as express.*
+ * for example `express.logger` etc.
+ */
+
+for (var key in connect.middleware) {
+  Object.defineProperty(
+      exports
+    , key
+    , Object.getOwnPropertyDescriptor(connect.middleware, key));
+}
+
+/**
+ * Error on createServer().
+ */
+
+exports.createServer = function(){
+  console.warn('Warning: express.createServer() is deprecated, express');
+  console.warn('applications no longer inherit from http.Server,');
+  console.warn('please use:');
+  console.warn('');
+  console.warn('  var express = require("express");');
+  console.warn('  var app = express();');
+  console.warn('');
+  return createApplication();
 };
 
+/**
+ * Expose the prototypes.
+ */
+
+exports.application = proto;
+exports.request = req;
+exports.response = res;
+
 /**
  * Expose constructors.
  */
 
-exports.HTTPServer = HTTPServer;
-exports.HTTPSServer = HTTPSServer;
 exports.Route = Route;
-
-/**
- * View extensions.
- */
-
-exports.View =
-exports.view = require('./view');
-
-/**
- * Response extensions.
- */
-
-require('./response');
-
-/**
- * Request extensions.
- */
-
-require('./request');
+exports.Router = Router;
 
 // Error handler title