Merge lp:~terrycojones/txfluiddb/fix-tag-value-get-error into lp:txfluiddb

[Terry Jones]

[Tristan Seligmann (mithrandi)]

review: Approve

=== modified file 'txfluiddb/client.py'
--- txfluiddb/client.py	2010-01-17 19:11:05 +0000
+++ txfluiddb/client.py	2010-01-28 16:32:19 +0000
@@ -543,7 +543,7 @@
     def getTagValue(self, url):
         def _parse((status, headers, page)):
             # Let this raise a KeyError if there's no content-type header?
-            ct = headers['content-type']
+            ct = headers['content-type'][0]
             if ct == PRIMITIVE_CONTENT_TYPE:
                 return json.loads(page)
             else:

=== modified file 'txfluiddb/http.py'
--- txfluiddb/http.py	2010-01-17 19:11:05 +0000
+++ txfluiddb/http.py	2010-01-28 16:32:19 +0000
@@ -27,12 +27,14 @@
 
 class HTTPClientFactory(client.HTTPClientFactory):
     protocol = HTTPPageGetter
+
         
     def page(self, page):
         if self.waiting:
             self.waiting = 0
             self.deferred.callback((self.status, self.response_headers, page))
 
+
     def noPage(self, reason):
         if self.waiting:
             self.waiting = 0

=== modified file 'txfluiddb/test/test_client.py'
--- txfluiddb/test/test_client.py	2010-01-17 19:11:05 +0000
+++ txfluiddb/test/test_client.py	2010-01-28 16:32:19 +0000
@@ -474,9 +474,11 @@
         return d
 
 
-class TagValueTests(TestCase):
+class TagValuesTests(TestCase):
     """
-    Tests for L{TagValues}.
+    Tests for L{TagValues}.  Note that these are tests on the permissions
+    associated with a set of tag values. For tests on individual tag values
+    on objects, see the ObjectTests class.
     """
     def setUp(self):
         self.endpoint = MockEndpoint('http://fluiddb.url/')
@@ -656,7 +658,7 @@
         """
         value, contentType = response
         self.endpoint.response = value
-        self.endpoint.responseHeaders = { 'content-type' : contentType, }
+        self.endpoint.responseHeaders = { 'content-type' : [ contentType ], }
         obj = Object(u'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx')
         tag = Namespace(u'test').child(u'tag')
         d = obj.get(self.endpoint, tag)
@@ -690,6 +692,47 @@
         return self.makeGetRequest(response).addCallback(_gotResponse)
 
 
+    def test_getNone(self):
+        """
+        Retrieving a None value results in None.
+        """
+        response = (json.dumps(None), 'application/vnd.fluiddb.value+json')
+        def _gotResponse(response):
+            self.assertEqual(response, None)
+        return self.makeGetRequest(response).addCallback(_gotResponse)
+
+
+    def test_getTrue(self):
+        """
+        Retrieving a True value results in True.
+        """
+        response = (json.dumps(True), 'application/vnd.fluiddb.value+json')
+        def _gotResponse(response):
+            self.assertEqual(response, True)
+        return self.makeGetRequest(response).addCallback(_gotResponse)
+
+
+    def test_getFalse(self):
+        """
+        Retrieving a False value results in False.
+        """
+        response = (json.dumps(False), 'application/vnd.fluiddb.value+json')
+        def _gotResponse(response):
+            self.assertEqual(response, False)
+        return self.makeGetRequest(response).addCallback(_gotResponse)
+
+
+    def test_getStringSet(self):
+        """
+        Retrieving a set of strings results in the set of strings.
+        """
+        s = ['this', 'is', 'a', 'set', 'of', 'strings']
+        response = (json.dumps(s), 'application/vnd.fluiddb.value+json')
+        def _gotResponse(response):
+            self.assertEqual(sorted(response), sorted(s))
+        return self.makeGetRequest(response).addCallback(_gotResponse)
+
+
     def test_getBlob(self):
         """
         Retrieving a binary value results in a C{Blob} object.