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

test/node_modules/express/lib/router/route.js

@@ -1,10 +1,10 @@
 
-/*!
- * Express - router - Route
- * Copyright(c) 2010 TJ Holowaychuk <tj@vision-media.ca>
- * MIT Licensed
+/**
+ * Module dependencies.
  */
 
+var utils = require('../utils');
+
 /**
  * Expose `Route`.
  */
@@ -32,57 +32,41 @@ function Route(method, path, callbacks, options) {
   this.path = path;
   this.method = method;
   this.callbacks = callbacks;
-  this.regexp = normalize(path
+  this.regexp = utils.pathRegexp(path
     , this.keys = []
     , options.sensitive
     , options.strict);
 }
 
 /**
- * Check if this route matches `path` and return captures made.
+ * Check if this route matches `path`, if so
+ * populate `.params`.
  *
  * @param {String} path
- * @return {Array}
+ * @return {Boolean}
  * @api private
  */
 
 Route.prototype.match = function(path){
-  return this.regexp.exec(path);
+  var keys = this.keys
+    , params = this.params = []
+    , m = this.regexp.exec(path);
+
+  if (!m) return false;
+
+  for (var i = 1, len = m.length; i < len; ++i) {
+    var key = keys[i - 1];
+
+    var val = 'string' == typeof m[i]
+      ? decodeURIComponent(m[i])
+      : m[i];
+
+    if (key) {
+      params[key.name] = val;
+    } else {
+      params.push(val);
+    }
+  }
+
+  return true;
 };
-
-/**
- * Normalize the given path string,
- * returning a regular expression.
- *
- * An empty array should be passed,
- * which will contain the placeholder
- * key names. For example "/user/:id" will
- * then contain ["id"].
- *
- * @param  {String|RegExp} path
- * @param  {Array} keys
- * @param  {Boolean} sensitive
- * @param  {Boolean} strict
- * @return {RegExp}
- * @api private
- */
-
-function normalize(path, keys, sensitive, strict) {
-  if (path instanceof RegExp) return path;
-  path = path
-    .concat(strict ? '' : '/?')
-    .replace(/\/\(/g, '(?:/')
-    .replace(/(\/)?(\.)?:(\w+)(?:(\(.*?\)))?(\?)?/g, function(_, slash, format, key, capture, optional){
-      keys.push({ name: key, optional: !! optional });
-      slash = slash || '';
-      return ''
-        + (optional ? '' : slash)
-        + '(?:'
-        + (optional ? slash : '')
-        + (format || '') + (capture || (format && '([^/.]+?)' || '([^/]+?)')) + ')'
-        + (optional || '');
-    })
-    .replace(/([\/.])/g, '\\$1')
-    .replace(/\*/g, '(.*)');
-  return new RegExp('^' + path + '$', sensitive ? '' : 'i');
-}