Merge pull request #2754 from rtfd/bugfix-bundle

This merges all the bugfix PR's I had into one.

Author: ericholscher

media/javascript/rtd.js

@@ -67,7 +67,9 @@
       }
     );
 
-    checkVersion(slug, version);
+    // This is a deprecated API and file, so removing this to reduce errors
+    // on our servers.
+    // checkVersion(slug, version);
     getVersions(slug, version);
 
     /*
@@ -78,12 +80,12 @@
     */
 
 
-    $.ajax({
-    url: "https://api.grokthedocs.com/static/javascript/bundle-client.js",
-    crossDomain: true,
-    dataType: "script",
-    cache: true,
-    });
+    // $.ajax({
+    // url: "https://api.grokthedocs.com/static/javascript/bundle-client.js",
+    // crossDomain: true,
+    // dataType: "script",
+    // cache: true,
+    // });
 
 
 

readthedocs/core/resolver.py

@@ -56,17 +56,17 @@ def base_resolve_path(self, project_slug, filename, version_slug=None,
         # Only support `/docs/project' URLs outside our normal environment. Normally
         # the path should always have a subdomain or CNAME domain
         if subdomain or cname or (self._use_subdomain()):
-            url = '/'
+            url = u'/'
         else:
-            url = '/docs/{project_slug}/'
+            url = u'/docs/{project_slug}/'
 
         if subproject_slug:
-            url += 'projects/{subproject_slug}/'
+            url += u'projects/{subproject_slug}/'
 
         if single_version:
-            url += '{filename}'
+            url += u'{filename}'
         else:
-            url += '{language}/{version_slug}/{filename}'
+            url += u'{language}/{version_slug}/{filename}'
 
         return url.format(
             project_slug=project_slug, filename=filename,

readthedocs/core/signals.py

@@ -26,6 +26,8 @@ def decide_if_cors(sender, request, **kwargs):
 
     Returns True when a request should be given CORS access.
     """
+    if 'HTTP_ORIGIN' not in request.META:
+        return False
     host = urlparse(request.META['HTTP_ORIGIN']).netloc.split(':')[0]
     valid_url = False
     for url in WHITELIST_URLS:

readthedocs/oauth/services/bitbucket.py

@@ -214,5 +214,5 @@ def setup_webhook(self, project):
             log.error('Bitbucket webhook creation failed for project: %s',
                       project)
             log.debug('Bitbucket webhook creation failure response: %s',
-                      dict(resp))
+                      resp.content)
             return (False, resp)

readthedocs/oauth/services/github.py

@@ -205,7 +205,7 @@ def setup_webhook(self, project):
             log.error('GitHub webhook creation failed for project: %s',
                       project)
             log.debug('GitHub webhook creation failure response: %s',
-                      dict(resp))
+                      resp.content)
             return (False, resp)
 
     @classmethod

readthedocs/projects/version_handling.py

@@ -1,5 +1,6 @@
 """Project version handling"""
 
+import unicodedata
 from collections import defaultdict
 from packaging.version import Version
 from packaging.version import InvalidVersion
@@ -107,8 +108,8 @@ def version_windows(versions, major=1, minor=1, point=1):
 
 def parse_version_failsafe(version_string):
     try:
-        return Version(version_string)
-    except InvalidVersion:
+        return Version(unicodedata.normalize('NFKD', version_string).encode('ascii', 'ignore'))
+    except (UnicodeError, InvalidVersion):
         return None
 
 

readthedocs/restapi/views/model_views.py

@@ -132,27 +132,23 @@ def sync_versions(self, request, **kwargs):
             log.exception("Sync Versions Error: %s" % e.message)
             return Response({'error': e.message}, status=status.HTTP_400_BAD_REQUEST)
 
-        try:
-            old_stable = project.get_stable_version()
-            promoted_version = project.update_stable_version()
-            if promoted_version:
-                new_stable = project.get_stable_version()
-                log.info(
-                    "Triggering new stable build: {project}:{version}".format(
-                        project=project.slug,
-                        version=new_stable.identifier))
-                trigger_build(project=project, version=new_stable)
-
-                # Marking the tag that is considered the new stable version as
-                # active and building it if it was just added.
-                if (
-                        activate_new_stable and
-                        promoted_version.slug in added_versions):
-                    promoted_version.active = True
-                    promoted_version.save()
-                    trigger_build(project=project, version=promoted_version)
-        except:
-            log.exception("Stable Version Failure", exc_info=True)
+        promoted_version = project.update_stable_version()
+        if promoted_version:
+            new_stable = project.get_stable_version()
+            log.info(
+                "Triggering new stable build: {project}:{version}".format(
+                    project=project.slug,
+                    version=new_stable.identifier))
+            trigger_build(project=project, version=new_stable)
+
+            # Marking the tag that is considered the new stable version as
+            # active and building it if it was just added.
+            if (
+                    activate_new_stable and
+                    promoted_version.slug in added_versions):
+                promoted_version.active = True
+                promoted_version.save()
+                trigger_build(project=project, version=promoted_version)
 
         return Response({
             'added_versions': added_versions,

readthedocs/rtd_tests/tests/test_sync_versions.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import json
 
 from django.test import TestCase
@@ -344,3 +346,18 @@ def test_update_inactive_stable_version(self):
         version_stable = Version.objects.get(slug=STABLE)
         self.assertFalse(version_stable.active)
         self.assertEqual(version_stable.identifier, '1.0.0')
+
+    def test_unicode(self):
+        version_post_data = {
+            'branches': [],
+            'tags': [
+                {'identifier': 'foo-£', 'verbose_name': 'foo-£'},
+            ]
+        }
+
+        resp = self.client.post(
+            '/api/v2/project/%s/sync_versions/' % self.pip.pk,
+            data=json.dumps(version_post_data),
+            content_type='application/json',
+        )
+        self.assertEqual(resp.status_code, 200)

readthedocs/search/utils.py

@@ -25,6 +25,8 @@ def process_mkdocs_json(version, build_dir=True):
             html_files.append(os.path.join(root, filename))
     page_list = []
     for filename in html_files:
+        if not valid_mkdocs_json(file_path=filename):
+            continue
         relative_path = parse_path_from_file(documentation_type='mkdocs', file_path=filename)
         html = parse_content_from_file(documentation_type='mkdocs', file_path=filename)
         headers = parse_headers_from_file(documentation_type='mkdocs', file_path=filename)
@@ -50,12 +52,29 @@ def recurse_while_none(element):
         return element.text
 
 
+def valid_mkdocs_json(file_path):
+    try:
+        with codecs.open(file_path, encoding='utf-8', mode='r') as f:
+            content = f.read()
+    except IOError as e:
+        log.warning('(Search Index) Unable to index file: %s, error: %s' % (file_path, e))
+        return None
+
+    page_json = json.loads(content)
+    for to_check in ['url', 'content']:
+        if to_check not in page_json:
+            log.warning('(Search Index) Unable to index file: %s error: Invalid JSON' % (file_path))
+            return None
+
+    return True
+
+
 def parse_path_from_file(documentation_type, file_path):
     try:
         with codecs.open(file_path, encoding='utf-8', mode='r') as f:
             content = f.read()
     except IOError as e:
-        log.info('(Search Index) Unable to index file: %s, error :%s' % (file_path, e))
+        log.warning('(Search Index) Unable to index file: %s, error: %s' % (file_path, e))
         return ''
 
     page_json = json.loads(content)