Merge pull request #37 from micxjo/master

Fix for chained responses with newlines

Author: amstocker

ipfsApi/encoding.py

@@ -42,6 +42,8 @@ def parse(self, raw):
         results.append(obj)
         cur = idx
         while cur < len(json_string) - 1:
+            if json_string[cur] == '\n':
+                cur += 1
             obj, idx = self.decoder.raw_decode(json_string[cur:])
             results.append(obj)
             cur += idx

test/unit/test_encoding.py

@@ -25,6 +25,15 @@ def test_json_parse_chained(self):
         self.assertEqual(res[0]['key1'], 'value1')
         self.assertEqual(res[1]['key2'], 'value2')
 
+    def test_json_parse_chained_newlines(self):
+        data1 = {'key1': 'value1'}
+        data2 = {'key2': 'value2'}
+        res = self.encoder.parse(
+            json.dumps(data1) + '\n' + json.dumps(data2))
+        self.assertEqual(len(res), 2)
+        self.assertEqual(res[0]['key1'], 'value1')
+        self.assertEqual(res[1]['key2'], 'value2')
+
     def test_json_encode(self):
         data = {'key': 'value'}
         self.assertEqual(