100 percent coverage

nanohttp/response.py

@@ -36,10 +36,8 @@ def conclude(self):
         if self.charset:
             body = [i.encode(self.charset) for i in body]
 
-        if self.length is not None:
-            contentlength = self.length
-        else:
-            contentlength = sum(len(i) for i in body)
+        contentlength = self.length if self.length is not None \
+            else sum(len(i) for i in body)
 
         self.headers.add('content-length', str(contentlength))
 

nanohttp/static.py

@@ -1,6 +1,8 @@
 from os import path
 from mimetypes import guess_type
 
+from . import statuses
+
 
 CHUNKSIZE = 1024 * 10
 
@@ -27,7 +29,7 @@ def get(location):
         filename = path.join(rootpath, location)
 
         if not path.exists(filename):
-            raise notfound()
+            raise statuses.notfound()
 
         app.response.length = path.getsize(filename)
         app.response.type = guess_type(path.split(filename)[1])[0]

tests/test_static.py

@@ -1,6 +1,6 @@
 from os import path
 
-from bddrest import status, response
+from bddrest import status, response, when
 
 from nanohttp import static
 
@@ -32,3 +32,11 @@ def test_staticdirectory(app, session, when, tmpdir):
         assert response.headers['content-length'] == '3'
         assert response == 'foo'
 
+        when('/invalidfile')
+        assert status == 404
+
+        when('/invalid/file')
+        assert status == 404
+
+        when('/invalid/file.html')
+        assert status == 404