writing test for session and APIHandler

waterspout/tests/test_handler.py

@@ -19,16 +19,25 @@ def post(self):
 
 class APIHandler(APIHandler):
     def post(self):
-        self.write('success')
+        self.write({'name': 'whtsky'})
+
 
+class SessionHandler(RequestHandler):
+    def get(self):
+        self.session["name"] = "whtsky"
+        self.session.miao = "wang"
+
+        assert not self.session.a
+        assert not self.session["b"]
 
 handlers = [
     ('/', HelloWorldHandler),
     ('/post', PostHandler),
-    ('/api', APIHandler)
+    ('/api', APIHandler),
+    ('/session', SessionHandler)
 ]
 
-application = Application(__name__, handlers=handlers)
+application = Application(__name__, handlers=handlers, cookie_secret="..")
 
 
 def test_test():
@@ -37,6 +46,11 @@ def test_test():
     assert body == to_unicode(body)
 
 
+def test_session():
+    client = application.TestClient()
+    assert client.get('/session').code == 200
+
+
 def test_route():
     client = application.TestClient()
     assert client.get('/').body == 'Hello World'
@@ -55,3 +69,10 @@ def test_csrf():
     client = application.TestClient()
     assert client.post('/post', body='..').code == 403
     assert client.post('/api', body='..').code == 200
+
+
+def test_api():
+    client = application.TestClient()
+    assert client.post('/api', body='..').body == '{"name": "whtsky"}'
+    assert client.post('/api?callback=note', body='..').body == \
+           'note({"name": "whtsky"});'

waterspout/web.py

@@ -57,11 +57,17 @@ def post(self):
         """
         if not hasattr(self, '_session'):
             class Session(object):
-                def __getattr__(s, name):
+                def __getitem__(_, name):
                     return self.get_secure_cookie(name)
 
-                def __setattr__(s, name, value):
-                    return self.set_secure_cookie(name, value)
+                def __getattr__(self, name):
+                    return self[name]
+
+                def __setitem__(_, key, value):
+                    self.set_secure_cookie(key, value)
+
+                def __setattr__(self, name, value):
+                    self[name] = value
             self._session = Session()
 
         return self._session
@@ -138,7 +144,7 @@ def write(self, chunk, callback=None):
             if callback is None:
                 callback = self.get_argument('callback', None)
             if callback:
-                chunk = "%s(%s)" % (callback, tornado.escape.to_unicode(chunk))
+                chunk = "%s(%s);" % (callback, tornado.escape.to_unicode(chunk))
                 self.set_header("Content-Type",
                                 "application/javascript; charset=UTF-8")
             else: