Add json_request decorator and test cases

jsonview/decorators.py

@@ -165,3 +165,31 @@ def _wrapped(request, *a, **kw):
         return decorator(args[0])
     else:
         return decorator
+
+
+def json_request(*args, **kwargs):
+    assume_json = bool(kwargs.get('assume_json', True))
+
+    def decorator(f):
+        @wraps(f)
+        def _wrapped(request, *a, **kw):
+            request.data = {}
+            if assume_json or request.META.get('CONTENT_TYPE') == JSON:
+                try:
+                    if isinstance(request.body, bytes):
+                        request.data = json.loads(request.body.decode('ascii'))
+                    else:
+                        request.data = json.loads(request.body)
+                except Exception:
+                    pass
+            elif request.method == 'GET':
+                request.data = request.GET.dict()
+            elif request.method == 'POST':
+                request.data = request.POST.dict()
+            return f(request, *a, **kw)
+        return _wrapped
+
+    if len(args) == 1 and callable(args[0]):
+        return decorator(args[0])
+    else:
+        return decorator

jsonview/tests.py

@@ -1,7 +1,4 @@
-from __future__ import absolute_import, unicode_literals
-
 import json
-import sys
 from unittest import SkipTest
 
 import django
@@ -17,7 +14,7 @@
 
 import mock
 
-from .decorators import json_view
+from .decorators import json_view, json_request
 from .exceptions import BadRequest
 from .views import JsonView
 
@@ -31,16 +28,6 @@ def eq_(a, b, msg=None):
     assert a == b, msg or '%r != %r' % (a, b)
 
 
-if sys.version < '3':
-    def b(x):
-        return x
-else:
-    import codecs
-
-    def b(x):
-        return codecs.latin_1_encode(x)[0]
-
-
 class CustomTestEncoder(DjangoJSONEncoder):
     def default(self, o):
         try:
@@ -255,7 +242,7 @@ def temp(req):
         res = temp(rf.get('/'))
         eq_(200, res.status_code)
         payload = json.dumps({'datetime': now}, cls=DjangoJSONEncoder)
-        eq_(b(payload), res.content)
+        eq_(payload, res.content)
 
     @override_settings(JSON_OPTIONS={'cls': None})
     def test_datetime_no_serializer(self):
@@ -396,3 +383,72 @@ def get(self, request):
         eq_(JSON, res['content-type'])
         data = json.loads(res.content.decode('utf-8'))
         eq_('bar', data['foo'])
+
+
+class JsonRequestTests(TestCase):
+    def test_with_json_content_type(self):
+        data = {
+            'foo': 'bar',
+            'baz': 'qux',
+            'quz': [{'foo': 'bar'}],
+        }
+
+        @json_request
+        def temp(req):
+            return req.json_data
+
+        res = temp(rf.post(
+                '/',
+                data=json.dumps(data),
+                content_type='application/json'
+            ))
+        eq_(res, data)
+
+    def test_without_json_content_type(self):
+        data = {
+            'foo': 'bar',
+            'baz': '0'
+        }
+
+        @json_request(assume_json=True)
+        def temp(req):
+            return req.json_data
+
+        res = temp(rf.post(
+                '/',
+                data=json.dumps(data),
+                content_type='application/x-www-form-urlencoded'
+            ))
+        eq_(res, data)
+
+    def test_without_json_data(self):
+        data = {
+            'foo': 'bar',
+            'baz': '0'
+        }
+
+        @json_request(assume_json=False)
+        def temp(req):
+            return req.json_data
+
+        # test application/x-www-form-urlencoded
+        res = temp(rf.post(
+                '/',
+                data='foo=bar&baz=0',
+                content_type='application/x-www-form-urlencoded'
+            ))
+        eq_(res, {})
+
+        res = temp_2(rf.post(
+                '/',
+                data='foo=bar&baz=0',
+                content_type='application/x-www-form-urlencoded'
+            ))
+        eq_(res, data)
+
+        # test multipart/form-data
+        res = temp(rf.post('/', data=data, files=None))
+        eq_(res, {})
+
+        res = temp_2(rf.post('/', data=data, files=None))
+        eq_(res, data)