Fixes reply handlers and completes test coverage

Author: itamarhaber

rejson/client.py

@@ -12,27 +12,6 @@ def str_path(p):
     else:
         return p
 
-def float_or_long(n):
-    "Return a number from a Redis reply"
-    if isinstance(n, six.string_types):
-        return float(n)
-    else:
-        return long(n)
-
-def long_or_none(r):
-    "Return a long or None from a Redis reply"
-    if r:
-        return long(r)
-    return r
-
-def json_or_none(d):
-    "Return a deserialized JSON object or None"
-    def _f(r):
-        if r:
-            return d(r)
-        return r
-    return _f
-
 def bulk_of_jsons(d):
     "Replace serialized JSON values with objects in a bulk array response (list)"
     def _f(b):
@@ -75,20 +54,20 @@ def __init__(self, encoder=None, decoder=None, *args, **kwargs):
         # Set the module commands' callbacks
         MODULE_CALLBACKS = {
                 'JSON.DEL': long,
-                'JSON.GET': json_or_none(self._decode),
+                'JSON.GET': self._decode,
                 'JSON.MGET': bulk_of_jsons(self._decode),
                 'JSON.SET': lambda r: r and nativestr(r) == 'OK',
-                'JSON.NUMINCRBY': float_or_long,
-                'JSON.NUMMULTBY': float_or_long,
-                'JSON.STRAPPEND': long_or_none,
-                'JSON.STRLEN': long_or_none,
-                'JSON.ARRAPPEND': long_or_none,
-                'JSON.ARRINDEX': long_or_none,
-                'JSON.ARRINSERT': long_or_none,
-                'JSON.ARRLEN': long_or_none,
-                'JSON.ARRPOP': json_or_none(self._decode),
-                'JSON.ARRTRIM': long_or_none,
-                'JSON.OBJLEN': long_or_none,
+                'JSON.NUMINCRBY': self._decode,
+                'JSON.NUMMULTBY': self._decode,
+                'JSON.STRAPPEND': long,
+                'JSON.STRLEN': long,
+                'JSON.ARRAPPEND': long,
+                'JSON.ARRINDEX': long,
+                'JSON.ARRINSERT': long,
+                'JSON.ARRLEN': long,
+                'JSON.ARRPOP': self._decode,
+                'JSON.ARRTRIM': long,
+                'JSON.OBJLEN': long,
         }
         for k, v in six.iteritems(MODULE_CALLBACKS):
             self.set_response_callback(k, v)

tests/test_rejson.py

@@ -24,6 +24,24 @@ def testJSONSetGetDelShouldSucceed(self):
         self.assertEqual(1, rj.jsondel('foo'))
         self.assertFalse(rj.exists('foo'))
 
+    def testJSONSetExistentialModifiersShouldSucceed(self):
+        "Test JSONSet's NX/XX flags"
+
+        obj = { 'foo': 'bar' }
+        self.assertTrue(rj.jsonset('obj', Path.rootPath(), obj))
+
+        # Test that flags prevent updates when conditions are unmet
+        self.assertFalse(rj.jsonset('obj', Path('foo'), 'baz', nx=True))
+        self.assertFalse(rj.jsonset('obj', Path('qaz'), 'baz', xx=True))
+
+        # Test that flags allow updates when conditions are met
+        self.assertTrue(rj.jsonset('obj', Path('foo'), 'baz', xx=True))
+        self.assertTrue(rj.jsonset('obj', Path('qaz'), 'baz', nx=True))
+
+        # Test that flags are mutually exlusive
+        with self.assertRaises(Exception) as context:
+            rj.jsonset('obj', Path('foo'), 'baz', nx=True, xx=True)
+
     def testMGetShouldSucceed(self):
         "Test JSONMGet"