Add symlinking overrides and version manager queryset changes

Author: agjohnson

readthedocs/core/symlink.py

@@ -61,6 +61,7 @@
 from django.conf import settings
 
 from readthedocs.builds.models import Version
+from readthedocs.core.utils.extend import SettingsOverrideObject
 from readthedocs.projects import constants
 from readthedocs.projects.models import Domain
 from readthedocs.projects.utils import run
@@ -293,7 +294,7 @@ def get_default_version(self):
             return None
 
 
-class PublicSymlink(Symlink):
+class PublicSymlinkBase(Symlink):
     CNAME_ROOT = os.path.join(settings.SITE_ROOT, 'public_cname_root')
     WEB_ROOT = os.path.join(settings.SITE_ROOT, 'public_web_root')
     PROJECT_CNAME_ROOT = os.path.join(settings.SITE_ROOT, 'public_cname_project')
@@ -309,7 +310,7 @@ def get_translations(self):
         return self.project.translations.protected()
 
 
-class PrivateSymlink(Symlink):
+class PrivateSymlinkBase(Symlink):
     CNAME_ROOT = os.path.join(settings.SITE_ROOT, 'private_cname_root')
     WEB_ROOT = os.path.join(settings.SITE_ROOT, 'private_web_root')
     PROJECT_CNAME_ROOT = os.path.join(settings.SITE_ROOT, 'private_cname_project')
@@ -323,3 +324,13 @@ def get_subprojects(self):
 
     def get_translations(self):
         return self.project.translations.private()
+
+
+class PublicSymlink(SettingsOverrideObject):
+
+    _default_class = PublicSymlinkBase
+
+
+class PrivateSymlink(SettingsOverrideObject):
+
+    _default_class = PrivateSymlinkBase

readthedocs/core/utils/extend.py

@@ -4,10 +4,9 @@
 
 from django.conf import settings
 from django.utils.module_loading import import_by_path
-from django.utils.functional import LazyObject
 
 
-class SettingsOverrideObject(LazyObject):
+class SettingsOverrideObject(object):
 
     """Base class for creating class that can be overridden
 
@@ -33,22 +32,22 @@ class without monkey patching it. This abstract class allows for lazy
     _default_class = None
     _override_setting = None
 
-    def _setup(self):
+    def __new__(cls, *args, **kwargs):
         """Set up wrapped object
 
         This is called when attributes are accessed on :py:class:`LazyObject`
         and the underlying wrapped object does not yet exist.
         """
-        cls = self._default_class
+        cls_new = cls._default_class
         cls_path = (getattr(settings, 'CLASS_OVERRIDES', {})
-                    .get(self._get_class_id()))
-        if cls_path is None and self._override_setting is not None:
-            cls_path = getattr(settings, self._override_setting, None)
+                    .get(cls._get_class_id()))
+        if cls_path is None and cls._override_setting is not None:
+            cls_path = getattr(settings, cls._override_setting, None)
         if cls_path is not None:
-            cls = import_by_path(cls_path)
-        self._wrapped = cls()
+            cls_new = import_by_path(cls_path)
+        return cls_new(*args, **kwargs)
 
-    def _get_class_id(self):
+    @classmethod
+    def _get_class_id(cls):
         # type() here, because LazyObject overrides some attribute access
-        return '.'.join([inspect.getmodule(type(self)).__name__,
-                         type(self).__name__])
+        return '.'.join([inspect.getmodule(cls).__name__, cls.__name__])

readthedocs/privacy/backend.py

@@ -146,6 +146,13 @@ def create_latest(self, **kwargs):
         defaults.update(kwargs)
         return self.create(**defaults)
 
+    def for_project(self, project):
+        """Return all versions for a project, including translations"""
+        return self.filter(
+            models.Q(project=project) |
+            models.Q(project__main_language_project=project)
+        )
+
 
 class BuildManager(models.Manager):