Merge branch 'liminspace-issue-83'

Author: pavlov99

jsonrpc/backend/django.py

@@ -2,6 +2,7 @@
 
 from django.views.decorators.csrf import csrf_exempt
 from django.conf.urls import url
+from django.conf import settings
 from django.http import HttpResponse, HttpResponseNotAllowed
 import copy
 import json
@@ -18,6 +19,11 @@
 logger = logging.getLogger(__name__)
 
 
+def response_serialize(obj):
+    """ Serializes response's data object to JSON. """
+    return json.dumps(obj, cls=DatetimeDecimalEncoder)
+
+
 class JSONRPCAPI(object):
     def __init__(self, dispatcher=None):
         self.dispatcher = dispatcher if dispatcher is not None \
@@ -26,10 +32,14 @@ def __init__(self, dispatcher=None):
     @property
     def urls(self):
         urls = [
-            url(r'^$', self.jsonrpc),
-            url(r'map$', self.jsonrpc_map),
+            url(r'^$', self.jsonrpc, name='endpoint'),
         ]
 
+        if getattr(settings, 'JSONRPC_MAP_VIEW_ENABLED', settings.DEBUG):
+            urls.append(
+                url(r'^map$', self.jsonrpc_map, name='map')
+            )
+
         return urls
 
     @csrf_exempt
@@ -58,10 +68,7 @@ def jsonrpc(self, request):
                 jsonrpc_request.method, jsonrpc_request_params, t2 - t1))
 
         if response:
-            def serialize(s):
-                return json.dumps(s, cls=DatetimeDecimalEncoder)
-
-            response.serialize = serialize
+            response.serialize = response_serialize
             response = response.json
 
         return HttpResponse(response, content_type="application/json")

jsonrpc/tests/test_backend_django/settings.py

@@ -8,3 +8,4 @@
         'NAME': ':memory:',
     }
 }
+JSONRPC_MAP_VIEW_ENABLED = True

jsonrpc/tests/test_backend_django/tests.py

@@ -70,7 +70,7 @@ def test_resource_map(self):
 
     def test_method_not_allowed_prefix(self):
         response = self.client.get(
-            '/prefix',
+            '/prefix/',
             content_type='application/json',
         )
         self.assertEqual(response.status_code, 405)

jsonrpc/tests/test_backend_django/urls.py

@@ -3,5 +3,5 @@
 
 urlpatterns = [
     url(r'', include(api.urls)),
-    url(r'prefix', include(api.urls)),
+    url(r'^prefix/', include(api.urls)),
 ]