[merge] Merged in flatiron refactor

Author: Marak

README.md

@@ -20,6 +20,8 @@ This will install `http-server` globally so that it may be run from the command
 
      http-server [path] [options]
 
+`[path]` defaults to `./public` if the folder exists, and `./` otherwise.
+
 # Installing as a node app
 
      mkdir myapp

bin/http-server

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
 
-var HTTPServer = require('../lib/http-server');
-
-var httpServer = new HTTPServer();
+var httpServer = require('../lib/http-server');
 
 httpServer.start();
 

lib/http-server.js

@@ -1,74 +1,23 @@
-/*
- *
- * http-server.js - A simple static HTTP server.
- *
- * (c) 2011 Nodejitsu Inc.
- *
- */
-
-var colors = require('colors'),
+var flatiron = require('flatiron'),
+    path = require('path'),
     argv = require('optimist').argv,
-    static = require('node-static'),
-    fs = require("fs");
-    http = require('http');
+    colors = require('colors'),
+    ecstatic = require('ecstatic'),
+    app = flatiron.app;
 
-var HTTPServer = module['exports'] = function (options) {
-  this.root = argv._[0] || "./public";
-  this.port = argv.p || 8080;
-  this.host = argv.a || 'localhost';
-  this.cache = argv.c || 3600;
-  this.autoIndex = argv.i || true;
-  this.silent = argv.s || argv.silent || false;
-  for (var o in options) {
-    this[o] = options[o];
-  }
-  this.file = new(static.Server)(this.root, { autoIndex: this.autoIndex, cache: Number(this.cache) });
-}
+var server = module.exports;
 
-
-HTTPServer.prototype.start = function () {
-  var self = this;
-  if (argv.h || argv.help) {
-    return showHelp();
-  }
-  self.log('Starting up http-server, serving '.yellow
-            + self.root.cyan
-            + ' on port: '.yellow
-            + self.port.toString().cyan);
-  self.server = http.createServer(function(request, response) {
-    request.on('end', function() {
-      self.log('['.grey+'served'.yellow+'] '.grey + request.url);
-      return self.file.serve(request, response, function (err, result) {
-        if (err && err.status == 404) {
-          // Catch case where there is no 404 file
-          fs.stat(self.root + "/404.html", function (err, stat) {
-            if (!err && stat.isFile()) {
-              self.file.serveFile("/404.html", err.status, {}, request, response);
-            } else {
-              response.writeHead(404);
-              response.end();
-            }
-          });
-        }
-      });
-    });
-  });
-  self.server.listen(self.port);
-  self.log('http-server successfully started: '.green
-            + 'http://'.cyan
-            + self.host.cyan
-            + ':'.cyan
-            + self.port.toString().cyan);
-  self.log('Hit CTRL-C to stop the server')
-}
-
-HTTPServer.prototype.log = function (message) {
-  if (!this.silent) {
-    console.log(message);
-  }
+var opts = {
+  root: argv._[0] || (path.existsSync("./public") ? "./public" : "./"),
+  port: argv.p || 8080,
+  host: argv.a || 'localhost',
+  cache: argv.c || 3600, // in seconds.
+  autoIndex: argv.i || true,
+  silent: argv.s || argv.silent || false,
+  help: argv.h || argv.help
 }
 
-function showHelp() {
+var showHelp = function () {
   var help = [
       "usage: http-server [path] [options]",
       "",
@@ -81,3 +30,46 @@ function showHelp() {
   ].join('\n');
   console.log(help);
 }
+
+server.start = function (overrides) {
+  if (overrides) {
+    Object.keys(overrides).forEach(function (k) {
+      opts[k] = overrides[k];
+    });
+  }
+
+  if (opts.help) {
+    return showHelp();
+  }
+
+  server.log('Starting up http-server, serving '.yellow
+    + opts.root.cyan
+    + ' on port: '.yellow
+    + opts.port.toString().cyan);
+
+
+  //TODO: Add 404 file behavior to ecstatic, make configurable
+  app.use(flatiron.plugins.http, {
+    before: [
+      ecstatic(opts.root, {
+        autoIndex: opts.autoIndex,
+        cache: opts.cache
+      })
+    ]
+  });
+
+  app.init(app.start.bind(app, opts.port, opts.host));
+
+  server.log('http-server successfully started: '.green
+            + 'http://'.cyan
+            + opts.host.cyan
+            + ':'.cyan
+            + opts.port.toString().cyan);
+  server.log('Hit CTRL-C to stop the server');
+}
+
+server.log = function (message) {
+  if (!opts.silent) {
+    console.log(message);
+  }
+}