Fix the charset

[fwx] / src / fwx / __init__.py

diff --git a/src/fwx/__init__.py b/src/fwx/__init__.py
index c7d6442..2cbe707 100644 (file)
--- a/src/fwx/__init__.py
+++ b/src/fwx/__init__.py
@@ -8,6 +8,7 @@ _Request = collections.namedtuple(
     (
         'env',
         'GET',
+        'POST',
         'accept',
         'accept_encoding',
         'accept_language',
@@ -24,7 +25,10 @@ _Request = collections.namedtuple(
 )
 
 class Request(_Request):
-    def __new__(cls, env, **kwargs):
+    def __new__(cls, method, path, env=None):
+        if env is None:
+            env = {}
+
         errors = []
 
         accept = env.get('HTTP_ACCEPT')
@@ -32,8 +36,6 @@ class Request(_Request):
         accept_language = env.get('HTTP_ACCEPT_LANGUAGE')
         content = env.get('CONTENT', '')
         content_type = env.get('CONTENT_TYPE')
-        method = env.get('REQUEST_METHOD')
-        path = env.get('PATH_INFO')
         query = env.get('QUERY_STRING')
         user_agent = env.get('HTTP_USER_AGENT')
 
@@ -53,17 +55,31 @@ class Request(_Request):
         except:
             cookie = http.cookies.SimpleCookie()
 
-
         try:
             GET = urllib.parse.parse_qs(query)
         except:
             GET = {}
             errors.append('Unable to parse GET parameters from query string "{}"'.format(query))
 
+        if method == 'POST':
+            try:
+                if content_type == 'application/x-www-form-urlencoded':
+                    POST = urllib.parse.parse_qs(content)
+                else:
+                    POST = {}
+                    errors.append('Unable to parse POST parameters from content string "{}"'.format(content))
+
+            except:
+                POST = {}
+                errors.append('Unable to parse POST parameters from content string "{}"'.format(content))
+
+        else:
+            POST = {}
+
         if method == 'GET':
             parameters = GET
         elif method == 'POST':
-            raise Exception('not yet implemented')
+            parameters = POST
         else:
             parameters = None
 
@@ -71,6 +87,7 @@ class Request(_Request):
             cls,
             env=env,
             GET=GET,
+            POST=POST,
             accept=accept,
             accept_encoding=accept_encoding,
             accept_language=accept_language,
@@ -93,7 +110,9 @@ class Request(_Request):
         return result
 
 def _get_request_from_env(env):
-    return Request(env)
+    method = env.get('REQUEST_METHOD')
+    path = env.get('PATH_INFO')
+    return Request(method, path, env)
 
 _Response = collections.namedtuple(
     'Response',
@@ -113,8 +132,8 @@ class Response(_Response):
         content_type = kwargs.pop('content_type')
         assert isinstance(content_type, str)
 
-        extra_headers = kwargs.pop('extra_headers', ())
-        assert isinstance(extra_headers, tuple)
+        extra_headers = kwargs.pop('extra_headers', {})
+        assert isinstance(extra_headers, dict)
 
         assert len(kwargs) == 0
 
@@ -128,9 +147,25 @@ class Response(_Response):
 
     @property
     def headers(self):
-        return (
-            ('Content-Type', self.content_type),
-        )
+        # Start with the defaults
+        result = {
+            'X-Content-Type-Options': 'nosniff',
+        }
+
+        result = {**result, **(self.extra_headers)}
+
+        builtin_headers = {
+            'Content-Type': self.content_type,
+        }
+
+        for key, value in builtin_headers.items():
+            if key in result:
+                raise Exception('Header "{}" defined twice'.format(key))
+            else:
+                result[key] = value
+
+        return tuple(sorted(result.items()))
+
 
 class HTMLResponse(Response):
     def __new__(cls, content, **kwargs):
@@ -139,7 +174,7 @@ class HTMLResponse(Response):
         return super().__new__(
             cls,
             content,
-            content_type='text/html',
+            content_type='text/html; charset=utf-8',
             **kwargs,
         )
 
@@ -151,7 +186,7 @@ class JSONResponse(Response):
         self = super().__new__(
             cls,
             content=json.dumps(content_json),
-            content_type='application/json',
+            content_type='application/json; charset=utf-8',
             **kwargs,
         )
         self.content_json = content_json
@@ -164,7 +199,7 @@ class TextResponse(Response):
         return super().__new__(
             cls,
             content,
-            content_type='text/plain',
+            content_type='text/plain; charset=utf-8',
             **kwargs,
         )
 
@@ -203,12 +238,15 @@ class RedirectResponse(_RedirectResponse):
         return (b'',)
 
 def default_file_not_found_handler(request):
-    return Response('', status=404)
+    return TextResponse(
+        'Path "{}" with query "{}" not found'.format(request.path, request.query),
+        status=404,
+    )
 
 def route_on_subpath(**kwargs):
     routes = kwargs.pop('routes')
     file_not_found_handler = kwargs.pop(
-        'file_not_found_hanlder',
+        'file_not_found_handler',
         default_file_not_found_handler,
     )
 
@@ -244,7 +282,7 @@ REQUEST_METHODS = (
 )
 
 def default_method_not_allowed_handler(request):
-    return Response('')
+    return TextResponse('', status=405)
 
 def default_options_handler(handlers):
     def handler(request):
@@ -277,9 +315,42 @@ def route_on_method(**kwargs):
 
 def _get_status(response):
     return {
+        100: '100 Continue',
+        101: '101 Switching Protocols',
         200: '200 OK',
+        201: '201 Created',
+        202: '202 Accepted',
+        203: '203 Non-Authoritative Information',
+        204: '204 No Content',
+        205: '205 Reset Content',
+        300: '300 Multiple Choices',
+        301: '301 Moved Permanently',
+        304: '304 Not Modified',
         307: '307 Temporary Redirect',
         308: '308 Permanent Redirect',
+        400: '400 Bad Request',
+        401: '401 Unauthorized',
+        402: '402 Payment Required',
+        403: '403 Forbidden',
+        404: '404 Not Found',
+        405: '405 Method Not Allowed',
+        406: '406 Not Acceptable',
+        409: '409 Conflict',
+        410: '410 Gone',
+        411: '411 Length Required',
+        412: '412 Precondition Failed',
+        413: '413 Payload Too Large',
+        414: '414 URI Too Long',
+        415: '415 Unsupported Media Type',
+        416: '416 Range Not Satisfiable',
+        417: '417 Expectation Failed',
+        418: "418 I'm a teapot",
+        429: '429 Too Many Requests',
+        431: '431 Request Header Fields Too Large',
+        451: '451 Unavailable For Legal Reasons',
+        500: '500 Internal Server Error',
+        501: '501 Not Implemented',
+        503: '503 Service Unavailable',
     }[response.status]
 
 def _get_headers(response):