.

lib/express/application.js

@@ -1,132 +0,0 @@
-
-/*!
- * Express - Application
- * Copyright(c) 2010 TJ Holowaychuk <tj@vision-media.ca>
- * MIT Licensed
- */
-
-/**
- * Module dependencies.
- */
-
-var sys = require('sys'),
-    connect = require('connect'),
-    rest = require('connect/providers/rest');
-
-/**
- * Initialize a new Application with optional middleware.
- *
- * @param {Array} middleware
- * @api public
- */
-
-var Application = exports.Application = function Application(middleware){
-    this.config = {};
-    this.settings = {};
-    this.routes = { get: [], post: [], put: [], del: []};
-    connect.Server.call(this, (middleware || []).concat([
-        { provider: 'rest', routes: this.routes }
-    ]));
-}
-
-sys.inherits(Application, connect.Server);
-
-/**
- * Listen on the given port after running configuration blocks.
- *
- * @param {Number} port
- * @api public
- */
-
-Application.prototype.listen = function(port){
-    var env = process.env.EXPRESS_ENV || process.connectEnv.name;
-    this.runConfig('any', env);
-    connect.Server.prototype.listen.call(this, port);
-};
-
-/**
- * Run config callbacks for the given environment(s);
- *
- * @param {String} env ...
- * @return {Application}
- * @api public
- */
-
-Application.prototype.runConfig = function(){
-    for (var i = 0, len = arguments.length; i < len; ++i) {
-        var env = arguments[i];
-        if (env in this.config) {
-            var config = this.config[env];
-            config.forEach(function(fn){
-                fn.call(this);
-            }, this);
-        }
-    }
-    return this;
-};
-
-
-/**
- * Assign setting a value
- *
- * @param {String} setting
- * @param {String} val
- * @return {Application}
- * @api public
- */
-
-Application.prototype.set = function(setting, val){
-    this.settings[setting] = val;
-    return this;
-};
-
-/**
- * Enable setting.
- *
- * @param {String} setting
- * @return {Application}
- * @api public
- */
-
-Application.prototype.enable = function(setting){
-    return this.set(setting, true);
-};
-
-/**
- * Disable setting.
- *
- * @param {String} setting
- * @return {Application}
- * @api public
- */
-
-Application.prototype.disable = function(setting){
-    return this.set(setting, false);
-};
-
-/**
- * Disable setting.
- *
- * @param {String} setting
- * @return {Application}
- * @api public
- */
-
-Application.prototype.configure = function(env, fn){
-    if (typeof env === 'function') fn = env, env = 'any';
-    (this.config[env] = this.config[env] || []).push(fn);
-};
-
-// Generate RESTful methods
-
-(function(method){
-    Application.prototype[method] = function(path, fn){
-        var routes = {};
-        routes[method] = {};
-        routes[method][path] = fn;
-        rest.normalize(routes);
-        this.routes[method] = this.routes[method].concat(routes[method]);
-        return this;
-    };
-    return arguments.callee;
-})('get')('post')('put')('del');

lib/express/index.js

@@ -10,3 +10,13 @@
  */
 
 exports.version = '0.14.0';
+
+/**
+ * Module dependencies.
+ */
+
+var Server = require('./server');
+
+exports.createServer = function(middleware){
+    return new Server(middleware);
+};

test/express.test.js

@@ -7,10 +7,14 @@ module.exports = {
         assert.ok(/^\d+\.\d+\.\d+$/.test(express.version), 'Test express.version format');
     },
     
-    'test basic app': function(){
+    'test inheritance': function(assert){
-        var app = express.createApplication();
+        var server = express.createServer();
-        var server = connect.createServer(app);
+        assert.ok(server instanceof connect.Server, 'Test serverlication inheritance');
-        app.get('/', function(req, res){
+    },
+    
+    'test basic server': function(assert){
+        var server = express.createServer();
+        server.get('/', function(req, res){
             res.writeHead(200, {});
             res.end('wahoo');
         });