# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1294280767 28800
# Node ID 1b9573832f336997f829046f682b7bfba1152a4f
# Parent  e8d5782f6678786c0418de43fda7e0cd6a963f01
clean up the dispatcher code

diff -r e8d5782f6678 -r 1b9573832f33 makeitso/dispatcher.py
--- a/makeitso/dispatcher.py	Wed Jan 05 18:18:26 2011 -0800
+++ b/makeitso/dispatcher.py	Wed Jan 05 18:26:07 2011 -0800
@@ -1,29 +1,20 @@
 """
-request dispatcher:
-data persisting across requests should go here
+request dispatcher for MakeItSo!
 """
 
+import sys
 from handlers import Index
 from webob import Request, Response, exc
 
 class Dispatcher(object):
 
     ### class level variables
-    defaults = { 'app': None, }
 
     def __init__(self, **kw):
 
-        # set instance parameters from kw and defaults
-        for key in self.defaults:
-            setattr(self, key, kw.get(key, self.defaults[key]))
-
         # request handlers
         self.handlers = [ Index ]
 
-        # endpoint app if used as middleware
-        if self.app:
-            assert hasattr(self.app, '__call__')
-
     def __call__(self, environ, start_response):
 
         # get a request object
@@ -41,10 +32,25 @@
             if handler is not None:
                 break
         else:
-            if self.app:
-                return self.app(environ, start_response)
             handler = exc.HTTPNotFound
 
         # get response
         res = handler()
         return res(environ, start_response)
+
+if __name__ == '__main__':
+    from optparse import OptionParser
+    from wsgiref import simple_server
+
+    # parse command line options
+    parser = OptionParser()
+    parser.add_option('-p', '--port', dest='port', default=8080, type='int',
+                      help='port to serve on')
+    options, args = parser.parse_args()
+
+    # create an app
+    app = Dispatcher()
+
+    # serve it!
+    server = simple_server.make_server(host=host, port=options.port, app=app)
+    server.serve_forever()