Merge branch 'master' of git://github.com/lentil/pyres

Author: Matt George

pyres/__init__.py

@@ -1,7 +1,7 @@
 __version__ = '0.5.0'
 
 from redis import Redis
-import simplejson
+import pyres.json_parser as json
 
 import types
 
@@ -181,12 +181,12 @@ def close(self):
 
     @classmethod
     def encode(cls, item):
-        return simplejson.dumps(item)
+        return json.dumps(item)
 
     @classmethod
     def decode(cls, item):
         if item:
-            ret = simplejson.loads(item)
+            ret = json.loads(item)
             return ret
         return None
 

pyres/json_parser.py

@@ -0,0 +1,50 @@
+from datetime import datetime
+try:
+    import simplejson as json
+except ImportError:
+    import json
+
+
+DATE_FORMAT = '%Y-%m-%dT%H:%M:%S'
+DATE_PREFIX = '@D:'
+
+
+class CustomJSONEncoder(json.JSONEncoder):
+
+    def default(self, o):
+        if isinstance(o, datetime):
+            return o.strftime(DATE_PREFIX + DATE_FORMAT)
+        return json.JSONEncoder.default(self, o)
+
+
+class CustomJSONDecoder(json.JSONDecoder):
+
+    def decode(self, json_string):
+        decoded = json.loads(json_string)
+        return self.convert(decoded)
+
+    def convert(self, value):
+        if isinstance(value, basestring) and value.startswith(DATE_PREFIX):
+            try:
+                return datetime.strptime(value[len(DATE_PREFIX):], DATE_FORMAT)
+            except ValueError:
+                return value
+        elif isinstance(value, dict):
+            for k, v in value.iteritems():
+                new = self.convert(v)
+                if new != v:
+                    value[k] = new
+        elif isinstance(value, list):
+            for k, v in enumerate(value):
+                new = self.convert(v)
+                if new != v:
+                    value[k] = new
+        return value
+
+
+def dumps(values):
+    return json.dumps(values, cls=CustomJSONEncoder)
+
+
+def loads(string):
+    return json.loads(string, cls=CustomJSONDecoder)

pyres/worker.py

@@ -5,7 +5,7 @@
 import datetime
 import os, sys
 import time
-import simplejson
+import json_parser as json
 
 class Worker(object):
     """
@@ -162,7 +162,7 @@ def working_on(self, job):
             'run_at': str(datetime.datetime.now()),
             'payload': job._payload
         }
-        data = simplejson.dumps(data)
+        data = json.dumps(data)
         self.resq.redis["resque:worker:%s" % str(self)] = data
         print "worker:%s" % str(self)
         print self.resq.redis["resque:worker:%s" % str(self)]

tests/__init__.py

@@ -11,6 +11,13 @@ def perform(name):
         print s
         return s
 
+class ReturnAllArgsJob(object):
+    queue = 'basic'
+
+    @staticmethod
+    def perform(*args):
+        return args
+
 class TestProcess(object):
     queue = 'high'
 
@@ -49,4 +56,4 @@ def setUp(self):
     def tearDown(self):
         self.redis.flush(True)
         del self.redis
-        del self.resq
+        del self.resq

tests/test_jobs.py

@@ -1,4 +1,5 @@
-from tests import PyResTests, Basic, TestProcess
+from datetime import datetime
+from tests import PyResTests, Basic, TestProcess, ReturnAllArgsJob
 from pyres.job import Job
 class JobTests(PyResTests):
     def test_reserve(self):
@@ -21,4 +22,11 @@ def test_fail(self):
         job = Job.reserve('basic',self.resq)
         assert self.redis.llen('resque:failed') == 0
         job.fail("problem")
-        assert self.redis.llen('resque:failed') == 1
+        assert self.redis.llen('resque:failed') == 1
+
+    def test_date_arg_type(self):
+        dt = datetime.now().replace(microsecond=0)
+        self.resq.enqueue(ReturnAllArgsJob, dt)
+        job = Job.reserve('basic',self.resq)
+        result = job.perform()
+        assert result[0] == dt

tests/test_json.py

@@ -0,0 +1,24 @@
+from datetime import datetime
+from tests import PyResTests
+import pyres.json_parser as json
+
+class JSONTests(PyResTests):
+    def test_encode_decode_date(self):
+        dt = datetime(1972, 1, 22);
+        encoded = json.dumps({'dt': dt})
+        decoded = json.loads(encoded)
+        assert decoded['dt'] == dt
+
+    def test_dates_in_lists(self):
+        dates = [datetime.now() for i in range(50)]
+        decoded = json.loads(json.dumps(dates))
+        for value in dates:
+            assert isinstance(value, datetime)
+
+    def test_dates_in_dict(self):
+        dates = dict((i, datetime.now()) for i in range(50))
+        decoded = json.loads(json.dumps(dates))
+        for i, value in dates.items():
+            assert isinstance(i, int)
+            assert isinstance(value, datetime)
+