Static file and static directory

nanohttp/application.py

@@ -7,7 +7,7 @@
 
 import pymlconf
 
-from . import statuses
+from . import statuses, static
 from .request import Request
 from .response import Response
 
@@ -107,3 +107,9 @@ def request(self):
     def response(self):
         return self.threadlocal.response
 
+    def staticfile(self, pattern, filename):
+        return self.route(pattern)(static.file(self, filename))
+
+    def staticdirectory(self, directory):
+        return self.route(r'/(.*)')(static.directory(self, directory))
+

nanohttp/static.py

@@ -22,12 +22,13 @@ def get():
     return get
 
 
-def serverfile(filename):
-    raise NotImplementedError()
+def directory(app, rootpath):
+    def get(location):
+        filename = path.join(rootpath, location)
 
+        if not path.exists(filename):
+            raise notfound()
 
-def directory(app, rootpath):
-    def get():
         app.response.length = path.getsize(filename)
         app.response.type = guess_type(path.split(filename)[1])[0]
         with open(filename, 'rb') as f:
@@ -38,4 +39,5 @@ def get():
 
                 yield chunk
 
+
     return get

tests/test_static.py

@@ -10,9 +10,7 @@ def test_staticfile(app, session, when, tmpdir):
     with open(indexfilename, 'w') as f:
         f.write('foo')
 
-    indexfile = static.file(app, indexfilename)
-
-    app.route(r'/a\.txt')(indexfile)
+    app.staticfile(r'/a\.txt', indexfilename)
 
     with session(app, '/a.txt'):
         assert status == 200
@@ -26,9 +24,7 @@ def test_staticdirectory(app, session, when, tmpdir):
     with open(indexfilename, 'w') as f:
         f.write('foo')
 
-    handler = static.directory(app, tmpdir)
-
-    app.route(r'/(.*)')(handler)
+    app.staticdirectory(tmpdir)
 
     with session(app, '/index.txt'):
         assert status == 200