blurry-cli 0.4.0__tar.gz → 0.4.2__tar.gz

{blurry_cli-0.4.0 → blurry_cli-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blurry-cli
-Version: 0.4.0
+Version: 0.4.2
 Summary: A Mistune-based static site generator for Python
 Home-page: https://github.com/blurry-dev/blurry
 License: MIT
@@ -14,8 +14,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Content Management System
 Classifier: Topic :: Internet :: WWW/HTTP :: Site Management 
 Classifier: Topic :: Software Development :: Libraries :: Python Modules

blurry_cli-0.4.2/blurry/__main__.py

@@ -0,0 +1,3 @@
+from blurry import main
+
+main()

{blurry_cli-0.4.0 → blurry_cli-0.4.2}/blurry/images.py

@@ -1,7 +1,5 @@
 import asyncio
-import concurrent.futures
 from pathlib import Path
-from typing import Optional
 
 from wand.image import Image
 
@@ -31,7 +29,7 @@ def add_image_width_to_path(image_path: Path, width: int) -> Path:
     return Path(new_filename)
 
 
-async def convert_image_to_avif(image_path: Path, target_path: Optional[Path] = None):
+async def convert_image_to_avif(image_path: Path, target_path: Path | None = None):
     image_suffix = image_path.suffix
     if image_suffix in [".webp", ".gif"]:
         return
@@ -59,18 +57,16 @@ async def generate_images_for_srcset(image_path: Path):
             new_filepath = add_image_width_to_path(image_path, target_width)
             relative_filepath = new_filepath.resolve().relative_to(CONTENT_DIR)
             build_filepath = BUILD_DIR / relative_filepath
-            if build_filepath.exists():
-                continue
             with img.clone() as resized:
+                avif_files_to_create.append(build_filepath)
+                if build_filepath.exists():
+                    continue
                 resized.transform(resize=str(target_width))
                 resized.save(filename=build_filepath)
-                avif_files_to_create.append(build_filepath)
 
-        with concurrent.futures.ProcessPoolExecutor() as executor:
-            executor.map(
-                lambda avif_file: asyncio.run(convert_image_to_avif(avif_file)),
-                avif_files_to_create,
-            )
+        await asyncio.gather(
+            *[convert_image_to_avif(avif_file) for avif_file in avif_files_to_create]
+        )
 
 
 def get_widths_for_image_width(image_width: int) -> list[int]:

{blurry_cli-0.4.0 → blurry_cli-0.4.2}/blurry/markdown/__init__.py

@@ -1,6 +1,5 @@
 from pathlib import Path
 from typing import Any
-from typing import Type
 from typing import TypeGuard
 
 import mistune
@@ -28,7 +27,7 @@ from blurry.settings import SETTINGS
 from blurry.types import is_str
 from blurry.utils import build_path_to_url
 from blurry.utils import content_path_to_url
-from blurry.utils import convert_relative_path_in_markdown_to_relative_build_path
+from blurry.utils import convert_relative_path_in_markdown_file_to_pathname
 from blurry.utils import path_to_url_pathname
 from blurry.utils import remove_lazy_loading_from_first_image
 from blurry.utils import resolve_relative_path_in_markdown
@@ -102,7 +101,9 @@ class BlurryRenderer(mistune.HTMLRenderer):
     def link(self, text, url, title: str | None = None) -> str:
         link_is_relative = url.startswith(".")
         if link_is_relative:
-            url = convert_relative_path_in_markdown_to_relative_build_path(url)
+            url = convert_relative_path_in_markdown_file_to_pathname(
+                content_directory=CONTENT_DIR, filepath=self.filepath, relative_path=url
+            )
 
         if text is None:
             text = url
@@ -111,7 +112,9 @@ class BlurryRenderer(mistune.HTMLRenderer):
         }
         if title:
             attrs["title"] = escape(title)
-        if not link_is_relative:
+        if link_is_relative:
+            attrs["rel"] = "noreferrer"
+        else:
             attrs["target"] = "_blank"
             attrs["rel"] = "noopener"
 
@@ -124,7 +127,7 @@ class BlurryRenderer(mistune.HTMLRenderer):
 
 def is_blurry_renderer(
     renderer: mistune.HTMLRenderer,
-) -> TypeGuard[Type[BlurryRenderer]]:
+) -> TypeGuard[type[BlurryRenderer]]:
     return isinstance(renderer, BlurryRenderer)
 
 

{blurry_cli-0.4.0 → blurry_cli-0.4.2}/blurry/plugins/html_plugins/minify_html_plugin.py

@@ -23,9 +23,7 @@ def minify_style_tags(html: str) -> str:
     for style_tag in style_tags:
         css = style_tag.text()
         minified_css = minify_css(css)
-        minified_style_tag = HTMLParser(
-            f"<style>{minified_css}</style>"
-        ).head.child  # type: ignore
+        minified_style_tag = HTMLParser(f"<style>{minified_css}</style>").head.child  # type: ignore
         style_tag.replace_with(minified_style_tag)  # type: ignore
 
     return parser.html or html

{blurry_cli-0.4.0 → blurry_cli-0.4.2}/blurry/sitemap.py

@@ -14,7 +14,7 @@ SITEMAP_TEMPLATE = """<?xml version="1.0" encoding="UTF-8"?>
 {urls}
 </urlset>
 """.strip()
-URL_TEMPLATE = "    <url><loc>{url}</loc><lastmod>{lastmod}</lastmod></url>"
+URL_TEMPLATE = "    <url><loc>{url}</loc>{lastmod_tag}</url>"
 
 
 def generate_sitemap_for_file_data_list(file_data_list: list[MarkdownFileData]) -> str:
@@ -23,11 +23,12 @@ def generate_sitemap_for_file_data_list(file_data_list: list[MarkdownFileData])
         lastmod = file_data.front_matter.get(
             "dateModified"
         ) or file_data.front_matter.get("datePublished")
+        lastmod_tag = f"<lastmod>{lastmod}</lastmod>" if lastmod else ""
         url = file_data.front_matter.get("url")
-        sitemap_url_data.append({"lastmod": lastmod, "url": url})
+        sitemap_url_data.append({"lastmod_tag": lastmod_tag, "url": url})
 
     sitemap_url_content = "\n".join(
-        URL_TEMPLATE.format(url=data["url"], lastmod=data["lastmod"])
+        URL_TEMPLATE.format(url=data["url"], lastmod_tag=data["lastmod_tag"])
         for data in sitemap_url_data
     )
     return SITEMAP_TEMPLATE.format(urls=sitemap_url_content)

{blurry_cli-0.4.0 → blurry_cli-0.4.2}/blurry/utils.py

@@ -8,6 +8,7 @@ from blurry.settings import SETTINGS
 from blurry.types import DirectoryFileData
 
 CONTENT_DIR = get_content_directory()
+BUILD_DIR = get_build_directory()
 
 
 def get_domain_with_scheme():
@@ -29,14 +30,30 @@ def convert_content_path_to_directory_in_build(path: Path) -> Path:
     return BUILD_DIR.joinpath(path)
 
 
-def convert_relative_path_in_markdown_to_relative_build_path(relative_path: str) -> str:
-    if relative_path.startswith("./"):
-        relative_path = relative_path[2:]
+def convert_relative_path_in_markdown_file_to_pathname(
+    content_directory: Path, filepath: Path, relative_path: str
+) -> str:
+    directory = filepath.parent
+    pathname_start = directory.relative_to(content_directory)
+
+    while relative_path.startswith(prefix := "../"):
+        pathname_start = pathname_start.parent
+        relative_path = relative_path[len(prefix) :]
+    if relative_path.startswith(prefix := "./"):
+        relative_path = relative_path[len(prefix) :]
     if relative_path.endswith("index.md"):
         relative_path = relative_path.replace("index.md", "")
     elif relative_path.endswith(".md"):
         relative_path = relative_path.replace(".md", "") + "/"
-    return f"../{relative_path}"
+
+    pathname_prefix = str(pathname_start).removeprefix(".")
+
+    pathname = f"{pathname_prefix}/{relative_path}"
+
+    if not pathname.startswith("/"):
+        pathname = f"/{pathname}"
+
+    return pathname
 
 
 def resolve_relative_path_in_markdown(relative_path: str, markdown_file: Path) -> Path:
@@ -57,17 +74,23 @@ def write_index_file_creating_path(directory_path: Path, content: str):
     filepath.write_text(content)
 
 
-def content_path_to_url(path: Path) -> str:
+def content_path_to_url_pathname(path: Path) -> str:
     BUILD_DIR = get_build_directory()
     if path.suffix == ".md":
         build_directory = convert_content_path_to_directory_in_build(path)
         relative_directory = build_directory.relative_to(BUILD_DIR)
         # Handle root page
         if str(relative_directory) == ".":
-            return f"{get_domain_with_scheme()}/"
-        return f"{get_domain_with_scheme()}/{relative_directory}/"
+            return "/"
+        return f"/{relative_directory}/"
+
+    return path_to_url_pathname(path)
 
-    return f"{get_domain_with_scheme()}{path_to_url_pathname(path)}"
+
+def content_path_to_url(path: Path) -> str:
+    domain_with_scheme = get_domain_with_scheme()
+    pathname = content_path_to_url_pathname(path)
+    return f"{domain_with_scheme}{pathname}"
 
 
 def build_path_to_url(path: Path) -> str:

{blurry_cli-0.4.0 → blurry_cli-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "blurry-cli"
-version = "0.4.0"
+version = "0.4.2"
 description = "A Mistune-based static site generator for Python"
 authors = ["John Franey <franey@duck.com>"]
 license = "MIT"
@@ -35,15 +35,17 @@ selectolax = "^0.3.6"
 toml = "^0.10.2"
 typer = "^0.6.1"
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.scripts]
+blurry = 'blurry:main'
+
+[tool.poetry.group.dev.dependencies]
 black = "^22.10.0"
+nox = "^2023.4.22"
 pyright = "^1.1.311"
 pytest = "^6.2.2"
 pytest-cov = "^2.11.1"
 pytest-watch = "^4.2.0"
-
-[tool.poetry.scripts]
-blurry = 'blurry:main'
+ruff = "^0.1.5"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
@@ -53,6 +55,10 @@ build-backend = "poetry.core.masonry.api"
 include = ["blurry/**"]
 exclude = ["**/node_modules", "**/__pycache__", "**/.*", "blurry/tests"]
 
+[tool.ruff]
+target-version = "py310"
+line-length = 88
+
 [tool.poetry.plugins."blurry.html_plugins"]
 minify_html = 'blurry.plugins.html_plugins.minify_html_plugin:minify_html'
 

blurry_cli-0.4.0/blurry/__main__.py

@@ -1,5 +0,0 @@
-from __future__ import absolute_import
-
-from blurry import main
-
-main()