#39 - Let's discuss the approach and tests

rejson/__init__.py

@@ -120,6 +120,6 @@ def decode(self, obj):
 obj = rj.jsonget('custom', Path.rootPath())
 ```
 """
-__version__ = "0.5.4"
+__version__ = "0.6.0-alpha"
 from .client import Client
 from .path import Path

rejson/client.py

@@ -1,6 +1,7 @@
 import six
 import json
 from redis import StrictRedis
+import redis.client as rc
 from redis.client import Pipeline
 from redis._compat import (long, nativestr)
 from .path import Path
@@ -24,7 +25,7 @@ def _f(b):
     return _f
 
 
-class Client(StrictRedis):
+class Client():
     """
     This class subclasses redis-py's `StrictRedis` and implements ReJSON's
     commmands (prefixed with "json").
@@ -37,8 +38,9 @@ class Client(StrictRedis):
     _encode = None
     _decoder = None
     _decode = None
+    _client = None
 
-    def __init__(self, encoder=None, decoder=None, *args, **kwargs):
+    def __init__(self, client=None, encoder=None, decoder=None, *args, **kwargs):
         """
         Creates a new ReJSON client.
 
@@ -47,7 +49,10 @@ def __init__(self, encoder=None, decoder=None, *args, **kwargs):
         """
         self.setEncoder(encoder)
         self.setDecoder(decoder)
-        StrictRedis.__init__(self, *args, **kwargs)
+        if client is None:
+            self.setClient(StrictRedis(*args, **kwargs))
+        else:
+            self.setClient(client)
 
         # Set the module commands' callbacks
         MODULE_CALLBACKS = {
@@ -68,8 +73,47 @@ def __init__(self, encoder=None, decoder=None, *args, **kwargs):
                 'JSON.OBJLEN': long,
         }
         for k, v in six.iteritems(MODULE_CALLBACKS):
-            self.set_response_callback(k, v)
-
+            self.client.set_response_callback(k, v)
+
+    #######################################################################
+    # TODO - see if this pass-through stuff can be simplified
+    @property
+    def client(self):
+        return self._client
+
+    def execute_command(self, *args, **kwargs):
+        return self.client.execute_command(*args, **kwargs)
+
+    def exists(self, *args, **kwargs):
+        return self.client.exists(*args, **kwargs)
+
+    def get(self, *args, **kwargs):
+        return self.client.get(*args, **kwargs)
+
+    @property
+    def connection_pool(self):
+        return self.client.connection_pool
+
+    @connection_pool.setter
+    def connection_pool(self, new_value):
+        self.client.connection_pool = new_value
+
+    @property
+    def response_callbacks(self):
+        return self.client.response_callbacks
+
+    @response_callbacks.setter
+    def response_callbacks(self, new_value):
+        self.client.response_callbacks = new_value
+
+    def flushdb(self):
+        self.client.flushdb()
+
+    #######################################################################
+
+    def setClient(self, client):
+        self._client = client
+
     def setEncoder(self, encoder):
         """
         Sets the client's encoder
@@ -258,6 +302,7 @@ def pipeline(self, transaction=True, shard_hint=None):
         Overridden in order to provide the right client through the pipeline.
         """
         p = Pipeline(
+            client=self.client,
             connection_pool=self.connection_pool,
             response_callbacks=self.response_callbacks,
             transaction=transaction,
@@ -266,5 +311,11 @@ def pipeline(self, transaction=True, shard_hint=None):
         p.setDecoder(self._decoder)
         return p
 
+
 class Pipeline(Pipeline, Client):
     "Pipeline for ReJSONClient"
+
+    def __init__(self, client=None, *args, **kwargs):
+        Client.__init__(self, client=client)
+        rc.Pipeline.__init__(self, *args, **kwargs)
+

tests/test_rejson.py

@@ -1,3 +1,4 @@
+import os
 import six
 import json
 import unittest
@@ -6,15 +7,29 @@
 
 rj = None
 port = 6379
-
+REDIS_CLUSTER_HOST = os.getenv("REDIS_HOST")
+REDIS_CLUSTER_PORT = os.getenv("REDIS_PORT")
 
 class ReJSONTestCase(TestCase):
 
+    def _create_client(self, *args, **kwargs):
+        if REDIS_CLUSTER_HOST is None or \
+           REDIS_CLUSTER_PORT is None:
+            return Client(*args, **kwargs)
+        else:
+            from rediscluster import RedisCluster
+            startup_nodes = [{"host": REDIS_CLUSTER_HOST,
+                              "port": REDIS_CLUSTER_PORT}]
+            conn = RedisCluster(startup_nodes=startup_nodes, decode_responses=True)
+            return Client(client=conn, *args, **kwargs)
+
+
     def setUp(self):
         global rj
-        rj = Client(port=port, decode_responses=True)
+        rj = self._create_client(port=port, decode_responses=True)
         rj.flushdb()
 
+
     def testJSONSetGetDelShouldSucceed(self):
         "Test basic JSONSet/Get/Del"
 
@@ -197,7 +212,7 @@ def decode(self, obj):
                     return CustomClass(k=s[1], v=s[2])
                 return d
 
-        rj = Client(encoder=TestEncoder(), decoder=TestDecoder(),
+        rj = self._create_client(encoder=TestEncoder(), decoder=TestDecoder(),
                     port=port, decode_responses=True)
         rj.flushdb()
 
@@ -219,7 +234,7 @@ def testUsageExampleShouldSucceed(self):
         "Test the usage example"
 
         # Create a new rejson-py client
-        rj = Client(host='localhost', port=port, decode_responses=True)
+        rj = self._create_client(host='localhost', port=port, decode_responses=True)
 
         # Set the key `obj` to some object
         obj = {