Merge pull request #20 from bentsku/master

Add exception handler for .jsonget for non-existent keys + test

Author: gkorland

rejson/client.py

@@ -5,13 +5,15 @@
 from redis._compat import (long, nativestr)
 from .path import Path
 
+
 def str_path(p):
     "Returns the string representation of a path if it is of class Path"
     if isinstance(p, Path):
         return p.strPath
     else:
         return p
 
+
 def bulk_of_jsons(d):
     "Replace serialized JSON values with objects in a bulk array response (list)"
     def _f(b):
@@ -21,6 +23,7 @@ def _f(b):
         return b
     return _f
 
+
 class Client(StrictRedis):
     """
     This class subclasses redis-py's `StrictRedis` and implements ReJSON's
@@ -111,7 +114,13 @@ def jsonget(self, name, *args):
         else:
             for p in args:
                     pieces.append(str_path(p))
-        return self.execute_command('JSON.GET', *pieces)
+
+        # Handle case where key doesn't exist. The JSONDecoder would raise a
+        # TypeError exception since it can't decode None
+        try:
+            return self.execute_command('JSON.GET', *pieces)
+        except TypeError:
+            return None
 
     def jsonmget(self, path, *args):
         """

tests/test_rejson.py

@@ -21,6 +21,7 @@ def testJSONSetGetDelShouldSucceed(self):
 
         self.assertTrue(rj.jsonset('foo', Path.rootPath(), 'bar'))
         self.assertEqual('bar', rj.jsonget('foo'))
+        self.assertEqual(None, rj.jsonget('baz'))
         self.assertEqual(1, rj.jsondel('foo'))
         self.assertFalse(rj.exists('foo'))