--- a/simplewiki/dispatcher.py	Tue Sep 07 17:50:04 2010 -0700
+++ b/simplewiki/dispatcher.py	Tue Sep 07 18:11:04 2010 -0700
@@ -5,7 +5,7 @@
 
 import os
 
-from handlers import Index
+from handlers import GenshiRenderer
 
 from genshi.template import TemplateLoader
 from paste.fileapp import FileApp
@@ -17,8 +17,8 @@
     ### class level variables
     defaults = { 'auto_reload': 'False',
                  'template_dirs': '',
-                 'app': None,
-                 'name': 'anonymous' }
+                 'name': 'anonymous',
+                 'directory': None }
 
     def __init__(self, **kw):
 
@@ -27,12 +27,10 @@
             setattr(self, key, kw.get(key, self.defaults[key]))
         self.auto_reload = self.auto_reload.lower() == 'true'
 
-        # request handlers
-        self.handlers = [ Index ]
+        assert self.directory and os.path.exists(self.directory), "Must specify an existing directory"
 
-        # endpoint app if used as middleware
-        if self.app:
-            assert hasattr(self.app, '__call__')
+        # request handlers
+        self.handlers = [ GenshiRenderer ]
 
         # template loader
         self.template_dirs = self.template_dirs.split()
@@ -57,8 +55,6 @@
             if handler is not None:
                 break
         else:
-            if self.app:
-                return self.app(environ, start_response)
             handler = exc.HTTPNotFound
 
         # add navigation links to handler [example]