String and number commands

Author: itamarhaber

rejson/client.py

@@ -13,6 +13,19 @@ def str_path(p):
     else:
         return p
 
+def float_or_long(n):
+    "Return a number from a Redis reply"
+    if isinstance(n, str):
+        return float(n)
+    else:
+        return long(n)
+
+def json_or_none(r):
+    "Return a deserialized JSON object or None"
+    if r:
+        return json.loads(r)
+    return r
+
 def bulk_of_jsons(b):
     "Replace serialized JSON values with objects in a bulk array response (list)"
     for index, item in enumerate(b):
@@ -34,17 +47,19 @@ class Client(StrictRedis):
     }
 
     MODULE_CALLBACKS = {
-            'JSON.DEL': lambda r: int(r),
-            'JSON.GET': lambda r: json.loads(r),
+            'JSON.DEL': long,
+            'JSON.GET': json_or_none,
             'JSON.MGET': bulk_of_jsons,
             'JSON.SET': lambda r: r and nativestr(r) == 'OK',
+            'JSON.NUMINCRBY': float_or_long,
+            'JSON.NUMMULTBY': float_or_long,
+            'JSON.STRAPPEND': long,
+            'JSON.STRLEN': long,
     }
 
     def __init__(self, **kwargs):
         super(Client, self).__init__(**kwargs)
-        
         self.__checkPrerequirements()
-        
         # Inject the callbacks for the module's commands
         self.response_callbacks.update(self.MODULE_CALLBACKS)
 
@@ -103,7 +118,6 @@ def JSONSet(self, name, path, obj, nx=False, xx=False):
         ``xx`` if set to True, set ``value`` only if it exists
         """
         pieces = [name, str_path(path), json.dumps(obj)]
-
         # Handle existential modifiers
         if nx and xx:
             raise Exception('nx and xx are mutually exclusive: use one, the '
@@ -112,11 +126,36 @@ def JSONSet(self, name, path, obj, nx=False, xx=False):
             pieces.append('NX')
         elif xx:
             pieces.append('XX')
-
         return self.execute_command('JSON.SET', *pieces)
 
     def JSONType(self, name, path=Path.rootPath()):
         """
         Gets the type of the JSON value under ``path`` from key ``name``
         """
         return self.execute_command('JSON.TYPE', name, str_path(path))
+
+    def JSONNumIncrBy(self, name, path, number):
+        """
+        Increments the numeric (integer or floating point) JSON value under
+        ``path`` at key ``name`` by the provided ``number``
+        """
+        return self.execute_command('JSON.NUMINCRBY', name, str_path(path), json.dumps(number))
+
+    def JSONNumMultBy(self, name, path, number):
+        """
+        Multiplies the numeric (integer or floating point) JSON value under
+        ``path`` at key ``name`` with the provided ``number``
+        """
+        return self.execute_command('JSON.NUMMULTBY', name, str_path(path), json.dumps(number))
+
+    def JSONStrAppend(self, name, string, path=Path.rootPath()):
+        """
+        Appends to the string JSON value under ``path`` at key ``name`` the provided ``string``
+        """
+        return self.execute_command('JSON.STRAPPEND', name, str_path(path), json.dumps(string))
+
+    def JSONStrLen(self, name, path=Path.rootPath()):
+        """
+        Returns the length of the string JSON value under ``path`` at key ``name``
+        """
+        return self.execute_command('JSON.STRLEN', name, str_path(path))

test/test.py

@@ -33,6 +33,45 @@ def testTypeShouldSucceed(self):
         rj.JSONSet('1', Path.rootPath(), 1)
         self.assertEqual('integer', rj.JSONType('1'))
 
+    def testNumIncrByShouldSucceed(self):
+        "Test JSONNumIncrBy"
+        rj = Client()
+        rj.flushdb()
+
+        rj.JSONSet('num', Path.rootPath(), 1)
+        self.assertEqual(2, rj.JSONNumIncrBy('num', Path.rootPath(), 1))
+        self.assertEqual(2.5, rj.JSONNumIncrBy('num', Path.rootPath(), 0.5))
+        self.assertEqual(1.25, rj.JSONNumIncrBy('num', Path.rootPath(), -1.25))
+
+    def testNumMultByShouldSucceed(self):
+        "Test JSONNumIncrBy"
+        rj = Client()
+        rj.flushdb()
+
+        rj.JSONSet('num', Path.rootPath(), 1)
+        self.assertEqual(2, rj.JSONNumMultBy('num', Path.rootPath(), 2))
+        self.assertEqual(5, rj.JSONNumMultBy('num', Path.rootPath(), 2.5))
+        self.assertEqual(2.5, rj.JSONNumMultBy('num', Path.rootPath(), 0.5))
+
+    def testStrAppendShouldSucceed(self):
+        "Test JSONStrAppend"
+        rj = Client()
+        rj.flushdb()
+
+        rj.JSONSet('str', Path.rootPath(), 'foo')
+        self.assertEqual(6, rj.JSONStrAppend('str', 'bar', Path.rootPath()))
+        self.assertEqual('foobar', rj.JSONGet('str', Path.rootPath()))
+
+    def testStrLenShouldSucceed(self):
+        "Test JSONStrLen"
+        rj = Client()
+        rj.flushdb()
+
+        rj.JSONSet('str', Path.rootPath(), 'foo')
+        self.assertEqual(3, rj.JSONStrLen('str', Path.rootPath()))
+        rj.JSONStrAppend('str', 'bar', Path.rootPath())
+        self.assertEqual(6, rj.JSONStrLen('str', Path.rootPath()))
+
     def testUsageExampleShouldSucceed(self):
         "Test the usage example"