More JS escapes (readthedocs#76)

* More JS escapes

* ToJson requires values to be present -- throws otherwise

* No need to duplicate the version check

Author: davidfischer

readthedocs_ext/_static/readthedocs-data.js_t

@@ -1,22 +1,22 @@
 var READTHEDOCS_DATA = {
-    project: "{{ slug }}",
-    version: "{{ version_slug }}",
-    language: "{{ rtd_language }}",
-    programming_language: "{{ programming_language }}",
+    project: {{ slug|default('')|tojson }},
+    version: {{ version_slug|default('')|tojson }},
+    language: {{ rtd_language|default('')|tojson }},
+    programming_language: {{ programming_language|default('')|tojson }},
     subprojects: {},
-    canonical_url: "{{ canonical_url }}",
-    theme: "{{ html_theme }}",
+    canonical_url: {{ canonical_url|default('')|tojson }},
+    theme: {{ html_theme|default('')|tojson }},
     builder: "sphinx",
-    docroot: "{{ conf_py_path }}",
-    source_suffix: "{{ source_suffix }}",
-    api_host: "{{ api_host }}",
-    commit: "{{ commit }}",
+    docroot: {{ conf_py_path|default('')|tojson }},
+    source_suffix: {{ source_suffix|default('')|tojson }},
+    api_host: {{ api_host|default('')|tojson }},
+    commit: {{ commit|default('')|tojson }},
     ad_free: {% if ad_free %}true{% else %}false{% endif %},
 
-    global_analytics_code: {% if global_analytics_code %}'{{ global_analytics_code }}'{% else %}null{% endif %},
-    user_analytics_code: {% if user_analytics_code %}'{{ user_analytics_code }}'{% else %}null{% endif %}
+    global_analytics_code: {% if global_analytics_code %}{{ global_analytics_code|default('')|tojson }}{% else %}null{% endif %},
+    user_analytics_code: {% if user_analytics_code %}{{ user_analytics_code|default('')|tojson }}{% else %}null{% endif %}
 };
 
 {% for slug, url in subprojects %}
-READTHEDOCS_DATA.subprojects["{{ slug }}"] = "{{ url }}";
+READTHEDOCS_DATA.subprojects[{{ slug|default('')|tojson }}] = {{ url|default('')|tojson }};
 {% endfor %}

readthedocs_ext/mixins.py

@@ -50,11 +50,14 @@ def copy_static_readthedocs_files(self):
                     context=ctx,
                 )
             else:
+                from sphinx.util.template import SphinxRenderer
+                renderer = SphinxRenderer()
+
                 copy_asset(
                     path_src,
                     path_dest,
                     context=ctx,
-                    renderer=self.templates
+                    renderer=renderer,
                 )
         log.info('done')
 

tests/pyexample/conf.py

@@ -22,3 +22,11 @@
 html_theme = 'alabaster'
 html_static_path = ['_static']
 htmlhelp_basename = 'pyexampledoc'
+
+html_context = {
+    'slug': 'test-slug',
+    'rtd_language': 'en',
+    'user_analytics_code': '',
+    'global_analytics_code': "malic''ious",
+    'commit': 'deadd00d',
+}

tests/test_integration.py

@@ -93,3 +93,8 @@ def test_escape_js_vars(self):
                           builder='readthedocs') as data:
             self.assertNotIn('escape \' this js', data)
             self.assertIn('escape\\u0027 this js', data)
+
+        with build_output('pyexample', '_build/readthedocs/_static/readthedocs-data.js',
+                          builder='readthedocs') as data:
+            self.assertNotIn("malic''ious", data)
+            self.assertIn('malic\\u0027\\u0027ious', data)