Merge pull request #11 from kou/http-load-post

Add support for loading data by POST in HTTP

Author: hhatto

poyonga/client.py

@@ -2,10 +2,15 @@
 import struct
 from ctypes.util import find_library
 from ctypes import Structure, pointer, c_long, CDLL
-from urllib.request import urlopen
+from urllib.request import Request, urlopen
 from urllib.error import HTTPError
 from urllib.parse import urlencode
 
+try:
+    import orjson as json
+except ImportError:
+    import json
+
 from poyonga.result import GroongaResult, GroongaSelectResult
 from poyonga.const import GQTP_HEADER_SIZE
 
@@ -99,8 +104,18 @@ def _call_gqtp(self, cmd, **kwargs):
     def _call_http(self, cmd, **kwargs):
         domain = [self.protocol, "://", self.host, ":", str(self.port), self.prefix_path]
         url = "".join(domain) + cmd
+        post_data = None
         if kwargs:
+            if cmd == "load" and "values" in kwargs:
+                post_data = kwargs.pop("values")
             url = "".join([url, "?", urlencode(kwargs)])
+        if post_data:
+            content_type = "application/json"
+            if isinstance(post_data, list):
+                post_data = json.dumps(post_data, indent=True)
+            if isinstance(post_data, str):
+                post_data = post_data.encode()
+            url = Request(url, post_data, {"content-type": content_type})
         try:
             _data = urlopen(url).read()
         except HTTPError as msg:

test/test_poyonga.py

@@ -1,3 +1,4 @@
+import io
 import json
 import struct
 import unittest
@@ -24,6 +25,52 @@ def test_json_result_with_http(self, mock_urlopen):
         self.assertEqual(type(ret), GroongaResult)
         self.assertEqual(ret.status, 0)
 
+    @patch("poyonga.client.urlopen")
+    def test_load_list(self, mock_urlopen):
+        m = Mock()
+        m.read.side_effect = ["[[0, 1337566253.89858, 0.000354], 1]"]
+        mock_urlopen.return_value = m
+        ret = self.g.call("load",
+                          table="Site",
+                          values=[{"_key": "groonga.org"}])
+        self.assertEqual(ret.body, 1)
+        request = mock_urlopen.call_args[0][0]
+        self.assertEqual([{"_key": "groonga.org"}],
+                         json.loads(request.data))
+        self.assertEqual({"Content-type": "application/json"},
+                         request.headers)
+
+    @patch("poyonga.client.urlopen")
+    def test_load_json(self, mock_urlopen):
+        m = Mock()
+        m.read.side_effect = ["[[0, 1337566253.89858, 0.000354], 1]"]
+        mock_urlopen.return_value = m
+        ret = self.g.call("load",
+                          table="Site",
+                          values=json.dumps([{"_key": "groonga.org"}]))
+        self.assertEqual(ret.body, 1)
+        request = mock_urlopen.call_args[0][0]
+        self.assertEqual([{"_key": "groonga.org"}],
+                         json.loads(request.data))
+        self.assertEqual({"Content-type": "application/json"},
+                         request.headers)
+
+    @patch("poyonga.client.urlopen")
+    def test_load_io(self, mock_urlopen):
+        m = Mock()
+        m.read.side_effect = ["[[0, 1337566253.89858, 0.000354], 1]"]
+        mock_urlopen.return_value = m
+        json_values = json.dumps([{"_key": "groonga.org"}])
+        ret = self.g.call("load",
+                          table="Site",
+                          values=io.BytesIO(json_values.encode()))
+        self.assertEqual(ret.body, 1)
+        request = mock_urlopen.call_args[0][0]
+        self.assertEqual([{"_key": "groonga.org"}],
+                         json.loads(request.data.read()))
+        self.assertEqual({"Content-type": "application/json"},
+                         request.headers)
+
 
 class PoyongaGQTPTestCase(unittest.TestCase):
     def setUp(self):