Merge branch 'master' into remove-projects-page

Author: iambenzo

common

@@ -163,6 +163,7 @@ of Read the Docs and the larger software documentation ecosystem.
 * **Policies & Process**:
   :doc:`security` |
   :doc:`Privacy policy <privacy-policy>` |
+  :doc:`Terms of service <terms-of-service>` |
   :doc:`DMCA takedown policy <dmca/index>` |
   :doc:`Policy for abandoned projects <abandoned-projects>` |
   :doc:`Release notes & changelog <changelog>`
@@ -195,6 +196,7 @@ of Read the Docs and the larger software documentation ecosystem.
 
    security
    privacy-policy
+   terms-of-service
    dmca/index
    abandoned-projects
    changelog

docs/index.rst

@@ -4,7 +4,7 @@
 Privacy Policy
 ==============
 
-Effective date: **August 1, 2019**
+Effective date: **September  30, 2019**
 
 Welcome to Read the Docs.
 At Read the Docs, we believe in protecting the privacy of our
@@ -30,22 +30,24 @@ Our services
 Read the Docs is made up of:
 
 readthedocs.org ("Read the Docs Community")
-    This is a website aimed at documentation authors writing and building
-    software documentation. This Privacy Policy applies to this site
-    in full without reservation.
+    This is a website aimed at documentation authors and project maintainers
+    writing and distributing technical documentation.
+    This Privacy Policy applies to this site in full without reservation.
 
 readthedocs.com ("Read the Docs for Business")
     This website is a commercial hosted offering for hosting private
     documentation for corporate clients.
-    It is governed by this privacy policy but also separate
-    `terms <https://readthedocs.com/terms/>`_.
+    This Privacy Policy applies to this site in full without reservation.
 
 readthedocs.io, readthedocs-hosted.com, and other domains ("Documentation Sites")
-    These websites are where Read the Docs hosts documentation on
-    behalf of documentation authors. A best effort is made to apply
+    These websites are where Read the Docs hosts documentation (":ref:`User-Generated Content <terms-of-service:User-Generated Content>`")
+    on behalf of documentation authors.
+    A best effort is made to apply
     this Privacy Policy to these sites but the documentation
     may contain content and files created by documentation authors.
 
+All use of Read the Docs is subject to this Privacy Policy, together with our :doc:`Terms of service <terms-of-service>`.
+
 
 What information Read the Docs collects and why
 -----------------------------------------------
@@ -115,6 +117,9 @@ anyone (including us) may view their contents.
 If you have included private or sensitive information in your Documentation Site,
 such as email addresses, that information may be indexed by search engines or used by third parties.
 
+Read the Docs for Business may host :ref:`private projects <terms-of-service:Private projects>` which we treat as confidential
+and we only access them for support reasons, with your consent, or if required to for security reasons
+
 If you're a **child under the age of 13**, you may not have an account on Read the Docs.
 Read the Docs does not knowingly collect information from or direct any of our content specifically to children under 13.
 If we learn or have reason to suspect that you are a user who is under the age of 13, we will unfortunately have to close your account.

docs/privacy-policy.rst

@@ -17,7 +17,6 @@
     BuildCommandViewSet,
     BuildViewSet,
     DomainViewSet,
-    NotificationViewSet,
     ProjectViewSet,
     RemoteOrganizationViewSet,
     RemoteRepositoryViewSet,
@@ -31,7 +30,6 @@
 router.register(r'command', BuildCommandViewSet, basename='buildcommandresult')
 router.register(r'version', VersionViewSet, basename='version')
 router.register(r'project', ProjectViewSet, basename='project')
-router.register(r'notification', NotificationViewSet, basename='emailhook')
 router.register(r'domain', DomainViewSet, basename='domain')
 router.register(r'sphinx_domain', SphinxDomainAPIView, basename='sphinxdomain')
 router.register(

docs/terms-of-service.rst

@@ -292,15 +292,6 @@ class BuildCommandViewSet(UserSelectViewSet):
     model = BuildCommandResult
 
 
-class NotificationViewSet(viewsets.ReadOnlyModelViewSet):
-    permission_classes = (permissions.IsAuthenticated, RelatedProjectIsOwner)
-    renderer_classes = (JSONRenderer,)
-    model = EmailHook
-
-    def get_queryset(self):
-        return self.model.objects.api(self.request.user)
-
-
 class DomainViewSet(UserSelectViewSet):
     permission_classes = [APIRestrictedPermission]
     renderer_classes = (JSONRenderer,)

readthedocs/api/v2/urls.py

@@ -115,15 +115,6 @@ class BuildSerializer(FlexFieldsModelSerializer):
     state = BuildStateSerializer(source='*')
     _links = BuildLinksSerializer(source='*')
 
-    expandable_fields = dict(
-        config=(
-            BuildConfigSerializer,
-            dict(
-                source='config',
-            ),
-        ),
-    )
-
     class Meta:
         model = Build
         fields = [
@@ -140,6 +131,10 @@ class Meta:
             '_links',
         ]
 
+        expandable_fields = {
+            'config': (BuildConfigSerializer, {'source': 'config'})
+        }
+
     def get_finished(self, obj):
         if obj.date and obj.length:
             return obj.date + datetime.timedelta(seconds=obj.length)
@@ -215,15 +210,6 @@ class VersionSerializer(FlexFieldsModelSerializer):
     urls = VersionURLsSerializer(source='*')
     _links = VersionLinksSerializer(source='*')
 
-    expandable_fields = dict(
-        last_build=(
-            BuildSerializer,
-            dict(
-                source='last_build',
-            ),
-        ),
-    )
-
     class Meta:
         model = Version
         fields = [
@@ -241,6 +227,12 @@ class Meta:
             '_links',
         ]
 
+        expandable_fields = {
+            'last_build': (
+                BuildSerializer, {'source': 'last_build'}
+            )
+        }
+
     def get_downloads(self, obj):
         downloads = obj.get_downloads()
         data = {}
@@ -448,18 +440,6 @@ class ProjectSerializer(FlexFieldsModelSerializer):
     created = serializers.DateTimeField(source='pub_date')
     modified = serializers.DateTimeField(source='modified_date')
 
-    expandable_fields = dict(
-        active_versions=(
-            VersionSerializer,
-            dict(
-                # NOTE: this has to be a Model method, can't be a
-                # ``SerializerMethodField`` as far as I know
-                source='active_versions',
-                many=True,
-            ),
-        ),
-    )
-
     class Meta:
         model = Project
         fields = [
@@ -489,6 +469,18 @@ class Meta:
             '_links',
         ]
 
+        expandable_fields = {
+            'active_versions': (
+                VersionSerializer,
+                {
+                    # NOTE: this has to be a Model method, can't be a
+                    # ``SerializerMethodField`` as far as I know
+                    'source': 'active_versions',
+                    'many': True,
+                }
+            )
+        }
+
     def get_homepage(self, obj):
         # Overridden only to return ``None`` when the project_url is ``''``
         return obj.project_url or None

readthedocs/api/v2/views/model_views.py

@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 import pytest
-from django.conf import settings
 from rest_framework.test import APIClient
 
+
 try:
     # TODO: this file is read/executed even when called from ``readthedocsinc``,
     # so it's overriding the options that we are defining in the ``conftest.py``

readthedocs/api/v3/serializers.py

@@ -27,10 +27,20 @@
     ProjectAdvertisingUpdate,
     ProjectDashboard,
     ProjectDelete,
+    ProjectNotications,
+    ProjectNoticationsDelete,
+    ProjectRedirects,
+    ProjectRedirectsDelete,
+    ProjectTranslationsDelete,
+    ProjectTranslationsListAndCreate,
     ProjectUpdate,
+    ProjectUsersCreateList,
+    ProjectUsersDelete,
+    ProjectVersionDeleteHTML,
+    ProjectVersionDetail,
+    SearchAnalytics,
 )
 
-
 urlpatterns = [
     url(r'^$', ProjectDashboard.as_view(), name='projects_dashboard'),
     url(
@@ -62,57 +72,67 @@
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/version/(?P<version_slug>[^/]+)/delete_html/$',
-        private.project_version_delete_html, name='project_version_delete_html',
+        ProjectVersionDeleteHTML.as_view(),
+        name='project_version_delete_html',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/version/(?P<version_slug>[^/]+)/$',
-        private.project_version_detail, name='project_version_detail',
+        ProjectVersionDetail.as_view(),
+        name='project_version_detail',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/delete/$',
         ProjectDelete.as_view(),
         name='projects_delete',
     ),
     url(
-        r'^(?P<project_slug>[-\w]+)/users/$', private.project_users,
+        r'^(?P<project_slug>[-\w]+)/users/$',
+        ProjectUsersCreateList.as_view(),
         name='projects_users',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/users/delete/$',
-        private.project_users_delete, name='projects_users_delete',
+        ProjectUsersDelete.as_view(),
+        name='projects_users_delete',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/notifications/$',
-        private.project_notifications, name='projects_notifications',
+        ProjectNotications.as_view(),
+        name='projects_notifications',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/notifications/delete/$',
-        private.project_notifications_delete, name='projects_notification_delete',
+        ProjectNoticationsDelete.as_view(),
+        name='projects_notification_delete',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/translations/$',
-        private.project_translations, name='projects_translations',
+        ProjectTranslationsListAndCreate.as_view(),
+        name='projects_translations',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/translations/delete/(?P<child_slug>[-\w]+)/$',  # noqa
-        private.project_translations_delete,
+        ProjectTranslationsDelete.as_view(),
         name='projects_translations_delete',
     ),
     url(
-        r'^(?P<project_slug>[-\w]+)/redirects/$', private.project_redirects,
+        r'^(?P<project_slug>[-\w]+)/redirects/$',
+        ProjectRedirects.as_view(),
         name='projects_redirects',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/redirects/delete/$',
-        private.project_redirects_delete, name='projects_redirects_delete',
+        ProjectRedirectsDelete.as_view(),
+        name='projects_redirects_delete',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/advertising/$',
         ProjectAdvertisingUpdate.as_view(), name='projects_advertising',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/search-analytics/$',
-        private.search_analytics_view, name='projects_search_analytics',
+        SearchAnalytics.as_view(),
+        name='projects_search_analytics',
     ),
 ]