Merge branch 'master' into API_documentation

Author: swilly22

pyproject.toml

@@ -25,6 +25,7 @@ repository = "https://github.com/RedisGraph/redisgraph-py"
 [tool.poetry.dependencies]
 python = "^3.6"
 redis = "^3.5.3"
+hiredis = "^2.0.0"
 prettytable = "^2.1.0"
 
 [tool.poetry.dev-dependencies]

redisgraph/graph.py

@@ -10,7 +10,7 @@ class Graph:
     Graph, collection of nodes and edges.
     """
 
-    def __init__(self, name, redis_con):
+    def __init__(self, name, redis_con=None, host='localhost', port=6379, password=None):
         """
         Create a new graph.
 
@@ -19,7 +19,11 @@ def __init__(self, name, redis_con):
             redis_con: connection to Redis
         """
         self.name = name                 # Graph key
-        self.redis_con = redis_con
+        if redis_con is not None:
+            self.redis_con = redis_con
+        else:
+            self.redis_con = redis.Redis(host, port, password=password)
+
         self.nodes = {}
         self.edges = []
         self._labels = []                # List of node labels.

redisgraph/util.py

@@ -27,10 +27,4 @@ def quote_string(v):
 
     v = v.replace('"', '\\"')
 
-    if v[0] != '"':
-        v = '"' + v
-
-    if v[-1] != '"':
-        v = v + '"'
-
-    return v
+    return '"{}"'.format(v)

tests/functional/test_all.py

@@ -46,6 +46,19 @@ def test_graph_creation(self):
         # All done, remove graph.
         redis_graph.delete()
 
+    def test_graph_connection(self):
+        connections = len(self.r.client_list())
+        redis_graph = Graph('social', self.r)
+        del redis_graph
+        self.assertTrue(self.r.ping())
+        self.assertTrue(len(self.r.client_list()) == connections)
+
+        new_graph = Graph('social-new')
+        self.assertTrue(new_graph.redis_con.ping())
+        self.assertTrue(len(self.r.client_list()) == connections + 1)
+        del new_graph
+        self.assertTrue(len(self.r.client_list()) == connections)
+
     def test_array_functions(self):
         redis_graph = Graph('social', self.r)
 

tests/unit/test_util.py

@@ -14,4 +14,6 @@ def test_quote_string(self):
         self.assertEqual(util.quote_string(10), 10)
         self.assertEqual(util.quote_string("abc"), '"abc"')
         self.assertEqual(util.quote_string(""), '""')
+        self.assertEqual(util.quote_string('\"'), '"\\\""')
+        self.assertEqual(util.quote_string('"'), '"\\""')
         self.assertEqual(util.quote_string('a"a'), '"a\\"a"')