django-camomilla-cms 6.0.0b11__tar.gz → 6.0.0b13__tar.gz

{django-camomilla-cms-6.0.0b11/django_camomilla_cms.egg-info → django-camomilla-cms-6.0.0b13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-camomilla-cms
-Version: 6.0.0b11
+Version: 6.0.0b13
 Summary: Django powered cms
 Author-email: Lotrèk <dimmitutto@lotrek.it>
 License: MIT

{django-camomilla-cms-6.0.0b11 → django-camomilla-cms-6.0.0b13}/camomilla/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "6.0.0-beta.11"
+__version__ = "6.0.0-beta.13"
 
 
 def get_core_apps():

{django-camomilla-cms-6.0.0b11 → django-camomilla-cms-6.0.0b13}/camomilla/contrib/rest_framework/serializer.py

@@ -1,5 +1,5 @@
 from functools import cached_property
-from typing import Iterable, Union
+from typing import Iterable, Union, List
 from django.http import QueryDict
 
 from modeltranslation import settings as mt_settings
@@ -33,7 +33,7 @@ def plain_to_nest(data, fields, accessor=TRANS_ACCESSOR):
     return data
 
 
-def nest_to_plain(data: Union[dict, QueryDict], fields: list[str], accessor=TRANS_ACCESSOR):
+def nest_to_plain(data: Union[dict, QueryDict], fields: List[str], accessor=TRANS_ACCESSOR):
     """
     This function is the inverse of plain_to_nest.
     It transforms a dictionary with nested translations fields (es. {"translations": {"en": {"title": "Hello"}}})
@@ -68,7 +68,7 @@ class TranslationsMixin(serializers.ModelSerializer):
     """
 
     @cached_property
-    def translation_fields(self) -> list[str]:
+    def translation_fields(self) -> List[str]:
         try:
             return translator.get_options_for_model(self.Meta.model).get_field_names()
         except NotRegistered:

django-camomilla-cms-6.0.0b13/camomilla/managers/__init__.py

@@ -0,0 +1,3 @@
+from .pages import PageQuerySet
+
+__all__ = ["PageQuerySet"]

django-camomilla-cms-6.0.0b13/camomilla/managers/pages.py

@@ -0,0 +1,31 @@
+from typing import Any, Tuple
+from django.db.models.query import QuerySet
+from django.db import transaction
+from django.apps import apps
+
+URL_NODE_RELATED_NAME = "%(app_label)s_%(class)s"
+
+
+class PageQuerySet(QuerySet):
+    def get_or_create(self, defaults=None, **kwargs) -> Tuple[Any, bool]:
+        if "permalink" in kwargs:
+            with transaction.atomic():
+                UrlNode = apps.get_model("camomilla", "UrlNode")
+                url_node, created = UrlNode.objects.get_or_create(
+                    permalink=kwargs.pop("permalink"),
+                    related_name=URL_NODE_RELATED_NAME % self.model_info
+                )
+                if created is False and url_node.page is not None:
+                    page = self.get(**kwargs)
+                    if page.pk != url_node.page.pk:
+                        raise self.model.MultipleObjectsReturned(
+                            "got more than one %s object for the same permalink: %s"
+                            % (
+                                self.model._meta.object_name,
+                                kwargs["permalink"],
+                            )
+                        )
+                    return url_node.page, False
+                kwargs["url_node"] = url_node
+                return super().get_or_create(defaults, **kwargs)
+        return super().get_or_create(defaults, **kwargs)

{django-camomilla-cms-6.0.0b11 → django-camomilla-cms-6.0.0b13}/camomilla/models/menu.py

@@ -14,7 +14,7 @@ from pydantic import (
 )
 from camomilla import structured
 from camomilla.models.page import UrlNode
-from typing import Optional, Union, Callable
+from typing import Optional, Union, Callable, List
 
 
 class LinkTypes(str, Enum):
@@ -54,7 +54,7 @@ class MenuNodeLink(structured.BaseModel):
 class MenuNode(structured.BaseModel):
     id: str = Field(default_factory=uuid4)
     meta: dict = {}
-    nodes: list["MenuNode"] = []
+    nodes: List["MenuNode"] = []
     title: str = ""
     link: MenuNodeLink
 

{django-camomilla-cms-6.0.0b11 → django-camomilla-cms-6.0.0b13}/camomilla/models/page.py

@@ -2,6 +2,8 @@ from typing import Sequence, Tuple
 from uuid import uuid4
 
 from django.core.exceptions import ObjectDoesNotExist
+from django.core.validators import RegexValidator
+
 from django.db import ProgrammingError, OperationalError, models, transaction
 from django.db.models.signals import post_delete
 from django.dispatch import receiver
@@ -12,6 +14,7 @@ from django.utils.functional import lazy
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 
+from camomilla.managers.pages import PageQuerySet
 from camomilla.models.mixins import MetaMixin, SeoMixin
 from camomilla.utils import (
     activate_languages,
@@ -164,6 +167,16 @@ class PageBase(models.base.ModelBase):
         return new_class
 
 
+class UrlPathValidator(RegexValidator):
+    
+    regex = r"^[a-zA-Z0-9_\-\/]+[^\/]$"
+    message = _(
+        "Enter a valid 'slug' consisting of lowercase letters, numbers, "
+        "underscores, hyphens and slashes."
+    )
+    flags = 0
+
+
 class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
     date_created = models.DateTimeField(auto_now_add=True)
     date_updated_at = models.DateTimeField(auto_now=True)
@@ -175,7 +188,9 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
         editable=False,
     )
     breadcrumbs_title = models.CharField(max_length=128, null=True, blank=True)
-    slug = models.SlugField(max_length=150, allow_unicode=True, null=True, blank=True)
+    slug = models.CharField(
+        max_length=150, null=True, blank=True, validators=[UrlPathValidator()]
+    )
     status = models.CharField(
         max_length=3,
         choices=PAGE_STATUS,
@@ -195,6 +210,8 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
         on_delete=models.CASCADE,
     )
 
+    objects = PageQuerySet.as_manager()
+
     def __init__(self, *args, **kwargs):
         super(AbstractPage, self).__init__(*args, **kwargs)
         self._meta.get_field("template").choices = lazy(GET_TEMPLATE_CHOICES, list)()
@@ -294,7 +311,10 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
                 else fallback_slug
             )
             set_nofallbacks(self, "slug", slug)
-        permalink = "/%s" % slugify(slug or "", allow_unicode=True)
+        slug_parts = (slug or "").split("/")
+        for i, part in enumerate(slug_parts):
+            slug_parts[i] = slugify(part, allow_unicode=True)            
+        permalink = "/%s" % "/".join(slug_parts)
         if self.parent:
             permalink = f"{self.parent.permalink}{permalink}"
         qs = UrlNode.objects.exclude(pk=getattr(self.url_node or object, "pk", None))
@@ -319,12 +339,14 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
     def get(cls, request, *args, **kwargs) -> "AbstractPage":
         bypass_type_check = kwargs.pop("bypass_type_check", False)
         bypass_public_check = kwargs.pop("bypass_public_check", False)
-        path = request.path
-        if getattr(django_settings, "APPEND_SLASH", True):
-            path = path.rstrip("/")
         if len(kwargs.keys()) > 0:
             page = cls.objects.get(**kwargs)
         else:
+            if not request:
+                raise ValueError("request is required if no kwargs are passed")
+            path = request.path
+            if getattr(django_settings, "APPEND_SLASH", True):
+                path = path.rstrip("/")
             node = UrlNode.objects.filter(
                 permalink=url_lang_decompose(path)["permalink"]
             ).first()
@@ -374,12 +396,20 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
             raise Http404(ex)
 
     def alternate_urls(self, *args, **kwargs) -> dict:
+        request = False
+        if len(args) > 0:
+            request = args[0]
+        if "request" in kwargs:
+            request = kwargs["request"]
+        preview = request and getattr(request, "GET", {}).get("preview", False)
         permalinks = get_field_translations(self.url_node or object, "permalink", None)
         for lang in activate_languages():
             if lang in permalinks:
                 permalinks[lang] = (
-                    UrlNode.reverse_url(permalinks[lang]) if self.is_public else None
+                    UrlNode.reverse_url(permalinks[lang]) if preview or self.is_public else None
                 )
+            if preview:
+                permalinks = {k: f"{v}?preview=true" for k, v in permalinks.items()}
         return permalinks
 
     class Meta:

{django-camomilla-cms-6.0.0b11 → django-camomilla-cms-6.0.0b13}/camomilla/serializers/fields/json.py

@@ -1,7 +1,7 @@
 from pydantic import TypeAdapter, ValidationError
 from rest_framework import serializers
 from rest_framework.utils import model_meta
-from typing import TYPE_CHECKING, Any, Union
+from typing import TYPE_CHECKING, Any, Union, Dict, List
 
 from camomilla.structured.utils import pointed_setter
 
@@ -29,7 +29,7 @@ class StructuredJSONField(serializers.JSONField):
             self.json_schema = field.schema.json_schema()
         super().bind(field_name, parent)
 
-    def to_representation(self, instance: Union["BaseModel", list["BaseModel"]]):
+    def to_representation(self, instance: Union["BaseModel", List["BaseModel"]]):
         if isinstance(instance, list) and self.many:
             return super().to_representation(
                 self.schema.dump_python(instance, exclude_unset=True)
@@ -40,7 +40,7 @@ class StructuredJSONField(serializers.JSONField):
         try:
             return self.schema.validate_python(super().to_internal_value(data))
         except ValidationError as e:
-            drf_error: Union[list, dict[str, Any]] = [] if self.many else {}
+            drf_error: Union[list, Dict[str, Any]] = [] if self.many else {}
             for error in e.errors():
                 pointed_setter(
                     drf_error, ".".join([str(x) for x in error["loc"]]), [error["msg"]]

{django-camomilla-cms-6.0.0b11 → django-camomilla-cms-6.0.0b13}/camomilla/serializers/mixins/__init__.py

@@ -161,9 +161,9 @@ class AbstractPageMixin(serializers.ModelSerializer):
 
     breadcrumbs = serializers.SerializerMethodField()
     routerlink = serializers.CharField(read_only=True)
-    template = serializers.SerializerMethodField()
+    template_file = serializers.SerializerMethodField()
 
-    def get_template(self, instance: "AbstractPage"):
+    def get_template_file(self, instance: "AbstractPage"):
         return instance.get_template_path()
 
     def get_breadcrumbs(self, instance: "AbstractPage"):

{django-camomilla-cms-6.0.0b11 → django-camomilla-cms-6.0.0b13}/camomilla/structured/__init__.py

@@ -1,5 +1,5 @@
 import json
-from typing import Any, Union, TYPE_CHECKING
+from typing import Any, Union, Type, TYPE_CHECKING, List
 
 from django.db.models import JSONField
 from django.db.models.query_utils import DeferredAttribute
@@ -70,7 +70,7 @@ class StructuredJSONField(JSONField):
 
         return list_data_validator
 
-    def __init__(self, schema: type[BaseModel], *args: Any, **kwargs: Any) -> None:
+    def __init__(self, schema: Type[BaseModel], *args: Any, **kwargs: Any) -> None:
         self.orig_schema = schema
         self.schema = schema
         default = kwargs.get("default", dict)
@@ -81,7 +81,7 @@ class StructuredJSONField(JSONField):
         if self.many:
             self.schema = TypeAdapter(
                 Annotated[
-                    list[self.schema],
+                    List[self.schema],
                     Field(default_factory=list),
                     WrapValidator(self.list_data_validator),
                 ]
@@ -96,7 +96,7 @@ class StructuredJSONField(JSONField):
         return isinstance(value, self.orig_schema)
 
     def get_prep_value(
-        self, value: Union[list[type[BaseModel]], type[BaseModel]]
+        self, value: Union[List[Type[BaseModel]], Type[BaseModel]]
     ) -> str:
         if isinstance(value, list) and self.many:
             return self.schema.dump_json(value, exclude_unset=True).decode()

{django-camomilla-cms-6.0.0b11 → django-camomilla-cms-6.0.0b13}/camomilla/structured/cache.py

@@ -1,6 +1,6 @@
 from collections import defaultdict
 from inspect import isclass
-from typing import Any, Dict, Sequence
+from typing import Any, Dict, Sequence, Type, Iterable, Union
 from typing_extensions import get_args, get_origin
 from camomilla.settings import STRUCTURED_FIELD_CACHE_ENABLED
 from camomilla.structured.fields import ForeignKey, QuerySet
@@ -8,7 +8,6 @@ from camomilla.structured.models import BaseModel
 from camomilla.structured.utils import _LazyType, get_type, pointed_setter
 from django.db.models import Model as DjangoModel
 from camomilla.utils.getters import pointed_getter
-from typing import Iterable, Union
 
 
 # TODO:
@@ -26,7 +25,7 @@ class ValueWithCache:
     def __init__(self, cache, model, value) -> None:
         self.cache: Cache = cache
         self.value: Union[Iterable[Union[str, int]], str, int] = value
-        self.model: type[DjangoModel] = model
+        self.model: Type[DjangoModel] = model
 
     def retrieve(self):
         cache = self.cache.get(self.model)
@@ -67,7 +66,7 @@ class CacheBuilder:
         return cls(related_fields=cls.inspect_related_fields(model))
 
     @classmethod
-    def inspect_related_fields(cls, model: type[BaseModel]) -> Dict[str, RelInfo]:
+    def inspect_related_fields(cls, model: Type[BaseModel]) -> Dict[str, RelInfo]:
         related = {}
         for field_name, field in model.model_fields.items():
             annotation = field.annotation

{django-camomilla-cms-6.0.0b11 → django-camomilla-cms-6.0.0b13}/camomilla/structured/fields.py

@@ -84,7 +84,7 @@ class QuerySet(Generic[T]):
         model_class = get_type(source)
 
         def validate_from_pk_list(
-            values: list[Union[int, str]]
+            values: List[Union[int, str]]
         ) -> django_models.QuerySet:
             preserved = django_models.Case(
                 *[django_models.When(pk=pk, then=pos) for pos, pk in enumerate(values)]
@@ -103,7 +103,7 @@ class QuerySet(Generic[T]):
         pk_attname = model_class._meta.pk.attname
 
         def validate_from_dict(
-            values: list[Dict[str, Union[str, int]]]
+            values: List[Dict[str, Union[str, int]]]
         ) -> django_models.QuerySet:
             return validate_from_pk_list([data[pk_attname] for data in values])
 

{django-camomilla-cms-6.0.0b11 → django-camomilla-cms-6.0.0b13}/camomilla/templates_context/rendering.py

@@ -1,5 +1,5 @@
 from collections import defaultdict
-from typing import Callable, Optional, TYPE_CHECKING
+from typing import Callable, Optional, TYPE_CHECKING, Type, Dict
 import inspect
 from django.http import HttpRequest
 
@@ -16,7 +16,7 @@ class PagesContextRegistry:
         self,
         func: Callable,
         template_path: Optional[str],
-        page_model: Optional[type["AbstractPage"]],
+        page_model: Optional[Type["AbstractPage"]],
     ):
         assert (
             template_path is not None or page_model is not None
@@ -26,7 +26,7 @@ class PagesContextRegistry:
         if page_model is not None:
             self._model_registry[page_model].add(func)
 
-    def get_registered_info(self) -> dict[str, dict]:
+    def get_registered_info(self) -> Dict[str, dict]:
         info = defaultdict(dict)
         for k, v in self._template_registry.items():
             for f in v:
@@ -43,7 +43,7 @@ class PagesContextRegistry:
         return info
 
     def get_wrapper_context_func(
-        self, template_path: str, page_model: type["AbstractPage"]
+        self, template_path: str, page_model: Type["AbstractPage"]
     ) -> Callable:
         all_funcs = set()
         for cls in self._model_registry.keys():
@@ -73,7 +73,7 @@ class PagesContextRegistry:
 
 def register(
     template_path: Optional[str] = None,
-    page_model: Optional[type["AbstractPage"]] = None,
+    page_model: Optional[Type["AbstractPage"]] = None,
 ):
     assert (
         template_path is not None or page_model is not None

django-camomilla-cms-6.0.0b13/camomilla/theme/__init__.py

@@ -0,0 +1 @@
+__version__ = "6.0.0-beta.13"

{django-camomilla-cms-6.0.0b11 → django-camomilla-cms-6.0.0b13/django_camomilla_cms.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-camomilla-cms
-Version: 6.0.0b11
+Version: 6.0.0b13
 Summary: Django powered cms
 Author-email: Lotrèk <dimmitutto@lotrek.it>
 License: MIT

{django-camomilla-cms-6.0.0b11 → django-camomilla-cms-6.0.0b13}/django_camomilla_cms.egg-info/SOURCES.txt

@@ -27,6 +27,8 @@ camomilla/fields/json.py
 camomilla/management/__init__.py
 camomilla/management/commands/__init__.py
 camomilla/management/commands/regenerate_thumbnails.py
+camomilla/managers/__init__.py
+camomilla/managers/pages.py
 camomilla/models/__init__.py
 camomilla/models/article.py
 camomilla/models/content.py

{django-camomilla-cms-6.0.0b11 → django-camomilla-cms-6.0.0b13}/setup.py

@@ -1,5 +1,5 @@
 from setuptools import setup
 
-__version__ = "6.0.0-beta.11"
+__version__ = "6.0.0-beta.13"
 
 setup(version=__version__)

django-camomilla-cms-6.0.0b11/camomilla/theme/__init__.py

@@ -1 +0,0 @@
-__version__ = "6.0.0-beta.11"