Add toDict and toJson for queries and headers

Author: MegatronKing

reqable/reqable.py

@@ -189,9 +189,20 @@ def concat(self, encode: bool = True) -> str:
 
   # Get all query paramaters.
   @property
-  def entries(self) -> List[Tuple[str, str]]:
+  def entries(self) -> List[str]:
     return self._entries
 
+  # Convert the query paramaters to a dict.
+  def toDict(self) -> Dict[str, str]:
+    map = {}
+    for entry in self.entries:
+      map[entry[0]] = entry[1]
+    return map
+
+  # Convert the query paramaters to a json str.
+  def toJson(self) -> str:
+    return json.dumps(self.toDict())
+
   def serialize(self) -> str:
     return self.concat()
 
@@ -285,6 +296,18 @@ def clear(self):
   def entries(self) -> List[str]:
     return self._entries
 
+  # Convert the headers to a dict.
+  def toDict(self) -> Dict[str, str]:
+    map = {}
+    for entry in self.entries:
+      name, value = entry.split(': ')
+      map[name] = value
+    return map
+
+  # Convert the headers to a json str.
+  def toJson(self) -> str:
+    return json.dumps(self.toDict())
+
   def serialize(self) -> List[str]:
     return self._entries
 

test/reqable_header_test.py

@@ -175,5 +175,17 @@ def testHttpHeadersCasesensive(self):
     self.assertEqual(headers['abc'], '123')
     self.assertEqual(headers['hello'], 'WORLD')
 
+  def testHttpHeadersDict(self):
+    headers = CaptureHttpHeaders([
+      'foo: bar',
+      'abc: 123',
+      'hello: world',
+      'hello: '
+    ])
+    d = headers.toDict()
+    self.assertEqual(d['foo'], 'bar')
+    self.assertEqual(d['abc'], '123')
+    self.assertEqual(d['hello'], '')
+
 if __name__ == '__main__':
   unittest.main()

test/reqable_query_test.py

@@ -137,5 +137,12 @@ def testHttpQueriesConcat(self):
     self.assertEqual(queries.concat(encode=True), 'foo=bar&abc=123&url=https%3A%2F%2Freqable.com')
     self.assertEqual(queries.concat(encode=False), 'foo=bar&abc=123&url=https://reqable.com')
 
+  def testHttpQueriesDict(self):
+    queries = CaptureHttpQueries.parse('foo=bar&abc=123&hello=world&hello=')
+    d = queries.toDict()
+    self.assertEqual(d['foo'], 'bar')
+    self.assertEqual(d['abc'], '123')
+    self.assertEqual(d['hello'], '')
+
 if __name__ == '__main__':
   unittest.main()