Tidies up

Author: itamarhaber

README.md

@@ -21,22 +21,26 @@ from rejson import Client, Path
 rj = Client(host='localhost', port=6379)
 
 # Set the key `obj` to some object
-rj.JSONSet('obj', Path.rootPath(), {
+obj = {
     'answer': 42,
     'arr': [None, True, 3.14],
     'truth': {
         'coord': 'out there'
     }
-})
+}
+rj.JSONSet('obj', Path.rootPath(), obj)
 
 # Get something
-question = 'Is there anybody... {}?'.format(
+print 'Is there anybody... {}?'.format(
     rj.JSONGet('obj', Path('.truth.coord'))
 )
 
-# Delete something (or perhaps nothing)
+# Delete something (or perhaps nothing), append something and pop it
 rj.JSONDel('obj', Path('.arr[0]'))
+rj.JSONArrAppend('obj', Path('.arr'), 'something')
+print '{} popped!'.format(rj.JSONArrPop('obj', Path('.arr')))
 
-# Update something
+# Update something else
 rj.JSONSet('obj', Path('.answer'), 2.17)
+
 ```

rejson/__init__.py

@@ -2,5 +2,5 @@
 `rejson-py is a client for ReJSON
 """
 
-from .client import Client
+from .client import ReJSONClient
 from .path import Path

rejson/client.py

@@ -1,9 +1,8 @@
 from sys import stdout
 import json
 from redis import StrictRedis, exceptions
-from redis._compat import (b, basestring, bytes, imap, iteritems, iterkeys,
-                           itervalues, izip, long, nativestr, unicode,
-                           safe_unicode)
+from redis.client import BasePipeline
+from redis._compat import (long, nativestr)
 from .path import Path
 
 def str_path(p):
@@ -39,7 +38,7 @@ def bulk_of_jsons(b):
             b[index] = json.loads(item)
     return b
 
-class Client(StrictRedis):
+class ReJSONClient(StrictRedis):
     """
     Implementation of ReJSON commands
 
@@ -70,11 +69,12 @@ class Client(StrictRedis):
             'JSON.OBJLEN': long_or_none,
     }
 
-    def __init__(self, **kwargs):
-        super(Client, self).__init__(**kwargs)
+    def __init__(self, *args, **kwargs):
+        super(ReJSONClient, self).__init__(*args, **kwargs)
         self.__checkPrerequirements()
-        # Inject the callbacks for the module's commands
-        self.response_callbacks.update(self.MODULE_CALLBACKS)
+        # Set the module commands' callbacks
+        for k, v in self.MODULE_CALLBACKS.iteritems():
+            self.set_response_callback(k, v)
 
     def __checkPrerequirements(self):
         "Checks that the module is ready"
@@ -237,4 +237,3 @@ def JSONObjLen(self, name, path=Path.rootPath()):
         ``name``
         """
         return self.execute_command('JSON.OBJLEN', name, str_path(path))
-

setup.py

@@ -15,6 +15,5 @@
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python :: 2.7',
         'Topic :: Database',
-        'Topic :: Software Development :: Testing'
     ]
 )

test/test.py

@@ -1,12 +1,11 @@
 import redis
 from unittest import TestCase
-from rejson import Client, Path
+from rejson import ReJSONClient, Path
 
 class ReJSONTestCase(TestCase):
-    
     def testJSONSetGetDelShouldSucceed(self):
         "Test basic JSONSet/Get/Del"
-        rj = Client()
+        rj = ReJSONClient()
         rj.flushdb()
 
         self.assertTrue(rj.JSONSet('foo', Path.rootPath(), 'bar'))
@@ -16,7 +15,7 @@ def testJSONSetGetDelShouldSucceed(self):
 
     def testMGetShouldSucceed(self):
         "Test JSONMGet"
-        rj = Client()
+        rj = ReJSONClient()
         rj.flushdb()
 
         rj.JSONSet('1', Path.rootPath(), 1)
@@ -27,15 +26,15 @@ def testMGetShouldSucceed(self):
 
     def testTypeShouldSucceed(self):
         "Test JSONType"
-        rj = Client()
+        rj = ReJSONClient()
         rj.flushdb()
 
         rj.JSONSet('1', Path.rootPath(), 1)
         self.assertEqual('integer', rj.JSONType('1'))
 
     def testNumIncrByShouldSucceed(self):
         "Test JSONNumIncrBy"
-        rj = Client()
+        rj = ReJSONClient()
         rj.flushdb()
 
         rj.JSONSet('num', Path.rootPath(), 1)
@@ -45,7 +44,7 @@ def testNumIncrByShouldSucceed(self):
 
     def testNumMultByShouldSucceed(self):
         "Test JSONNumIncrBy"
-        rj = Client()
+        rj = ReJSONClient()
         rj.flushdb()
 
         rj.JSONSet('num', Path.rootPath(), 1)
@@ -55,7 +54,7 @@ def testNumMultByShouldSucceed(self):
 
     def testStrAppendShouldSucceed(self):
         "Test JSONStrAppend"
-        rj = Client()
+        rj = ReJSONClient()
         rj.flushdb()
 
         rj.JSONSet('str', Path.rootPath(), 'foo')
@@ -64,7 +63,7 @@ def testStrAppendShouldSucceed(self):
 
     def testStrLenShouldSucceed(self):
         "Test JSONStrLen"
-        rj = Client()
+        rj = ReJSONClient()
         rj.flushdb()
 
         rj.JSONSet('str', Path.rootPath(), 'foo')
@@ -74,15 +73,15 @@ def testStrLenShouldSucceed(self):
 
     def testArrAppendShouldSucceed(self):
         "Test JSONSArrAppend"
-        rj = Client()
+        rj = ReJSONClient()
         rj.flushdb()
 
         rj.JSONSet('arr', Path.rootPath(), [1])
         self.assertEqual(2, rj.JSONArrAppend('arr', Path.rootPath(), 2))
 
     def testArrIndexShouldSucceed(self):
         "Test JSONSArrIndex"
-        rj = Client()
+        rj = ReJSONClient()
         rj.flushdb()
 
         rj.JSONSet('arr', Path.rootPath(), [0, 1, 2, 3, 4])
@@ -91,7 +90,7 @@ def testArrIndexShouldSucceed(self):
 
     def testArrInsertShouldSucceed(self):
         "Test JSONSArrInsert"
-        rj = Client()
+        rj = ReJSONClient()
         rj.flushdb()
 
         rj.JSONSet('arr', Path.rootPath(), [0, 4])
@@ -100,15 +99,15 @@ def testArrInsertShouldSucceed(self):
 
     def testArrLenShouldSucceed(self):
         "Test JSONSArrLen"
-        rj = Client()
+        rj = ReJSONClient()
         rj.flushdb()
 
         rj.JSONSet('arr', Path.rootPath(), [0, 1, 2, 3, 4])
         self.assertEqual(5, rj.JSONArrLen('arr', Path.rootPath()))
 
     def testArrPopShouldSucceed(self):
         "Test JSONSArrPop"
-        rj = Client()
+        rj = ReJSONClient()
         rj.flushdb()
 
         rj.JSONSet('arr', Path.rootPath(), [0, 1, 2, 3, 4])
@@ -120,7 +119,7 @@ def testArrPopShouldSucceed(self):
 
     def testArrTrimShouldSucceed(self):
         "Test JSONSArrPop"
-        rj = Client()
+        rj = ReJSONClient()
         rj.flushdb()
 
         rj.JSONSet('arr', Path.rootPath(), [0, 1, 2, 3, 4])
@@ -129,7 +128,7 @@ def testArrTrimShouldSucceed(self):
 
     def testObjKeysShouldSucceed(self):
         "Test JSONSObjKeys"
-        rj = Client()
+        rj = ReJSONClient()
         rj.flushdb()
 
         obj = { 'foo': 'bar', 'baz': 'qaz' }
@@ -142,37 +141,40 @@ def testObjKeysShouldSucceed(self):
 
     def testObjLenShouldSucceed(self):
         "Test JSONSObjLen"
-        rj = Client()
+        rj = ReJSONClient()
         rj.flushdb()
 
         obj = { 'foo': 'bar', 'baz': 'qaz' }
         rj.JSONSet('obj', Path.rootPath(), obj)
         self.assertEqual(len(obj), rj.JSONObjLen('obj', Path.rootPath()))
-        
+
     def testUsageExampleShouldSucceed(self):
         "Test the usage example"
 
         # Create a new rejson-py client
-        rj = Client(host='localhost', port=6379)
+        rj = ReJSONClient(host='localhost', port=6379)
 
         # Set the key `obj` to some object
-        rj.JSONSet('obj', Path.rootPath(), {
+        obj = {
             'answer': 42,
             'arr': [None, True, 3.14],
             'truth': {
                 'coord': 'out there'
             }
-        })
+        }
+        rj.JSONSet('obj', Path.rootPath(), obj)
 
         # Get something
-        question = 'Is there anybody... {}?'.format(
+        print 'Is there anybody... {}?'.format(
             rj.JSONGet('obj', Path('.truth.coord'))
         )
 
-        # Delete something (or perhaps nothing)
+        # Delete something (or perhaps nothing), append something and pop it
         rj.JSONDel('obj', Path('.arr[0]'))
+        rj.JSONArrAppend('obj', Path('.arr'), 'something')
+        print '{} popped!'.format(rj.JSONArrPop('obj', Path('.arr')))
 
-        # Update something
+        # Update something else
         rj.JSONSet('obj', Path('.answer'), 2.17)
 
 if __name__ == '__main__':