Migrate El Proxito views to class-based views

Author: humitos

readthedocs/proxito/tests/test_full.py

@@ -5,7 +5,6 @@
 import django_dynamic_fixture as fixture
 import mock
 from django.conf import settings
-from django.core.files.storage import Storage
 from django.http import HttpResponse
 from django.test.utils import override_settings
 from django.urls import reverse
@@ -126,7 +125,7 @@ class TestDocServingBackends(BaseDocServing):
     @override_settings(PYTHON_MEDIA=True)
     def test_python_media_serving(self):
         with mock.patch(
-                'readthedocs.proxito.views.serve', return_value=HttpResponse()) as serve_mock:
+                'readthedocs.proxito.views.mixins.serve', return_value=HttpResponse()) as serve_mock:
             url = '/en/latest/awesome.html'
             host = 'project.dev.readthedocs.io'
             self.client.get(url, HTTP_HOST=host)
@@ -173,7 +172,7 @@ def test_default_robots_txt(self):
             b'User-agent: *\nAllow: /\nSitemap: https://project.readthedocs.io/sitemap.xml\n'
         )
 
-    @mock.patch('readthedocs.proxito.views.get_storage_class')
+    @mock.patch('readthedocs.proxito.views.serve.get_storage_class')
     def test_custom_robots_txt(self, storage_mock):
         self.project.versions.update(active=True, built=True)
         storage_mock()().exists.return_value = True
@@ -185,7 +184,7 @@ def test_custom_robots_txt(self, storage_mock):
             response['x-accel-redirect'], '/proxito/html/project/latest/robots.txt',
         )
 
-    @mock.patch('readthedocs.proxito.views.get_storage_class')
+    @mock.patch('readthedocs.proxito.views.serve.get_storage_class')
     def test_directory_indexes(self, storage_mock):
         self.project.versions.update(active=True, built=True)
         storage_mock()().exists.return_value = True
@@ -201,7 +200,7 @@ def test_directory_indexes(self, storage_mock):
             response['location'], '/en/latest/index-exists/',
         )
 
-    @mock.patch('readthedocs.proxito.views.get_storage_class')
+    @mock.patch('readthedocs.proxito.views.serve.get_storage_class')
     def test_directory_indexes_readme_serving(self, storage_mock):
         self.project.versions.update(active=True, built=True)
 
@@ -218,7 +217,7 @@ def test_directory_indexes_readme_serving(self, storage_mock):
             response['location'], '/en/latest/readme-exists/README.html',
         )
 
-    @mock.patch('readthedocs.proxito.views.get_storage_class')
+    @mock.patch('readthedocs.proxito.views.serve.get_storage_class')
     def test_directory_indexes_get_args(self, storage_mock):
         self.project.versions.update(active=True, built=True)
         storage_mock()().exists.return_value = True
@@ -234,7 +233,7 @@ def test_directory_indexes_get_args(self, storage_mock):
             response['location'], '/en/latest/index-exists/?foo=bar',
         )
 
-    @mock.patch('readthedocs.proxito.views.get_storage_class')
+    @mock.patch('readthedocs.proxito.views.serve.get_storage_class')
     def test_404_storage_serves_404(self, storage_mock):
         self.project.versions.update(active=True, built=True)
 
@@ -254,7 +253,7 @@ def test_404_storage_serves_404(self, storage_mock):
             response.status_code, 404
         )
 
-    @mock.patch('readthedocs.proxito.views.get_storage_class')
+    @mock.patch('readthedocs.proxito.views.serve.get_storage_class')
     def test_404_storage_paths_checked(self, storage_mock):
         self.project.versions.update(active=True, built=True)
         storage_mock()().exists.return_value = False

readthedocs/proxito/urls.py

@@ -33,25 +33,32 @@
 from django.views import defaults
 
 from readthedocs.constants import pattern_opts
-from readthedocs.proxito import views
+from readthedocs.proxito.views.serve import (
+    ServeDocs,
+    ServeError404,
+    ServeRobotsTXT,
+    ServeSitemapXML,
+)
+from readthedocs.proxito.views.redirects import redirect_page_with_filename
+from readthedocs.proxito.views.utils import fast_404
 
 
 urlpatterns = [
     # Serve custom 404 pages
     url(
         r'^_proxito_404_(?P<proxito_path>.*)$',
-        views.serve_error_404,
+        ServeError404.as_view(),
         name='serve_error_404',
     ),
-    url(r'robots\.txt$', views.robots_txt, name='robots_txt'),
-    url(r'sitemap\.xml$', views.sitemap_xml, name='sitemap_xml'),
+    url(r'robots\.txt$', ServeRobotsTXT.as_view(), name='robots_txt'),
+    url(r'sitemap\.xml$', ServeSitemapXML.as_view(), name='sitemap_xml'),
 
     # # TODO: Support this?
     # (Sub)project `page` redirect
     url(
         r'^(?:projects/(?P<subproject_slug>{project_slug})/)?'
         r'page/(?P<filename>.*)$'.format(**pattern_opts),
-        views.redirect_page_with_filename,
+        redirect_page_with_filename,
         name='redirect_page_with_filename',
     ),
 
@@ -63,7 +70,7 @@
             r'(?P<version_slug>{version_slug})/'
             r'(?P<filename>{filename_slug})$'.format(**pattern_opts)
         ),
-        views.serve_docs,
+        ServeDocs.as_view(),
         name='docs_detail',
     ),
 
@@ -85,11 +92,11 @@
             r'^(?:projects/(?P<subproject_slug>{project_slug})/)?'
             r'(?P<filename>{filename_slug})$'.format(**pattern_opts)
         ),
-        views.serve_docs,
+        ServeDocs.as_view(),
         name='docs_detail_singleversion_subproject',
     ),
 ]
 
 # Use Django default error handlers to make things simpler
-handler404 = views.fast_404
+handler404 = fast_404
 handler500 = defaults.server_error