django-camomilla-cms 6.1.4__py2.py3-none-any.whl → 6.2.0__py2.py3-none-any.whl

camomilla/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "6.1.4"
+__version__ = "6.2.0"
 
 
 def get_core_apps():

camomilla/managers/pages.py

@@ -42,13 +42,44 @@ class PageQuerySet(QuerySet):
 
 
 class UrlNodeManager(models.Manager):
+
+    def get_reverse_pages_relations(self):
+        """
+        Get all reverse relations coming from AbstractPages models.
+        This is used to annotate the UrlNode with the related page fields.
+        """
+        from camomilla.models.page import AbstractPage
+
+        relations = []
+
+        for field in self.model._meta.get_fields():
+            if not (hasattr(field, "related_model") and field.one_to_one):
+                continue
+
+            if not issubclass(field.related_model, AbstractPage):
+                continue
+
+            if field.remote_field.name != "url_node":
+                continue
+
+            related_name = field.get_accessor_name()
+            relations.append(
+                {
+                    "name": related_name,
+                    "model": field.related_model,
+                    "field_name": field.remote_field.name,
+                    "field": field,
+                }
+            )
+        return relations
+
     @property
     def related_names(self):
-        self._related_names = getattr(
-            self,
-            "_related_names",
-            super().get_queryset().values_list("related_name", flat=True).distinct(),
-        )
+        self._related_names = getattr(self, "_related_names", None)
+        if self._related_names is None:
+            self._related_names = list(
+                set([rel["name"] for rel in self.get_reverse_pages_relations()])
+            )
         return self._related_names
 
     def _annotate_fields(

camomilla/models/mixins/__init__.py

@@ -16,6 +16,7 @@ class SeoMixin(models.Model):
         on_delete=models.SET_NULL,
         related_name="%(app_label)s_%(class)s_og_images",
     )
+    keywords = models.JSONField(default=list)
 
     class Meta:
         abstract = True

camomilla/models/page.py

@@ -99,7 +99,7 @@ class UrlNode(models.Model):
     LANG_PERMALINK_FIELDS = (
         [
             build_localized_fieldname("permalink", lang)
-            for lang in settings.AVAILABLE_LANGUAGES
+            for lang in settings.LANGUAGE_CODES
         ]
         if settings.ENABLE_TRANSLATIONS
         else ["permalink"]
@@ -319,7 +319,7 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
     @property
     def breadcrumbs(self) -> Sequence[dict]:
         breadcrumb = {
-            "permalink": self.permalink,
+            "permalink": self.routerlink,
             "title": self.breadcrumbs_title or self.title or "",
         }
         if self.parent:
@@ -481,6 +481,7 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
                 )
             if preview:
                 permalinks = {k: f"{v}?preview=true" for k, v in permalinks.items()}
+        permalinks.pop(get_language(), None)
         return permalinks
 
     class Meta:

camomilla/serializers/mixins/translation.py

@@ -1,6 +1,5 @@
 from functools import cached_property
 from typing import Iterable, List
-from modeltranslation import settings as mt_settings
 from modeltranslation.translator import NotRegistered, translator
 from modeltranslation.utils import build_localized_fieldname
 from rest_framework import serializers
@@ -8,7 +7,7 @@ from rest_framework.exceptions import ValidationError
 from camomilla.utils.getters import pointed_getter
 from camomilla.utils.translation import is_translatable
 from camomilla.utils.translation import nest_to_plain, plain_to_nest
-from camomilla.settings import API_TRANSLATION_ACCESSOR
+from camomilla.settings import API_TRANSLATION_ACCESSOR, LANGUAGE_CODES
 
 
 class TranslationsMixin(serializers.ModelSerializer):
@@ -94,7 +93,7 @@ class RemoveTranslationsMixin(serializers.ModelSerializer):
             included_translations = []
 
         field_names = super().get_default_field_names(declared_fields, model_info)
-        for lang in mt_settings.AVAILABLE_LANGUAGES:
+        for lang in LANGUAGE_CODES:
             if lang not in included_translations:
                 for field in self.translation_fields:
                     localized_fieldname = build_localized_fieldname(field, lang)

camomilla/settings.py

@@ -105,6 +105,10 @@ INTEGRATIONS_ASTRO_URL = pointed_getter(
     django_settings, "CAMOMILLA.INTEGRATIONS.ASTRO.URL", ""
 )
 
+PAGE_ROUTER_CACHE = pointed_getter(
+    django_settings, "CAMOMILLA.API.PAGES.ROUTER_CACHE", 60 * 15
+)
+
 DEBUG = pointed_getter(django_settings, "CAMOMILLA.DEBUG", django_settings.DEBUG)
 
 # camomilla settings example
@@ -133,6 +137,13 @@ DEBUG = pointed_getter(django_settings, "CAMOMILLA.DEBUG", django_settings.DEBUG
 #             "URL": "http://localhost:4321"
 #         }
 #     }
-#     "API": {"NESTING_DEPTH": 10, "TRANSLATION_ACCESSOR": "translations", "PAGES": {"DEFAULT_SERIALIZER": "camomilla.serializers.page.RouteSerializer"}},
+#     "API": {
+#         "NESTING_DEPTH": 10,
+#         "TRANSLATION_ACCESSOR": "translations",
+#         "PAGES": {
+#             "DEFAULT_SERIALIZER": "camomilla.serializers.page.RouteSerializer"
+#         },
+#         "ROUTER_CACHE": 60 * 15
+#     },
 #     "DEBUG": False
 # }

camomilla/templates/defaults/base.html

@@ -21,6 +21,8 @@
             justify-content: center;
             font-family: sans-serif;
             margin: 0;
+            width: 100vw;
+            height: 100vh;
         }
 
         .letter {

camomilla/templates/defaults/parts/langswitch.html

@@ -36,6 +36,13 @@
         {% get_language_info_list for LANGUAGES as languages %}
         {% get_language_info for LANGUAGE_CODE as current_lang %}
 
+         <div class="language-switch--btn" data-lang="{{current_lang.code}}" 
+            {% if current_lang.code != LANGUAGE_CODE %} 
+                onclick="submitLanguageWithoutRedirect('{{current_lang.code}}');"
+            {% endif %}
+        >
+            <a>{{ current_lang.name_translated }} {% if current_lang.code == LANGUAGE_CODE %} 👾 {% endif %}</a>
+        </div>   
         {% for lang_code, redirect in page.alternate_urls.items %}
         <div class="language-switch--btn" data-lang="{{lang_code}}" 
             {% if current_lang.code != lang_code %} 

camomilla/theme/__init__.py

@@ -1 +1 @@
-__version__ = "6.1.4"
+__version__ = "6.2.0"

camomilla/theme/admin/pages.py

@@ -29,7 +29,7 @@ class AbstractPageModelForm(
         super().__init__(*args, **kwargs)
         templates = [(t, t) for t in get_templates(request)]
         templates.insert(0, ("", "---------"))
-        self.fields["template"] = forms.ChoiceField(choices=templates)
+        self.fields["template"] = forms.ChoiceField(choices=templates, required=False)
 
     def get_initial_for_field(self, field, field_name):
         if field_name in UrlNode.LANG_PERMALINK_FIELDS:

camomilla/translation.py

@@ -12,6 +12,7 @@ class SeoMixinTranslationOptions(TranslationOptions):
         "og_type",
         "og_url",
         "canonical",
+        "keywords",
     )
 
 

camomilla/utils/translation.py

@@ -3,13 +3,12 @@ from typing import Any, Sequence, Iterator, Union, List
 
 from django.db.models import Model, Q
 from django.utils.translation.trans_real import activate, get_language
-from modeltranslation.settings import AVAILABLE_LANGUAGES, DEFAULT_LANGUAGE
 from modeltranslation.utils import build_localized_fieldname
-from camomilla.settings import BASE_URL
+from camomilla.settings import BASE_URL, DEFAULT_LANGUAGE, LANGUAGE_CODES
 from django.http import QueryDict
 
 
-def activate_languages(languages: Sequence[str] = AVAILABLE_LANGUAGES) -> Iterator[str]:
+def activate_languages(languages: Sequence[str] = LANGUAGE_CODES) -> Iterator[str]:
     old = get_language()
     for language in languages:
         activate(language)
@@ -37,7 +36,7 @@ def url_lang_decompose(url):
     if BASE_URL and url.startswith(BASE_URL):
         url = url[len(BASE_URL) :]
     data = {"url": url, "permalink": url, "language": DEFAULT_LANGUAGE}
-    result = re.match(rf"^/?({'|'.join(AVAILABLE_LANGUAGES)})?/(.*)", url)  # noqa: W605
+    result = re.match(rf"^/?({'|'.join(LANGUAGE_CODES)})?/(.*)", url)  # noqa: W605
     groups = result and result.groups()
     if groups and len(groups) == 2:
         data["language"] = groups[0]
@@ -48,14 +47,14 @@ def url_lang_decompose(url):
 def get_field_translations(instance: Model, field_name: str, *args, **kwargs):
     return {
         lang: get_nofallbacks(instance, field_name, language=lang, *args, **kwargs)
-        for lang in AVAILABLE_LANGUAGES
+        for lang in LANGUAGE_CODES
     }
 
 
 def lang_fallback_query(**kwargs):
     current_lang = get_language()
     query = Q()
-    for lang in AVAILABLE_LANGUAGES:
+    for lang in LANGUAGE_CODES:
         query |= Q(**{f"{key}_{lang}": value for key, value in kwargs.items()})
     if current_lang:
         query = query & Q(
@@ -77,7 +76,7 @@ def plain_to_nest(data, fields, accessor="translations"):
     into a dictionary with nested translations fields (es. {"translations": {"en": {"title": "Hello"}}}).
     """
     trans_data = {}
-    for lang in AVAILABLE_LANGUAGES:
+    for lang in LANGUAGE_CODES:
         lang_data = {}
         for field in fields:
             trans_field_name = build_localized_fieldname(field, lang)
@@ -101,7 +100,7 @@ def nest_to_plain(
     if isinstance(data, QueryDict):
         data = data.dict()
     translations = data.pop(accessor, {})
-    for lang in AVAILABLE_LANGUAGES:
+    for lang in LANGUAGE_CODES:
         nest_trans = translations.pop(lang, {})
         for k in fields:
             data.pop(k, None)  # this removes all trans field without lang

camomilla/views/articles.py

@@ -1,5 +1,4 @@
 from camomilla.models import Article
-from camomilla.permissions import CamomillaBasePermissions
 from camomilla.serializers import ArticleSerializer
 from camomilla.views.base import BaseModelViewset
 from camomilla.views.mixins import BulkDeleteMixin, GetUserLanguageMixin
@@ -8,6 +7,5 @@ from camomilla.views.mixins import BulkDeleteMixin, GetUserLanguageMixin
 class ArticleViewSet(GetUserLanguageMixin, BulkDeleteMixin, BaseModelViewset):
     queryset = Article.objects.all()
     serializer_class = ArticleSerializer
-    permission_classes = (CamomillaBasePermissions,)
     search_fields = ["title", "identifier", "content", "permalink"]
     model = Article

camomilla/views/contents.py

@@ -4,7 +4,6 @@ from django.http import JsonResponse
 from rest_framework.decorators import action
 
 from camomilla.models import Content
-from camomilla.permissions import CamomillaBasePermissions
 from camomilla.serializers import ContentSerializer
 from camomilla.views.base import BaseModelViewset
 from camomilla.views.mixins import BulkDeleteMixin, GetUserLanguageMixin
@@ -14,7 +13,6 @@ class ContentViewSet(GetUserLanguageMixin, BulkDeleteMixin, BaseModelViewset):
     queryset = Content.objects.all()
     serializer_class = ContentSerializer
     model = Content
-    permission_classes = (CamomillaBasePermissions,)
 
     @action(detail=True, methods=["get", "patch"])
     def djsuperadmin(self, request, pk):

camomilla/views/decorators.py

@@ -1,6 +1,7 @@
 import functools
 from django.utils.translation import activate
-from django.conf import settings
+from django.views.decorators.cache import cache_page
+from camomilla.settings import LANGUAGE_CODES, DEFAULT_LANGUAGE
 
 
 def active_lang(*args, **kwargs):
@@ -11,12 +12,12 @@ def active_lang(*args, **kwargs):
                 request = args[0].request
             else:
                 request = args[0] if len(args) else kwargs.get("request", None)
-            lang = settings.LANGUAGE_CODE
+            lang = DEFAULT_LANGUAGE
             if request and hasattr(request, "GET"):
                 lang = request.GET.get("lang", request.GET.get("language", lang))
             if request and hasattr(request, "data"):
                 lang = request.data.pop("lang", request.data.pop("language", lang))
-            if lang and lang in [lng[0] for lng in settings.LANGUAGES]:
+            if lang and lang in LANGUAGE_CODES:
                 activate(lang)
                 request.LANGUAGE_CODE = lang
             return func(*args, **kwargs)
@@ -24,3 +25,22 @@ def active_lang(*args, **kwargs):
         return wrapped_func
 
     return decorator
+
+
+def staff_excluded_cache(timing=None):
+    def decorator(func):
+        if timing is None:
+            return func  # No caching applied
+
+        @functools.wraps(func)
+        def wrapped_func(*args, **kwargs):
+            request = args[0] if len(args) else kwargs.get("request", None)
+            if request and hasattr(request, "user"):
+                user = request.user
+                if user.is_authenticated and user.is_staff:
+                    return func(*args, **kwargs)
+            return cache_page(timing)(func)(*args, **kwargs)
+
+        return wrapped_func
+
+    return decorator

camomilla/views/medias.py

@@ -3,7 +3,6 @@ from rest_framework.response import Response
 
 from camomilla.models import Media, MediaFolder
 from camomilla.parsers import MultipartJsonParser
-from camomilla.permissions import CamomillaBasePermissions
 from camomilla.serializers import (
     MediaFolderSerializer,
     MediaListSerializer,
@@ -33,7 +32,6 @@ class MediaFolderViewSet(
 ):
     model = MediaFolder
     serializer_class = MediaFolderSerializer
-    permission_classes = (CamomillaBasePermissions,)
     items_per_page = 18
     search_fields = ["title", "alt_text", "file"]
 
@@ -85,6 +83,5 @@ class MediaViewSet(
 ):
     queryset = Media.objects.all()
     serializer_class = MediaSerializer
-    permission_classes = (CamomillaBasePermissions,)
     model = Media
     parser_classes = [MultipartJsonParser, JSONParser]

camomilla/views/menus.py

@@ -7,7 +7,6 @@ from rest_framework.response import Response
 
 from camomilla.models import AbstractPage, Menu
 from camomilla.models.page import UrlNode
-from camomilla.permissions import CamomillaBasePermissions
 from camomilla.serializers import ContentTypeSerializer, MenuSerializer
 from camomilla.serializers.page import UrlNodeSerializer
 from camomilla.views.base import BaseModelViewset
@@ -17,7 +16,6 @@ from camomilla.views.decorators import active_lang
 class MenuViewSet(BaseModelViewset):
     queryset = Menu.objects.all()
     serializer_class = MenuSerializer
-    permission_classes = (CamomillaBasePermissions,)
     model = Menu
 
     lookup_field = "key"

camomilla/views/pages.py

@@ -1,26 +1,27 @@
 from camomilla.models import Page
 from camomilla.models.page import UrlNode, UrlRedirect
-from camomilla.permissions import CamomillaBasePermissions
 from camomilla.serializers import PageSerializer
 from camomilla.serializers.page import RouteSerializer
+from camomilla.utils.translation import url_lang_decompose
 from camomilla.views.base import BaseModelViewset
-from camomilla.views.decorators import active_lang
+from camomilla.views.decorators import staff_excluded_cache
 from camomilla.views.mixins import BulkDeleteMixin, GetUserLanguageMixin
 from rest_framework.decorators import api_view, permission_classes
 from rest_framework.response import Response
 from rest_framework import permissions
+from django.utils.translation.trans_real import activate as activate_language
 from django.shortcuts import get_object_or_404
+from camomilla.settings import PAGE_ROUTER_CACHE
 
 
 class PageViewSet(GetUserLanguageMixin, BulkDeleteMixin, BaseModelViewset):
     queryset = Page.objects.all()
     serializer_class = PageSerializer
-    permission_classes = (CamomillaBasePermissions,)
     model = Page
 
 
-@active_lang()
 @api_view(["GET"])
+@staff_excluded_cache(PAGE_ROUTER_CACHE)
 @permission_classes(
     [
         permissions.AllowAny,
@@ -31,5 +32,9 @@ def pages_router(request, permalink=""):
     if redirect:
         redirect = redirect.redirect()
         return Response({"redirect": redirect.url, "status": redirect.status_code})
-    node: UrlNode = get_object_or_404(UrlNode, permalink=f"/{permalink}")
+    url_decomposition = url_lang_decompose(permalink)
+    if not url_decomposition["permalink"].startswith("/"):
+        url_decomposition["permalink"] = f"/{url_decomposition['permalink']}"
+    activate_language(url_decomposition["language"])
+    node: UrlNode = get_object_or_404(UrlNode, permalink=url_decomposition["permalink"])
     return Response(RouteSerializer(node, context={"request": request}).data)

camomilla/views/tags.py

@@ -1,5 +1,4 @@
 from camomilla.models import Tag
-from camomilla.permissions import CamomillaBasePermissions
 from camomilla.serializers import TagSerializer
 from camomilla.views.base import BaseModelViewset
 from camomilla.views.mixins import BulkDeleteMixin, GetUserLanguageMixin
@@ -8,5 +7,4 @@ from camomilla.views.mixins import BulkDeleteMixin, GetUserLanguageMixin
 class TagViewSet(GetUserLanguageMixin, BulkDeleteMixin, BaseModelViewset):
     queryset = Tag.objects.all()
     serializer_class = TagSerializer
-    permission_classes = (CamomillaBasePermissions,)
     model = Tag

camomilla/views/users.py

@@ -8,7 +8,7 @@ from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from camomilla.permissions import CamomillaBasePermissions, CamomillaSuperUser, ReadOnly
+from camomilla.permissions import CamomillaSuperUser, ReadOnly
 from camomilla.serializers import (
     PermissionSerializer,
     UserProfileSerializer,
@@ -30,7 +30,6 @@ class UserViewSet(BaseModelViewset):
     queryset = get_user_model().objects.all()
     serializer_class = UserSerializer
     model = get_user_model()
-    permission_classes = (CamomillaSuperUser | CamomillaBasePermissions,)
 
     @action(detail=False, methods=["get", "put"], permission_classes=(IsAuthenticated,))
     def current(self, request):

{django_camomilla_cms-6.1.4.dist-info → django_camomilla_cms-6.2.0.dist-info}/METADATA

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

{django_camomilla_cms-6.1.4.dist-info → django_camomilla_cms-6.2.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-camomilla/__init__.py,sha256=_e972NJVuSoS9uhtizioaade6GDYyEUfJcitCrE429g,243
+camomilla/__init__.py,sha256=jnnn2SfWq4nCc_c1cvq46CUVnXuYhwFEE7eQI9DkJ1s,243
 camomilla/apps.py,sha256=eUwb9ynyiRAc5OXgt7ZsAdhsCOnPCpNdIFYMheNeN-o,532
 camomilla/authentication.py,sha256=jz6tQT4PPEu-_JLox1LZrOy7EiWBb9MWaObK63MJGus,855
 camomilla/context_processors.py,sha256=cGowjDZ-oDGYn1j2Pj5QDGCqnzXAOdOwp5dmzin_FTc,165
@@ -9,9 +9,9 @@ camomilla/model_api.py,sha256=-7l3fc2eN1itCMzkWA8nFaQXMmz0vs7IlGlShF-gSuo,2487
 camomilla/parsers.py,sha256=fL8XGCGPxJIZNZkPdGtnPSbDP-6-yzGOCVMuLPjkx9Y,1975
 camomilla/permissions.py,sha256=9NlBO4JMmg36vXCUjPNyq6uZxhkdrnXyIbJVLtWhGWE,1813
 camomilla/redirects.py,sha256=ilcyHidb5Iw3jTrXMnPntr50kkl_WB3QOB0VNkIxP7A,263
-camomilla/settings.py,sha256=lEQPysEJZ_0c9Bkr1P38rO2csPrcNCdqeLqGp1aMS2I,4362
+camomilla/settings.py,sha256=g8XZQ2hmqOeUhh4LmHggbPZsqPcf5hdFqsHhWnykiNc,4565
 camomilla/sitemap.py,sha256=U2t5TwhB_-sEscmQZ69PZ5st3bIap8NRxzWEvCgB130,786
-camomilla/translation.py,sha256=_QyfTlKG6hQ_ClRfxzeJ-3oI3Nu5peJN9xFkO9Ib3As,1316
+camomilla/translation.py,sha256=8O9WlnkwboJZBWovS2ShWr3yA6--9HnoklLfmfX8ing,1336
 camomilla/urls.py,sha256=umWlVDJ_J4aPkqeSbHJznrGJi0marvWi8TfSmsRT5a0,2101
 camomilla/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 camomilla/contrib/modeltranslation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,14 +22,14 @@ camomilla/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 camomilla/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 camomilla/management/commands/regenerate_thumbnails.py,sha256=pKToASR8p8TJezGpFfuylsAHtriNueJ7xqJJxq55adY,496
 camomilla/managers/__init__.py,sha256=Zwp28E1RKafIl0FqcUi1YNHxF19IsMIvhlhS-Njg9Mw,60
-camomilla/managers/pages.py,sha256=DYV1i5vPgxn1YzJlY3kSlsVCRgsiojLxjs2O0LylxEI,3925
+camomilla/managers/pages.py,sha256=z0bLHDwbQby2PoHx_eTm1ClCdwFun-wVArncNPWxYgI,4947
 camomilla/models/__init__.py,sha256=y7Q34AGhQ1weJUKWb6XjiyUbwRnJeylOBGMErU0wqYg,147
 camomilla/models/article.py,sha256=LgkZgRsubtDV6NwBz8E2bIgKD6H3I-1QLAxEan5TYYs,1139
 camomilla/models/content.py,sha256=mIgtifb_WMIt58we5u6qWZemHvuDN1zZaBeCyzHL78A,956
 camomilla/models/media.py,sha256=pD-qldiHDOOHgux4lsivQLBcOJJrRx3a4Bg8ODNx7r0,6852
 camomilla/models/menu.py,sha256=SSIjnrGreDqN7sfh4LSu2Ek6d-DPv8Dt7fAOZoGIQN4,4268
-camomilla/models/page.py,sha256=ihxY4r_yKL_yE7DJM-U-BDuHzukMmXc2Bk8hTuVrwoA,20007
-camomilla/models/mixins/__init__.py,sha256=c2NixqvrIX4E9WGRqQbylXlqBWDXEqN9mzs_dpB0hFQ,1248
+camomilla/models/page.py,sha256=4ofCugWL_RGuXRP4UCLtSxUtlM3q5LmF8QEWBOimqBw,20048
+camomilla/models/mixins/__init__.py,sha256=sV8KTOSysmbbhXgiKE2NniZIjzovZoowjq5AFh6FNfQ,1294
 camomilla/openapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 camomilla/openapi/schema.py,sha256=C22dhKjaJ2DTK4KWFjyMJXiwe8NLy7ZTW5d-I1dqZ7g,2546
 camomilla/serializers/__init__.py,sha256=8v1GsJ_YZ6T72VnKBb5l-8K93oaLf4PIsMt-yFtK-Gk,176
@@ -54,16 +54,16 @@ camomilla/serializers/mixins/nesting.py,sha256=gCEU2UE_Y8e4VRnvT0AExFgwTfJm_jnSq
 camomilla/serializers/mixins/optimize.py,sha256=zAtbtk6kfGq9FnapqI8tVYOuMKd1IkHbAV6LffL61Z4,3845
 camomilla/serializers/mixins/ordering.py,sha256=rXQOz47_U4IsMT6IBhySghcmJWMZgpPWHovDcZQG88k,1172
 camomilla/serializers/mixins/page.py,sha256=-8f70L0yVJyR_06fOFlxKxKnwvJUkBJqW38-SjwYekI,2231
-camomilla/serializers/mixins/translation.py,sha256=Om2UT2EB4Xvp8SrIEvraY0kJXR9H54AsYBr9DKjsay8,4323
+camomilla/serializers/mixins/translation.py,sha256=L4nSYWjLP8X0JLo44TUv9hcqtpsCqt5yHy7ZZB-XE9s,4269
 camomilla/storages/__init__.py,sha256=ytGgX59Ar8vFfYz7eV8z-j5yO_5FqxdZM25iyLnJuSA,131
 camomilla/storages/default.py,sha256=GNzvV_JZpXMcfTkyXjw5CfK8EIBi3o-NXYBO0KAxD5M,351
 camomilla/storages/optimize.py,sha256=VGSXZigzZC8LnPTqyTOpPA2Ba9EJB_KC5bcACoRs4GA,2762
 camomilla/storages/overwrite.py,sha256=jvW3zHvXNzH9dIjeZmmfXo_O3K1ZQmLQzmlSKAOE8ZA,360
 camomilla/templates/admin/camomilla/page/change_form.html,sha256=ig7rRUtylDZMINBQuVPpZLmeB4sOTV_VtqnTgzAyxEo,251
-camomilla/templates/defaults/base.html,sha256=C2gCnQP1AkERPv5w00nVhZdfg2h_8DMoIkmdf2I-VVY,8166
+camomilla/templates/defaults/base.html,sha256=HjP__4XgzootLjbpTRXwQunHu3hwkzBRFpYfko87of0,8219
 camomilla/templates/defaults/articles/default.html,sha256=1f89jBvNtTa1mPAbC91yy8CzeAjTWO3hhQsTuQW5OKg,239
 camomilla/templates/defaults/pages/default.html,sha256=bP81Qb6M56I-fBJMywWwEu_cnERtWIX28UkGrUSRU6M,144
-camomilla/templates/defaults/parts/langswitch.html,sha256=AkaQzb2KNjRYCMLUn_jE31V36rwBIwp4MneirWPiBcI,3424
+camomilla/templates/defaults/parts/langswitch.html,sha256=Cr-njWdtFxiJmWCq9_ZWToCFzJMKk7Iv2xw8BAHavrU,3808
 camomilla/templates/defaults/parts/menu.html,sha256=ReE-FfmfCNuNkJI33QqIfmMgLSBl3FTkWAhEa59aD3A,381
 camomilla/templates/defaults/widgets/media_select_multiple.html,sha256=k2XYou8KkPuFLnPMkPJAFJ-zGJj2Xvu6R3ZmiKa3g7Q,3727
 camomilla/templates_context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -73,10 +73,10 @@ camomilla/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 camomilla/templatetags/camomilla_filters.py,sha256=35x0-cWrRHeLhqypSLlJzEFY_fQDcRHiwZQpFgIsspE,692
 camomilla/templatetags/menus.py,sha256=7fc4f9DDqtqG6wNb5_Q0km-fq0mqvGnbpR21qO1TJUw,960
 camomilla/templatetags/model_extras.py,sha256=6WfVDYP_OfuVJd3cNGNA55Wj9uWdrbfOZQ0ua9Xt_vc,2257
-camomilla/theme/__init__.py,sha256=EYwTVFPyFoL0qRFRa0edvPWfX2ajYnM9APdhVxj3rU4,22
+camomilla/theme/__init__.py,sha256=5H_IrrHNTfYkLbC3nRLonK3TwkV0TTf0xGbx1a13Scw,22
 camomilla/theme/apps.py,sha256=Ue2H80fbFgxkQyHeU2H0fWs9Y6d-EnHYv4zz824FSRk,1066
 camomilla/theme/admin/__init__.py,sha256=TALAZaE-gWshSeGc6yy7VahdX5UfeCeoOE9Q5kJCEpM,2270
-camomilla/theme/admin/pages.py,sha256=HHi8dxjqffjMQGIRpOVNgQZhtKSSx3pFIctbqoZ9J2I,2614
+camomilla/theme/admin/pages.py,sha256=VCsT5zTWFBba4LDWEJWPW5cLQTU3HUQyu6eUtJVwDoQ,2630
 camomilla/theme/admin/translations.py,sha256=iAjGM1A1aYrsz1FpeybROk6rn3Ddl_oUCwgU5oD8nSw,308
 camomilla/theme/static/admin/css/responsive.css,sha256=yGq6qXrr8xEVsXTnprIBgkX-sMGZrNf0Kkh-xDxf6yE,157
 camomilla/theme/static/admin/img/favicon.ico,sha256=qpKv_2MaGILvyihnD1Vq9Yk-ZXGkxWTW26ciMeBFMYU,15406
@@ -90,17 +90,17 @@ camomilla/utils/query_parser.py,sha256=TUScPzPVVJzaKdqy5NqtMOft3H5Bx6liXTVPM1yjH
 camomilla/utils/seo.py,sha256=8p_a_TGgohenpJb094tT4mMxbn2xzW0qDILuTnjNocM,3324
 camomilla/utils/setters.py,sha256=LV57SM65rL1_ZQkVzk9al_Q13lndVywXLkqgfIvgS0Y,915
 camomilla/utils/templates.py,sha256=NAvvuv-fwu9CIxQY5t0RKs4GiFClOBZa9pOtcH_YP6s,1576
-camomilla/utils/translation.py,sha256=w5tvTInDLegWBb1TnDWo09ckKY3K6hajuNNsngZIxPQ,4205
+camomilla/utils/translation.py,sha256=i5F8MY7fUB9ImzxcgwyY-Eci-nlIHxXlerJIRbgFiXw,4133
 camomilla/views/__init__.py,sha256=94QuOnnbfMMb17mruO2ydUt286-8zBmDxEPWrJv5Wog,178
-camomilla/views/articles.py,sha256=qGxebOA5iTbGGe9PfbH40YBoDPKktH8FJongg6rh2R8,571
-camomilla/views/contents.py,sha256=JxvnmgeK8JEmCMLzVG8pVq2DwvmjXtgnIdsDnn74tA4,1205
-camomilla/views/decorators.py,sha256=hR--nTGQn2mMKDrWn-0Ildzbsvp11OfoWAtedKEzmiA,982
+camomilla/views/articles.py,sha256=mHqNP9l5_C_7E_2mqK7HQsmb6UpD06LJRJ2udhG0CBI,459
+camomilla/views/contents.py,sha256=TT8p1zj4RhY9PzougpBVhQX3IM6oxL3bTJ3MX5why_8,1093
+camomilla/views/decorators.py,sha256=w8gjns515nPGsr9TJezKC3EFOURWyfxvgJEsRpmDai0,1636
 camomilla/views/languages.py,sha256=Rt_X7s3dbDBv4dxsQ9fnav_u0TAzzo8fGKBBx3esDsg,441
-camomilla/views/medias.py,sha256=XYa-NTLLQmSSynpfrFT3av-K_r59aRns3dTGfYMj-0Q,3002
-camomilla/views/menus.py,sha256=2uEeQc68wmmxiQ-mEG9wj1m18uF9f4oq-_5anAVOIbw,3449
-camomilla/views/pages.py,sha256=GwLRcyrLqL3g4BFcbGQ2b0yspA-osA092zTMgVys56M,1345
-camomilla/views/tags.py,sha256=XcYRlcBFSPPY32lt7POb6fWPJL_8HsTo5JcHcAOiOKw,479
-camomilla/views/users.py,sha256=_fvsKOEtep4SJLvMva2_q-HdLQT_1KlFNt4wcl3xCJk,3130
+camomilla/views/medias.py,sha256=ljfzwdU-GNV1ybeGMr224qzXE8l012fgC9-aTpwKdyg,2837
+camomilla/views/menus.py,sha256=K2r43fiezUggGn-MkclOH0VTdanCpGh4LBqb-YaHxQk,3337
+camomilla/views/pages.py,sha256=QZdb6Z6QZzj7_nHkJGckywyg9-xlvl1hyG3JcZfLe7Y,1713
+camomilla/views/tags.py,sha256=Knivz6dOwu54oas7SAwK5mFJdGo10fn8OTC3bVZgJk8,367
+camomilla/views/users.py,sha256=ctdlIvNsE9wGpaB7CCcWl1zPk7tTjB6lvYEDQxg30mU,3030
 camomilla/views/base/__init__.py,sha256=bpbVBGXLTy7No95XyDNB2U8hVXmwQJrF1VjLAS5WH90,1232
 camomilla/views/mixins/__init__.py,sha256=Znv3fLYVy6lgu03Q_D8fTen4zMxI6VSRaLPDU8Cp7Ws,473
 camomilla/views/mixins/bulk_actions.py,sha256=i0duWW6wey9m7I_V8-gPcHsbJyPEfSdMdj4h2i-CbPw,787
@@ -109,28 +109,33 @@ camomilla/views/mixins/optimize.py,sha256=Y-jMYmScLeY7ZnDS1K9o8aXSgTGc5RrYUh66r5
 camomilla/views/mixins/ordering.py,sha256=mh7fqPyVCVJh84Nl2pYFQouzGxa-ANF3Wqv0pCb7OVU,4779
 camomilla/views/mixins/pagination.py,sha256=0haXRJNFrawCRSe4kNd4EWHsuhBAjdeqCklGJ3SD2gw,5950
 camomilla/views/mixins/permissions.py,sha256=TPmR3Hoa3BjeJu9rCE_7lpLOAupue4WI42C21HTo6X4,200
-django_camomilla_cms-6.1.4.dist-info/licenses/LICENSE,sha256=kVS7zDrNkav2hLLXbOJwVdonY2ToApTK3khyJagGQoQ,1063
+django_camomilla_cms-6.2.0.dist-info/licenses/LICENSE,sha256=kVS7zDrNkav2hLLXbOJwVdonY2ToApTK3khyJagGQoQ,1063
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/test_admin_page_form.py,sha256=DRJxekEKeYMCf9q62ax7iBeJGhEP2NZ8o02krZBR_DA,1971
+tests/test_admin_page_form.py,sha256=nvaSJjfy8yEZt6J0ycOrMKfMgy6bHHFrKdHtWLAEf2E,1971
 tests/test_api.py,sha256=t03EFDezGgm4UJl8RIVvnTUkAGTB6ptm0G2lHBQ7ljc,1833
-tests/test_camomilla_filters.py,sha256=rUK8iEyUNH28uTd8Ac13OikiH4Xi-V4wbtS-XjJoG24,1580
+tests/test_camomilla_filters.py,sha256=SQR5Q_9ORoKGbuD8WRdBOvbyojQENNb72eP6TlrCefM,1564
 tests/test_media.py,sha256=n5PQmpMvw-a2epmq_60R0X-vVOa4BeyKMZkguGJzKa0,5243
 tests/test_menu.py,sha256=hrTikgXNnry1bS-t5K7UGYreEJ3m-FU0r4pduumwTd4,3791
 tests/test_model_api.py,sha256=ml3OlLuBfcnr2EMjwQLvVDPT2adSQ7WS4IxxXKD1InU,4121
-tests/test_model_api_permissions.py,sha256=lUlcYAOasFFQjMFnqhGXlXriCH-f6xdYSCn1Gqf1eSU,1838
+tests/test_model_api_permissions.py,sha256=1HCagpyUWQMiAJ8L0w2N2EKDqlb1ZvpzGCtd03H0Je4,2114
 tests/test_model_api_register.py,sha256=txKaVTGt-DGrmI-6xcUEluPd7ArNi80VvlqBVXdH8zk,13555
 tests/test_models.py,sha256=WJs8lxWZWn1l7X3a_QFVc8fF5LHTsI8bc3uhQe6-o-Q,684
 tests/test_page_meta.py,sha256=QFmX97LBYSuHn9vJPM80MWZc3BwfGO5V-sCClk7ExOA,3142
 tests/test_page_relation_api.py,sha256=PrFY3vuuFal4og8MUq8ba02qITsNOtIP1eNmQ_f9jxk,2760
-tests/test_pages.py,sha256=Zo1dV6Ie2hPPfc2V7uPbVW9gEtuBWOGypglaVIbTG98,11885
+tests/test_pages.py,sha256=bwAu-obgL_VZmA1PC3CnlcT2IvAeNuwUZfxm4pz9RYc,12503
+tests/test_parsers.py,sha256=3dSBxHRAVLtM_GJdBsVCLaOjW1UDDDtQx9zLnHITmg0,2618
 tests/test_query_parser.py,sha256=R9l0L2QDEDcm2b6IFUhyf7wMXLzL9RySLkzKTWRtBkE,2097
+tests/test_sitemap.py,sha256=MWkossQKdCM6s38ORHTWjPqWnbpXzrQ700indpiIwRU,663
 tests/test_templates_context.py,sha256=zGdmbQMGNXB2V_15BaQDIgqFMnVjBAw969n1tu3m7HY,5626
 tests/test_utils.py,sha256=ow4csGfU5WzMgAT5zWjZIxZwW1-BqnMduDt8hOzf9cE,2166
+tests/test_utils_getters.py,sha256=oTgtmoxJBmm5sn76AP6fkgE-fDYwuHOVDwrTQeUYxwI,1263
+tests/test_utils_normalization.py,sha256=gXHtGD6iKnk1Hqr3GmFfRFqGCfD5U7q2KIqVz4WPFnY,899
+tests/test_utils_setters.py,sha256=0HimIaSz5IJES6Ya1Ep8lFo13CyVD_M52DANOf73nUY,1523
 tests/fixtures/__init__.py,sha256=ixyA6ZsmYbiKEsjQGOGoG4KyJmwWrf-qeoQjQG3J66U,426
 tests/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/utils/api.py,sha256=TYcDXeILHtBwzwG0acwPFmiqMZnlF9VnLB0Ydhg55vA,865
 tests/utils/media.py,sha256=-cnrQzzVuhNSb5rT5xMUs5f3yYpBnS0fVGDcjgsb8lw,291
-django_camomilla_cms-6.1.4.dist-info/METADATA,sha256=x30vUkA5zxm0eY9plcflZzK8e3LqBx7odwLC59UOMI4,5652
-django_camomilla_cms-6.1.4.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-django_camomilla_cms-6.1.4.dist-info/top_level.txt,sha256=G9VIGBmMMqC7JEckoTgXKmC6T2BR75QRkqRnngw1_lo,16
-django_camomilla_cms-6.1.4.dist-info/RECORD,,
+django_camomilla_cms-6.2.0.dist-info/METADATA,sha256=kasKQOklWZ6NosfiFKEUztsujYne0E-1aLzAqEuWi3Q,5652
+django_camomilla_cms-6.2.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+django_camomilla_cms-6.2.0.dist-info/top_level.txt,sha256=G9VIGBmMMqC7JEckoTgXKmC6T2BR75QRkqRnngw1_lo,16
+django_camomilla_cms-6.2.0.dist-info/RECORD,,

tests/test_admin_page_form.py

@@ -36,7 +36,7 @@ class AdminPageFormTestCase(TestCase):
 
         page_admin = PageAdmin(Page, AdminSite())
         form = page_admin.get_form(request)()
-        self.assertEqual(len(list(form.fields)), 33)
+        self.assertEqual(len(list(form.fields)), 35)
         self.assertTrue("template" in list(form.fields))
         self.assertListEqual(
             form.fields["template"].widget.choices,
@@ -54,7 +54,7 @@ class AdminPageFormTestCase(TestCase):
 
         page_admin = PageAdmin(Page, AdminSite())
         form = page_admin.get_form(request_with_cookies)()
-        self.assertEqual(len(list(form.fields)), 33)
+        self.assertEqual(len(list(form.fields)), 35)
         self.assertTrue("template" in list(form.fields))
         self.assertListEqual(
             form.fields["template"].widget.choices,

tests/test_camomilla_filters.py

@@ -42,4 +42,4 @@ class CamomillaFiltersTestCase(TestCase):
         request.META["HTTP_HOST"] = "localhost"
         page = Page.get(request)
         alt_urls = dict(alternate_urls(page, request))
-        self.assertEqual(alt_urls, {"it": None, "en": "/path/"})
+        self.assertEqual(alt_urls, {"it": None})

tests/test_model_api_permissions.py

@@ -9,14 +9,20 @@ client = APIClient()
 def test_right_permissions():
     response = client.post("/api/models/test-model/", {"title": "test"}, format="json")
     assert response.status_code == 401
+    response = client.get("/api/models/test-model/")
+    assert response.status_code == 401
     token = login_user()
     client.credentials(HTTP_AUTHORIZATION="Token " + token)
     response = client.post("/api/models/test-model/", {"title": "test"}, format="json")
     assert response.status_code == 403
+    response = client.get("/api/models/test-model/")
+    assert response.status_code == 200
     token = login_staff()
     client.credentials(HTTP_AUTHORIZATION="Token " + token)
     response = client.post("/api/models/test-model/", {"title": "test"}, format="json")
     assert response.status_code == 403
+    response = client.get("/api/models/test-model/")
+    assert response.status_code == 200
     token = login_superuser()
     client.credentials(HTTP_AUTHORIZATION="Token " + token)
     response = client.post("/api/models/test-model/", {"title": "test"}, format="json")

tests/test_pages.py

@@ -347,3 +347,21 @@ class PagesTestCase(TestCase):
         response = self.client.get("/it/permalink_6_it/")
         assert response.status_code == 301
         assert response.url == "/it/permalink_6_it_changed/"
+
+    @pytest.mark.django_db
+    def test_page_keywords(self):
+        # Create page with keywords field and check it's given back as expected
+        response = self.client.post(
+            "/api/camomilla/pages/",
+            {
+                "og_description_it" : "Keywords Test",
+                "keywords_it" : ['key1', 'key2']
+            },
+            format="json",
+        )
+
+        assert response.status_code == 201
+        assert len(Page.objects.all()) == 1
+        page = Page.objects.first()
+        assert page.og_description_it == "Keywords Test"
+        assert page.keywords_it == ['key1', 'key2']

tests/test_parsers.py

@@ -0,0 +1,62 @@
+import io
+import json
+import pytest
+from django.conf import settings
+from django.test import RequestFactory
+from django.core.files.uploadedfile import SimpleUploadedFile
+from camomilla.parsers import MultipartJsonParser
+
+@pytest.mark.django_db
+def test_multipart_json_parser_parses_json_and_files(monkeypatch):
+    # Prepare multipart data
+    json_data = json.dumps({"foo": "bar", "nested": {"baz": 1}, "nested_list": [{"qux": "quux"}, {"corge": "grault"}]})
+    file_content = b"filecontent"
+    upload = SimpleUploadedFile("test.txt", file_content, content_type="text/plain")
+    
+    # Simulate multipart POST
+    factory = RequestFactory()
+    data = {
+        "data": json_data,
+        "nested.file": upload,
+        "nested_list.1.file": upload,
+    }
+    request = factory.post("/", data)
+    request.upload_handlers = []
+    request.META["CONTENT_TYPE"] = "multipart/form-data; boundary=BoUnDaRy"
+    
+    # Patch DjangoMultiPartParser to return our data
+    class DummyParser:
+        def __init__(self, *a, **kw): pass
+        def parse(self):
+            return ( {"data": json_data}, {"nested.file": upload, "nested_list.1.file": upload,},)
+    monkeypatch.setattr("camomilla.parsers.DjangoMultiPartParser", DummyParser)
+
+    parser = MultipartJsonParser()
+    parsed = parser.parse(io.BytesIO(b""), "multipart/form-data", {"request": request})
+    assert parsed["foo"] == "bar"
+    assert parsed["nested"]["baz"] == 1
+    assert isinstance(parsed["nested"]["file"], SimpleUploadedFile)
+    assert isinstance(parsed["nested_list"][1]["file"], SimpleUploadedFile)
+    parsed["nested"]["file"].seek(0)
+    assert parsed["nested"]["file"].read() == file_content
+    parsed["nested_list"][1]["file"].seek(0)
+    assert parsed["nested_list"][1]["file"].read() == file_content
+
+@pytest.mark.django_db
+def test_multipart_json_parser_handles_parse_error(monkeypatch):
+    factory = RequestFactory()
+    request = factory.post("/", {})
+    request.upload_handlers = []
+    request.META["CONTENT_TYPE"] = "multipart/form-data; boundary=BoUnDaRy"
+    
+    class DummyParser:
+        def __init__(self, *a, **kw): pass
+        def parse(self):
+            from django.http.multipartparser import MultiPartParserError
+            raise MultiPartParserError("fail")
+    monkeypatch.setattr("camomilla.parsers.DjangoMultiPartParser", DummyParser)
+    parser = MultipartJsonParser()
+    from rest_framework.exceptions import ParseError
+    with pytest.raises(ParseError) as exc:
+        parser.parse(io.BytesIO(b""), "multipart/form-data", {"request": request})
+    assert "Multipart form parse error" in str(exc.value)

tests/test_sitemap.py

@@ -0,0 +1,16 @@
+import pytest
+from django.urls import reverse
+from django.test import Client
+from camomilla.models.page import Page
+
+@pytest.mark.django_db
+def test_sitemap_xml_contains_pages():
+    Page.objects.create(title="Test Page 1", permalink="test-page-1", status="PUB", autopermalink=False)
+    Page.objects.create(title="Test Page 2", permalink="test-page-2", status="PUB", autopermalink=False)
+
+    client = Client()
+    response = client.get(reverse('django.contrib.sitemaps.views.sitemap'))
+    assert response.status_code == 200
+    assert b"<urlset" in response.content
+    assert b"/test-page-1" in response.content
+    assert b"/test-page-2" in response.content

tests/test_utils_getters.py

@@ -0,0 +1,41 @@
+from camomilla.utils.getters import safe_getter, pointed_getter, find_and_replace_dict
+
+def test_safe_getter_dict():
+    d = {'a': 1}
+    assert safe_getter(d, 'a') == 1
+    assert safe_getter(d, 'b', 42) == 42
+
+def test_safe_getter_object():
+    class Dummy:
+        foo = 'bar'
+    obj = Dummy()
+    assert safe_getter(obj, 'foo') == 'bar'
+    assert safe_getter(obj, 'baz', 99) == 99
+
+def test_pointed_getter_dict():
+    d = {'a': {'b': {'c': 5}}}
+    assert pointed_getter(d, 'a.b.c') == 5
+    assert pointed_getter(d, 'a.b.x', 'nope') == 'nope'
+
+def test_pointed_getter_object():
+    class Dummy:
+        pass
+    obj = Dummy()
+    obj.child = Dummy()
+    obj.child.value = 123
+    assert pointed_getter(obj, 'child.value') == 123
+    assert pointed_getter(obj, 'child.missing', 'default') == 'default'
+
+def test_find_and_replace_dict_simple():
+    d = {'a': 1, 'b': 2}
+    def pred(key, value):
+        return value * 2
+    result = find_and_replace_dict(d, pred)
+    assert result == {'a': 2, 'b': 4}
+
+def test_find_and_replace_dict_nested():
+    d = {'a': {'b': 2}, 'c': 3}
+    def pred(key, value):
+        return value if not isinstance(value, int) else value + 1
+    result = find_and_replace_dict(d, pred)
+    assert result == {'a': {'b': 3}, 'c': 4}

tests/test_utils_normalization.py

@@ -0,0 +1,37 @@
+from camomilla.utils.normalization import dict_merge
+
+def test_dict_merge_simple():
+    a = {'x': 1}
+    b = {'y': 2}
+    result = dict_merge(a.copy(), b)
+    assert result == {'x': 1, 'y': 2}
+
+def test_dict_merge_overwrite():
+    a = {'x': 1}
+    b = {'x': 2}
+    result = dict_merge(a.copy(), b)
+    assert result == {'x': 2}
+
+def test_dict_merge_nested():
+    a = {'x': {'y': 1}}
+    b = {'x': {'z': 2}}
+    result = dict_merge(a.copy(), b)
+    assert result == {'x': {'y': 1, 'z': 2}}
+
+def test_dict_merge_nested_overwrite():
+    a = {'x': {'y': 1}}
+    b = {'x': {'y': 2}}
+    result = dict_merge(a.copy(), b)
+    assert result == {'x': {'y': 2}}
+
+def test_dict_merge_empty():
+    a = {}
+    b = {'foo': 1}
+    result = dict_merge(a.copy(), b)
+    assert result == {'foo': 1}
+
+def test_dict_merge_both_empty():
+    a = {}
+    b = {}
+    result = dict_merge(a.copy(), b)
+    assert result == {}

tests/test_utils_setters.py

@@ -0,0 +1,62 @@
+import pytest
+from camomilla.utils import setters
+
+def test_set_key_dict():
+    d = {'a': 1}
+    result = setters.set_key(d, 'b', 2)
+    assert result['b'] == 2
+    assert d['b'] == 2
+
+def test_set_key_list():
+    l = [1, 2]
+    result = setters.set_key(l, 1, 3)
+    assert result[1] == 3
+    result = setters.set_key(l, 2, 4)
+    assert result[2] == 4
+
+def test_set_key_object():
+    class Dummy:
+        pass
+    obj = Dummy()
+    setters.set_key(obj, 'foo', 'bar')
+    assert obj.foo == 'bar'
+
+def test_get_key_list():
+    l = [10, 20]
+    assert setters.get_key(l, 1, 'x') == 20
+    assert setters.get_key(l, 5, 'x') == 'x'
+
+def test_pointed_setter_dict():
+    d = {'a': {'b': 1}}
+    setters.pointed_setter(d, 'a.b', 2)
+    assert d['a']['b'] == 2
+
+def test_pointed_setter_list():
+    l = [[0, 1], [2, 3]]
+    setters.pointed_setter(l, '1.1', 99)
+    assert l[1][1] == 99
+
+def test_set_key_list_append():
+    l = [1]
+    # key out of range, should append
+    setters.set_key(l, 2, 42)
+    assert l == [1, 42]
+
+def test_set_key_invalid_type():
+    class Dummy:
+        pass
+    obj = Dummy()
+    # Should set attribute if not dict or list
+    setters.set_key(obj, 'bar', 123)
+    assert obj.bar == 123
+
+def test_get_key_invalid_index():
+    l = [1, 2]
+    # Out of range index returns default
+    assert setters.get_key(l, 10, 'default') == 'default'
+
+def test_pointed_setter_new_path():
+    d = {}
+    # Should create nested dicts
+    setters.pointed_setter(d, 'foo.bar.baz', 7)
+    assert d['foo']['bar']['baz'] == 7