switch to mocha for tests

Author: tj

Makefile

@@ -1,5 +1,6 @@
 
 test:
-	@./node_modules/.bin/expresso --serial
+	@./node_modules/.bin/mocha \
+		--reporter spec
 
 .PHONY: test

index.js

@@ -1,15 +1,10 @@
-/*!
- * Express - Contrib - namespace
- * Copyright(c) 2010 TJ Holowaychuk <[email protected]>
- * MIT Licensed
- */
 
 /**
  * Module dependencies.
  */
 
 var express = require('express')
-  , join = require('path').join
+  , methods = require('methods').concat('del')
   , app = express.application
     ? express.application
     : express.HTTPServer.prototype;
@@ -24,61 +19,41 @@ var express = require('express')
  * @api public
  */
 
-exports.namespace = function(){
-  var args = Array.apply(null, arguments)
+app.namespace = function(){
+  var args = Array.prototype.slice.call(arguments)
     , path = args.shift()
     , fn = args.pop()
     , self = this;
 
-  if (args.length) self.all(path + '*', args);
+  if (args.length) self.all(path, args);
+  if (args.length) self.all(path + '/*', args);
   (this._ns = this._ns || []).push(path);
   fn.call(this);
   this._ns.pop();
   return this;
 };
 
-/**
- * Return the current namespace.
- *
- * @return {String}
- * @api public
- */
-
-exports.__defineGetter__('currentNamespace', function(){
-  return join.apply(this, this._ns).replace(/\\/g, '/').replace(/\/$/, '') || '/';
-});
-
 /**
  * Proxy HTTP methods to provide namespacing support.
  */
 
-(express.router || express.Router).methods.concat('del').forEach(function(method){
+methods.forEach(function(method){
   var orig = app[method];
-  exports[method] = function(){
+  app[method] = function(val){
+    var len = arguments.length;
+    if ('get' == method && 1 == len) return orig.call(this, val);
+
     var args = Array.prototype.slice.call(arguments)
       , path = args.shift()
-      , fn = args.pop()
       , self = this;
 
     this.namespace(path, function(){
-      var curr = this.currentNamespace;
+      path = this._ns.join('/').replace(/\/\//g, '/').replace(/\/$/, '');
       args.forEach(function(fn){
-        fn.namespace = curr;
-        orig.call(self, curr, fn);
+        orig.call(self, path, fn);
       });
-
-      fn.namespace = curr;
-      orig.call(self, curr, fn);
     });
 
     return this;
   };
 });
-
-// merge
-
-for (var key in exports) {
-  var desc = Object.getOwnPropertyDescriptor(exports, key);
-  Object.defineProperty(app, key, desc);
-  Object.defineProperty(app, key, desc);
-}

package.json

@@ -4,9 +4,13 @@
   , "author": "TJ Holowaychuk <[email protected]>"
   , "keywords": ["express"]
   , "main": "index"
+  , "dependencies": {
+    "methods": "0.0.1"
+  }
   , "devDependencies": {
       "express": "3.x"
-    , "ejs": ">= 0.0.1"
-    , "expresso": ">= 0.0.1"
+    , "ejs": "*"
+    , "mocha": "*"
+    , "supertest": "*"
   }
 }

test/namespace.test.js

@@ -1,199 +1,109 @@
+
 /**
  * Module dependencies.
  */
 
 var express = require('express')
   , assert = require('assert')
-  , namespace = require('../');
+  , request = require('supertest')
+  , namespace = require('..')
+  , pending = require('./support/pending');
 
-module.exports = {
-  'test app.namespace(str, fn)': function(){
-    var app = express()
-      , id;
+describe('app.namespace(path, fn)', function(){
+  it('should not prefix root-level paths', function(done){
+    var app = express();
+    done = pending(2, done);
 
     app.get('/one', function(req, res){
       res.send('GET one');
     });
 
-    assert.equal(app.namespace('/user', function(){}), app);
-
-    app.namespace('/user', function(){
-      app.all('/:id', function(req, res, next){
-        id = req.params.id;
-        next();
-      });
-
-      app.get('/:id', function(req, res){
-        res.send('GET user ' + id);
-      });
-      
-      app.del('/:id', function(req, res){
-        res.send('DELETE user ' + id);
-      });
-    });
-    
-    app.get('/two', function(req, res){
+    app.get('/some/two', function(req, res){
       res.send('GET two');
     });
 
-    assert.response(app,
-      { url: '/user/12' },
-      { body: 'GET user 12' });
-  
-    assert.response(app,
-      { url: '/user/12', method: 'DELETE' },
-      { body: 'DELETE user 12' });
-    
-    assert.response(app,
-      { url: '/one' },
-      { body: 'GET one' });
-    
-    assert.response(app,
-      { url: '/two' },
-      { body: 'GET two' });
-  },
-  
-  'test app.namespace(str, fn) nesting': function(done){
-    var pending = 6
-      , calls = 0
-      , app = express();
-    
-    function finished() {
-      --pending || function(){
-        assert.equal(2, calls);
-        done();
-      }();
-    }
+    request(app)
+    .get('/one')
+    .expect('GET one', done);
 
-    function middleware(req, res, next) {
-      ++calls;
-      next();
-    }
+    request(app)
+    .get('/some/two')
+    .expect('GET two', done);
+  })
+
+  it('should prefix within .namespace()', function(done){
+    var app = express();
+    done = pending(4, done);
 
     app.get('/one', function(req, res){
       res.send('GET one');
     });
 
-    app.namespace('/forum/:id', function(){
+    app.namespace('/foo', function(){
       app.get('/', function(req, res){
-        res.send('GET forum ' + req.params.id);
-      });
-      
-      app.get('/edit', function(req, res){
-        res.send('GET forum ' + req.params.id + ' edit page');
+        res.send('foo');
       });
 
-      app.namespace('/thread', function(){
-        app.get('/:tid', middleware, middleware, function(req, res){
-          res.send('GET forum ' + req.params.id + ' thread ' + req.params.tid);
+      app.namespace('/baz', function(){
+        app.get('/', function(req, res){
+          res.send('GET baz');
         });
-      });
 
-      app.del('/', function(req, res){
-        res.send('DELETE forum ' + req.params.id);
+        app.del('/all', function(req, res){
+          res.send('DELETE all baz');
+        });
+      })
+
+      app.get('/bar', function(req, res){
+        res.send('bar');
       });
-    });
-    
-    app.get('/two', function(req, res){
+    })
+
+    app.get('/some/two', function(req, res){
       res.send('GET two');
     });
 
-    assert.response(app,
-      { url: '/forum/1' },
-      { body: 'GET forum 1' }
-      , finished);
-    
-    assert.response(app,
-      { url: '/forum/1/edit' },
-      { body: 'GET forum 1 edit page' }
-      , finished);
-    
-    assert.response(app,
-      { url: '/forum/1/thread/50' },
-      { body: 'GET forum 1 thread 50' }
-      , finished);
-  
-    assert.response(app,
-      { url: '/forum/2', method: 'DELETE' },
-      { body: 'DELETE forum 2' }
-      , finished);
-    
-    assert.response(app,
-      { url: '/one' },
-      { body: 'GET one' }
-      , finished);
-    
-    assert.response(app,
-      { url: '/two' },
-      { body: 'GET two' }
-      , finished);
-  },
-  
-  'test fn.route': function(){
-    var app = express();
+    request(app)
+    .get('/foo/baz')
+    .expect('GET baz', done);
 
-    app.namespace('/user/:id', function(){
-      app.get('/', function handler(req, res){
-        assert.equal('/user/:id', handler.namespace);
-        res.send(200);
-      });
-    });
+    request(app)
+    .del('/foo/baz/all')
+    .expect('DELETE all baz', done);
 
-    assert.response(app,
-      { url: '/user/12' },
-      { body: 'OK' });
-  },
-  'test app.namespace(str, middleware, fn)': function(done){
-    var app = express(),
-        calledA = 0,
-        calledB = 0;
-    
-    function middlewareA(req,res,next){
-      calledA++;
-      next();
-    }
+    request(app)
+    .get('/one')
+    .expect('GET one', done);
 
-    function middlewareB(req,res,next){
-      calledB++;
-      next();
-    }
+    request(app)
+    .get('/some/two')
+    .expect('GET two', done);
 
-    app.namespace('/user/:id', middlewareA, function(){
-      app.get('/', function(req,res){
-        res.send('got Home');
-      });
+    request(app)
+    .get('/foo')
+    .expect('foo', done);
 
-      app.get('/other', function(req,res){
-        res.send('got Other');
-      });
+    request(app)
+    .get('/foo/bar')
+    .expect('bar', done);
+  })
 
-      app.namespace('/nest', middlewareB, function(req,res){
-        app.get('/', function(req,res){
-          res.send('got Nest');
-        });
-      });
-    });
+  it('should support middleware', function(done){
+    var app = express();
 
-    var pending = 3;
-    function finished() {
-      --pending || function(){
-        assert.equal(3, calledA);
-        assert.equal(1, calledB);
-        done();
-      }();
+    function load(req, res, next) {
+      req.forum = { id: req.params.id };
+      next();
     }
 
-    assert.response(app,
-      { url: '/user/12' },
-      { body: 'got Home' }, 
-      finished);
-    assert.response(app,
-      { url: '/user/12/other' },
-      { body: 'got Other' },
-      finished);
-    assert.response(app,
-      { url: '/user/12/nest' },
-      { body: 'got Nest' },
-      finished);
-  }
-};
+    app.namespace('/forum/:id', load, function(){
+      app.get('/', function(req, res){
+        res.send('' + req.forum.id);
+      });
+    });
+
+    request(app)
+    .get('/forum/23')
+    .expect('23', done);
+  })
+})

test/support/pending.js

@@ -0,0 +1,7 @@
+
+module.exports = function(n, fn){
+  return function(err){
+    if (err) return fn(err);
+    --n || fn();
+  }
+};