meringue 1.3.0.dev0__tar.gz → 1.3.0.dev1__tar.gz

{meringue-1.3.0.dev0 → meringue-1.3.0.dev1}/PKG-INFO

@@ -1,15 +1,12 @@
 Metadata-Version: 2.3
 Name: meringue
-Version: 1.3.0.dev0
+Version: 1.3.0.dev1
 Summary: A set of various functionality for a Django based web application.
 Project-URL: Documentation, https://dd.github.io/Meringue
 Project-URL: Repository, https://github.com/dd/Meringue
 Project-URL: Changelog, https://github.com/dd/Meringue/blob/master/CHANGELOG.md
 Project-URL: Bug Tracker, https://github.com/dd/Meringue/issues
 Author-email: Dmitry Dobrynin <dd@tovarisch.engineer>
-License-Expression: LGPL-3.0
-License-File: AUTHORS
-License-File: LICENSE
 Keywords: django,utils
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
@@ -115,11 +112,9 @@ Description-Content-Type: text/markdown
 	</a>
 </p>
 
-Package with various functional (such as mixins, form utils, upload handlers and other) for Django Framework.
+A package providing various utilities for Django, such as mixins, form tools, upload handlers, and more.
 
-This library is a set of various functionality that I use from project to project.
-
-The main task of this package is to clean up this functionality, test it, and also organize the documentation so that colleagues can understand how and what works.
+This library is a collection of reusable components that I frequently use across different projects. Its primary purpose is to clean up and standardize these tools, ensure they are well-tested, and provide clear documentation to make it easy for colleagues to understand and use.
 
 However, if someone decides to use this functionality in their project, and even more so to add functionality or change the implementation to a more correct, beautiful or understandable one, I will only be happy, do not worry and feel free to write to me by [mail](mailto:dd@tovarisch.engineer), create an [issue](https://github.com/dd/Meringue/issues) or [pull request](https://github.com/dd/Meringue/pulls) on [github](https://github.com/dd/Meringue).
 

{meringue-1.3.0.dev0 → meringue-1.3.0.dev1}/README.md

@@ -55,11 +55,9 @@
 	</a>
 </p>
 
-Package with various functional (such as mixins, form utils, upload handlers and other) for Django Framework.
+A package providing various utilities for Django, such as mixins, form tools, upload handlers, and more.
 
-This library is a set of various functionality that I use from project to project.
-
-The main task of this package is to clean up this functionality, test it, and also organize the documentation so that colleagues can understand how and what works.
+This library is a collection of reusable components that I frequently use across different projects. Its primary purpose is to clean up and standardize these tools, ensure they are well-tested, and provide clear documentation to make it easy for colleagues to understand and use.
 
 However, if someone decides to use this functionality in their project, and even more so to add functionality or change the implementation to a more correct, beautiful or understandable one, I will only be happy, do not worry and feel free to write to me by [mail](mailto:dd@tovarisch.engineer), create an [issue](https://github.com/dd/Meringue/issues) or [pull request](https://github.com/dd/Meringue/pulls) on [github](https://github.com/dd/Meringue).
 

{meringue-1.3.0.dev0 → meringue-1.3.0.dev1}/meringue/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.3.0.dev0"
+__version__ = "1.3.0.dev1"
 """
 To update the version, use [hatch version](https://hatch.pypa.io/latest/version/#updating)
 

{meringue-1.3.0.dev0 → meringue-1.3.0.dev1}/meringue/thumbnail/drf_fields.py

@@ -1,6 +1,5 @@
 import logging
-import os
-from pathlib import PurePath
+from pathlib import Path
 
 from rest_framework.fields import ImageField
 
@@ -13,7 +12,7 @@ logger = logging.getLogger("meringue.thumbnail")
 
 
 def get_format_from_path(path):
-    return FORMATS_BY_EXTENSIONS[PurePath(path).suffix.lower()]
+    return FORMATS_BY_EXTENSIONS[path.suffix.lower()]
 
 
 class BaseImageField(ImageField):
@@ -53,13 +52,15 @@ class MImageField(BaseImageField):
         if not value:
             return None
 
-        if os.path.isfile(value.path):
-            thumbnail = DefaultThumbnailer(value.path, job_chain=self.job_chain)
-            optimized_image_url = thumbnail.get_image(get_format_from_path(value.path)).url
+        path = Path(value.path)
+
+        if path.exists():
+            thumbnail = DefaultThumbnailer(path, job_chain=self.job_chain)
+            optimized_image_url = thumbnail.get_image(get_format_from_path(path)).url
             result = optimized_image_url
 
         else:
-            logger.error(f"File `{value.path}` not found")
+            logger.error(f"File `{path}` not found")
             result = _dummyimage([])
 
         return result
@@ -76,16 +77,23 @@ class MImageSetField(ImageField):
     def __init__(
         self,
         size=None,
-        dimensions=None,
+        dimensions=(1, 2),
         base_job_chain=None,
         job_chains=None,
         **kwargs,
     ):
-        if bool(size and dimensions) and bool(job_chains):
-            msg = "Need to set `size` and `dimensions` or `job_chains` attribute (not both)."
+        if size and job_chains:
+            msg = "Need to set 'size' or 'job_chains' attribute (not both)."
             raise Exception(msg)
 
         elif size:
+            if not dimensions:
+                msg = (
+                    "If you specify the 'sizes' attribute, "
+                    "then the 'dimensions' attribute cannot be empty."
+                )
+                raise Exception(msg)
+
             self.job_chains = {}
 
             if 1 not in dimensions:
@@ -147,8 +155,10 @@ class MImageSetField(ImageField):
         if not value:
             return None
 
-        if not os.path.isfile(value.path):
-            logger.error(f"File `{value.path}` not found")
+        path = Path(value.path)
+
+        if not path.exists():
+            logger.error(f"File `{path}` not found")
             return [
                 {
                     "url": _dummyimage(self.job_chains[1]),
@@ -156,11 +166,11 @@ class MImageSetField(ImageField):
                 },
             ]
 
-        original_format = get_format_from_path(value.path)
+        original_format = get_format_from_path(path)
         result = []
 
         for dimension, job_chain in self.job_chains.items():
-            thumbnail = DefaultThumbnailer(value.path, job_chain=job_chain)
+            thumbnail = DefaultThumbnailer(path, job_chain=job_chain)
             original = thumbnail.get_image(original_format)
             webp_thumbnail = thumbnail.get_image("WEBP")
 

{meringue-1.3.0.dev0 → meringue-1.3.0.dev1}/meringue/thumbnail/images.py

@@ -131,7 +131,7 @@ class ThumbnailImage(AltersData):
         if self.out_format == constants.FORMAT_WEBP:
             return "image/webp"
 
-        guess_type = mimetypes.guess_type(str(self.absolute_path))[0]
+        guess_type = mimetypes.guess_type(self.filename)
         return guess_type[0]
 
     @property

{meringue-1.3.0.dev0 → meringue-1.3.0.dev1}/pyproject.toml

@@ -241,18 +241,18 @@ description = "Docs environment"
 detached = true
 python = "3.12"
 dependencies = [
-	"mkdocs[i18n]==1.5.3",
+	"mkdocs[i18n]==1.6.1",
 	"mkdocs-literate-nav==0.6.1",
-	"mkdocs-material==9.5.17",
-	"mkdocs-git-revision-date-localized-plugin==1.2.6",
+	"mkdocs-material==9.5.40",
+	"mkdocs-git-revision-date-localized-plugin==1.2.9",
 	"mkdocs-git-authors-plugin==0.9.0",
-	"mkdocstrings[python]==0.25.1",
-	"black==24.4.2",
+	"mkdocstrings[python]==0.26.1",
+	"black==24.10.0",
 	"mkdocs-minify-plugin==0.8.0",
 	"mkdocs-gen-files==0.5.0",
 	"Pygments==2.18.0",
-	"mike==2.1.1",
-	"linkchecker==10.4.0",
+	"mike==2.1.3",
+	"linkchecker==10.5.0",
 ]
 [tool.hatch.envs.docs.env-vars]
 MERINGUE_MKDOCS_ENABLE_MINIFY = "false"
@@ -260,7 +260,7 @@ MKDOCS_CONFIG = "mkdocs.yml"
 [tool.hatch.envs.docs.scripts]
 build = "mkdocs build --config-file {env:MKDOCS_CONFIG} --clean --strict {args}"
 serve = "mkdocs serve --config-file {env:MKDOCS_CONFIG} --dev-addr localhost:8000 {args}"
-ci-build = "mike deploy --config-file {env:MKDOCS_CONFIG} --update-aliases {args}"
+ci-build = "mike deploy --config-file {env:MKDOCS_CONFIG} {args}"
 validate = "linkchecker --config .linkcheckerrc docs/dist"
 build-check = [
 	"build --no-directory-urls",