Merge pull request noirbizarre#38 from randlet/force-script-name

Take FORCE_SCRIPT_NAME setting into account

Author: noirbizarre

djangojs/tests/test_urls.py

@@ -173,6 +173,17 @@ def test_urls_disabled(self):
         self.result = self.get_result()  # To take override_settings in account
         self.assertEqual(len(self.result.keys()), 0)
 
+    @override_settings(JS_CACHE_DURATION=0)
+    def test_force_script_name(self):
+        from django.core.urlresolvers import set_script_prefix, _prefixes
+
+        try:
+            set_script_prefix("/force_script")
+            self.result = self.get_result()  # To take override_settings in account
+        finally:
+            del _prefixes.value
+
+        self.assertEqual(self.result['django_js_urls'], '/force_script/djangojs/urls')
 
 class UrlsAsDictTest(UrlsTestMixin, TestCase):
 
@@ -200,3 +211,16 @@ def test_render(self):
         self.assertEqual(self.response.status_code, 200)
         self.assertEqual(self.response['Content-Type'], 'application/json')
         self.assertIsNotNone(self.result)
+
+    @override_settings(JS_CACHE_DURATION=0)
+    def test_force_script_name(self):
+        from django.core.urlresolvers import set_script_prefix, _prefixes
+        try:
+            url = reverse('django_js_urls')
+            set_script_prefix("/force_script")
+            response = self.client.get(url)
+        finally:
+            del _prefixes.value
+
+        result = json.loads(response.content.decode())
+        self.assertEqual(result['django_js_urls'], '/force_script/djangojs/urls')

djangojs/urls_serializer.py

@@ -8,7 +8,7 @@
 import types
 
 from django.core.serializers.json import DjangoJSONEncoder
-from django.core.urlresolvers import RegexURLPattern, RegexURLResolver
+from django.core.urlresolvers import RegexURLPattern, RegexURLResolver, get_script_prefix
 from django.utils import six
 
 from djangojs.conf import settings
@@ -53,6 +53,9 @@ def urls_as_json():
 def _get_urls_for_pattern(pattern, prefix='', namespace=None):
     urls = {}
 
+    if prefix is '':
+        prefix = get_script_prefix()
+
     if issubclass(pattern.__class__, RegexURLPattern):
         if settings.JS_URLS_UNNAMED:
             mod_name, obj_name = pattern.callback.__module__, pattern.callback.__name__
@@ -99,7 +102,7 @@ def _get_urls_for_pattern(pattern, prefix='', namespace=None):
                     full_url = full_url.replace(el, "<>")  # replace by a empty parameter name
             # Unescape charaters
             full_url = RE_ESCAPE.sub(r'\1', full_url)
-            urls[pattern_name] = "/" + full_url
+            urls[pattern_name] = full_url
     elif (CMS_APP_RESOLVER) and (issubclass(pattern.__class__, AppRegexURLResolver)):  # hack for django-cms
         for p in pattern.url_patterns:
             urls.update(_get_urls_for_pattern(p, prefix=prefix, namespace=namespace))