Serve docs via public/private symlinks, instead of built doc paths.

.gitignore

@@ -7,6 +7,7 @@
 .idea
 .vagrant
 .tox
+.env
 .rope_project/
 .ropeproject/
 _build

README.rst

@@ -66,3 +66,4 @@ when you push to GitHub.
     :alt: Documentation Status
     :scale: 100%
     :target: https://docs.readthedocs.io/en/latest/?badge=latest
+

readthedocs/builds/models.py

@@ -18,7 +18,6 @@
 from readthedocs.projects.constants import (PRIVACY_CHOICES, GITHUB_URL,
                                             GITHUB_REGEXS, BITBUCKET_URL,
                                             BITBUCKET_REGEXS, PRIVATE)
-from readthedocs.core.resolver import resolve
 
 from .constants import (BUILD_STATE, BUILD_TYPES, VERSION_TYPES,
                         LATEST, NON_REPOSITORY_VERSIONS, STABLE,

readthedocs/core/middleware.py

@@ -5,7 +5,7 @@
 from django.contrib.sessions.middleware import SessionMiddleware
 from django.core.cache import cache
 from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
-from django.http import Http404
+from django.http import Http404, HttpResponseBadRequest
 
 from readthedocs.projects.models import Project, Domain
 
@@ -15,12 +15,12 @@
 SUBDOMAIN_URLCONF = getattr(
     settings,
     'SUBDOMAIN_URLCONF',
-    'readthedocs.core.subdomain_urls'
+    'readthedocs.core.urls.subdomain'
 )
 SINGLE_VERSION_URLCONF = getattr(
     settings,
     'SINGLE_VERSION_URLCONF',
-    'readthedocs.core.single_version_urls'
+    'readthedocs.core.urls.single_version'
 )
 
 
@@ -30,12 +30,15 @@ def process_request(self, request):
         if not getattr(settings, 'USE_SUBDOMAIN', False):
             return None
 
-        host = request.get_host().lower()
+        full_host = host = request.get_host().lower()
         path = request.get_full_path()
         log_kwargs = dict(host=host, path=path)
         public_domain = getattr(settings, 'PUBLIC_DOMAIN', None)
-        production_domain = getattr(settings, 'PRODUCTION_DOMAIN',
-                                    'readthedocs.org')
+        production_domain = getattr(
+            settings,
+            'PRODUCTION_DOMAIN',
+            'readthedocs.org'
+        )
 
         if public_domain is None:
             public_domain = production_domain
@@ -47,12 +50,15 @@ def process_request(self, request):
         if len(domain_parts) == len(public_domain.split('.')) + 1:
             subdomain = domain_parts[0]
             is_www = subdomain.lower() == 'www'
-            is_ssl = subdomain.lower() == 'ssl'
-            if not is_www and not is_ssl and public_domain in host:
+            if not is_www and (
+                # Support ports during local dev
+                public_domain in host or public_domain in full_host
+            ):
                 request.subdomain = True
                 request.slug = subdomain
                 request.urlconf = SUBDOMAIN_URLCONF
                 return None
+
         # Serve CNAMEs
         if (public_domain not in host and
                 production_domain not in host and
@@ -103,11 +109,11 @@ def process_request(self, request):
                     raise Http404(_('Invalid hostname'))
         # Google was finding crazy www.blah.readthedocs.org domains.
         # Block these explicitly after trying CNAME logic.
-        if len(domain_parts) > 3:
+        if len(domain_parts) > 3 and not settings.DEBUG:
             # Stop www.fooo.readthedocs.org
             if domain_parts[0] == 'www':
                 log.debug(LOG_TEMPLATE.format(msg='404ing long domain', **log_kwargs))
-                raise Http404(_('Invalid hostname'))
+                return HttpResponseBadRequest(_('Invalid hostname'))
             log.debug(LOG_TEMPLATE.format(msg='Allowing long domain name', **log_kwargs))
             # raise Http404(_('Invalid hostname'))
         # Normal request.

readthedocs/core/resolver.py

@@ -115,7 +115,8 @@ def resolve_path(self, project, filename='', version_slug=None,
             single_version=single_version,
             subproject_slug=subproject_slug,
             cname=cname,
-            private=private
+            private=private,
+            subdomain=subdomain,
         )
 
     def resolve_domain(self, project, private=None):
@@ -181,6 +182,9 @@ def _fix_filename(self, project, filename):
 
         This basically means stripping / and .html endings and then re-adding them properly.
         """
+        # Bail out on non-html files
+        if '.' in filename and '.html' not in filename:
+            return filename
         filename = filename.lstrip('/')
         filename = re.sub('index.html$', '', filename)
         filename = re.sub('index$', '', filename)

readthedocs/core/urls/__init__.py

@@ -0,0 +1,71 @@
+from django.conf.urls import url, patterns
+
+from readthedocs.constants import pattern_opts
+from readthedocs.builds.filters import VersionFilter
+from readthedocs.projects.feeds import LatestProjectsFeed, NewProjectsFeed
+from readthedocs.projects.filters import ProjectFilter
+
+
+docs_urls = patterns(
+    '',
+
+    url((r'^docs/(?P<project_slug>{project_slug})/page/'
+         r'(?P<filename>{filename_slug})$'.format(**pattern_opts)),
+        'readthedocs.core.views.serve.redirect_page_with_filename',
+        name='docs_detail'),
+
+    url((r'^docs/(?P<project_slug>{project_slug})/'
+        r'(?:|projects/(?P<subproject_slug>{project_slug})/)$'.format(**pattern_opts)),
+        'readthedocs.core.views.serve.redirect_project_slug',
+        name='docs_detail'),
+
+    url((r'^docs/(?P<project_slug>{project_slug})/'
+         r'(?:|projects/(?P<subproject_slug>{project_slug})/)'
+         r'(?P<lang_slug>{lang_slug})/'
+         r'(?P<version_slug>{version_slug})/'
+         r'(?P<filename>{filename_slug})'.format(**pattern_opts)),
+        'readthedocs.core.views.serve.serve_docs',
+        name='docs_detail'),
+)
+
+
+core_urls = patterns(
+    '',
+    # Hooks
+    url(r'^github', 'readthedocs.core.views.hooks.github_build', name='github_build'),
+    url(r'^gitlab', 'readthedocs.core.views.hooks.gitlab_build', name='gitlab_build'),
+    url(r'^bitbucket', 'readthedocs.core.views.hooks.bitbucket_build', name='bitbucket_build'),
+    url((r'^build/'
+         r'(?P<project_id_or_slug>{project_slug})'.format(**pattern_opts)),
+        'readthedocs.core.views.hooks.generic_build',
+        name='generic_build'),
+    # Random other stuff
+    url(r'^random/(?P<project_slug>{project_slug})'.format(**pattern_opts),
+        'readthedocs.core.views.random_page',
+        name='random_page'),
+    url(r'^random/$', 'readthedocs.core.views.random_page', name='random_page'),
+    url(r'^500/$', 'readthedocs.core.views.divide_by_zero', name='divide_by_zero'),
+    url((r'^wipe/(?P<project_slug>{project_slug})/'
+         r'(?P<version_slug>{version_slug})/$'.format(**pattern_opts)),
+        'readthedocs.core.views.wipe_version',
+        name='wipe_version'),
+)
+
+deprecated_urls = patterns(
+    '',
+    url(r'^filter/version/$',
+        'django_filters.views.object_filter',
+        {'filter_class': VersionFilter, 'template_name': 'filter.html'},
+        name='filter_version'),
+    url(r'^filter/project/$',
+        'django_filters.views.object_filter',
+        {'filter_class': ProjectFilter, 'template_name': 'filter.html'},
+        name='filter_project'),
+
+    url(r'^feeds/new/$',
+        NewProjectsFeed(),
+        name="new_feed"),
+    url(r'^feeds/latest/$',
+        LatestProjectsFeed(),
+        name="latest_feed"),
+)