blurry-cli 0.9.1__tar.gz → 0.11.0__tar.gz

{blurry_cli-0.9.1 → blurry_cli-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blurry-cli
-Version: 0.9.1
+Version: 0.11.0
 Summary: A Mistune-based static site generator for Python
 Home-page: https://github.com/blurry-dev/blurry
 License: MIT
@@ -28,11 +28,12 @@ Requires-Dist: dpath (>=2.1.6,<3.0.0)
 Requires-Dist: ffmpeg-python (>=0.2.0,<0.3.0)
 Requires-Dist: htmlmin2 (>=0.1.13,<0.2.0)
 Requires-Dist: jinja2-simple-tags (>=0.6.1,<0.7.0)
-Requires-Dist: livereload (>=2.6.3,<3.0.0)
-Requires-Dist: mistune (>=3.0.0rc5,<4.0.0)
+Requires-Dist: jinjax (>=0.48,<0.49)
+Requires-Dist: livereload (>=2.7.0,<3.0.0)
+Requires-Dist: mistune (>=3.0.2,<4.0.0)
 Requires-Dist: pydantic2-schemaorg (>=0.2.0,<0.3.0)
 Requires-Dist: rich (>=13.3.3,<14.0.0)
-Requires-Dist: selectolax (>=0.3.6,<0.4.0)
+Requires-Dist: selectolax (>=0.3.27,<0.4.0)
 Requires-Dist: toml (>=0.10.2,<0.11.0)
 Requires-Dist: typer (>=0.6.1,<0.7.0)
 Project-URL: Repository, https://github.com/blurry-dev/blurry
@@ -71,6 +72,7 @@ Blurry blends together high-quality libraries:
 
 - [Mistune](https://mistune.readthedocs.io/) to convert Markdown to HTML
 - [Jinja](https://jinja.palletsprojects.com/) for HTML templating
+- [JinjaX](https://jinjax.scaletti.dev/) for Jinja components
 - [LiveReload](https://livereload.readthedocs.io/) for an HTTP server with automatic browser reloading
 - [Typer](https://typer.tiangolo.com/) for its CLI interface
 - [ImageMagick](https://imagemagick.org/index.php) to resize and convert images

{blurry_cli-0.9.1 → blurry_cli-0.11.0}/README.md

@@ -31,6 +31,7 @@ Blurry blends together high-quality libraries:
 
 - [Mistune](https://mistune.readthedocs.io/) to convert Markdown to HTML
 - [Jinja](https://jinja.palletsprojects.com/) for HTML templating
+- [JinjaX](https://jinjax.scaletti.dev/) for Jinja components
 - [LiveReload](https://livereload.readthedocs.io/) for an HTTP server with automatic browser reloading
 - [Typer](https://typer.tiangolo.com/) for its CLI interface
 - [ImageMagick](https://imagemagick.org/index.php) to resize and convert images

{blurry_cli-0.9.1 → blurry_cli-0.11.0}/blurry/__init__.py

@@ -1,9 +1,12 @@
 import asyncio
 import dataclasses
+import importlib
 import json
 import mimetypes
 import os
+import pkgutil
 import shutil
+import sys
 from collections.abc import Coroutine
 from copy import deepcopy
 from datetime import datetime
@@ -47,9 +50,6 @@ def json_converter_with_dates(item: Any) -> None | str:
 
 warning_console = Console(stderr=True, style="bold yellow")
 
-print_blurry_name()
-print_plugin_table()
-
 
 app = AsyncTyper()
 
@@ -157,6 +157,10 @@ async def write_html_file(
 @app.async_command()
 async def build(release=True):
     """Generates HTML content from Markdown files."""
+
+    print_blurry_name()
+    print_plugin_table()
+
     update_settings()
     jinja_env = get_jinja_env()
     os.environ.setdefault(f"{ENV_VAR_PREFIX}BUILD_MODE", "prod" if release else "dev")
@@ -230,6 +234,20 @@ async def build_development():
     await build(release=False)
 
 
+async def reload_local_plugins_and_build():
+    """Reloads a project's local modules and performs a dev build"""
+    cwd = str(Path.cwd())
+
+    for _, package_name, _ in pkgutil.iter_modules([cwd]):
+        try:
+            module = sys.modules[package_name]
+        except KeyError:
+            continue
+        importlib.reload(module)
+
+    await build_development()
+
+
 @app.command()
 def runserver():
     """Starts HTTP server with live reloading."""
@@ -250,6 +268,10 @@ def runserver():
         f"{SETTINGS['TEMPLATES_DIRECTORY_NAME']}/**/*",
         lambda: event_loop.create_task(build_development()),
     )
+    livereload_server.watch(
+        "./**/*.py",
+        lambda: event_loop.create_task(reload_local_plugins_and_build()),
+    )
     livereload_server.watch(
         "blurry.toml", lambda: event_loop.create_task(build_development())
     )

{blurry_cli-0.9.1 → blurry_cli-0.11.0}/blurry/templates.py

@@ -1,15 +1,21 @@
+import jinjax
 from jinja2 import Environment
 from jinja2 import FileSystemLoader
 from jinja2 import select_autoescape
+
 from blurry.plugins import discovered_jinja_extensions
 from blurry.plugins import discovered_jinja_filter_plugins
 from blurry.settings import get_templates_directory
 from blurry.settings import SETTINGS
 
 
-def get_jinja_env():
+def get_jinja_env() -> Environment:
+    """
+    Returns a Jinja environment complete with JinjaX and any installed Jinja extensions and filters.
+    """
+    templates_directory = get_templates_directory()
     jinja_env = Environment(
-        loader=FileSystemLoader(get_templates_directory()),
+        loader=FileSystemLoader(templates_directory),
         autoescape=select_autoescape(
             list(
                 {
@@ -31,4 +37,9 @@ def get_jinja_env():
                 f"Could not load Jinja filter plugin: {filter_plugin.name}. "
                 "Possibly because {filter_plugin.value} is not a valid object reference."
             )
+
+    jinja_env.add_extension(jinjax.JinjaX)
+    catalog = jinjax.Catalog(jinja_env=jinja_env)
+    catalog.add_folder(templates_directory / "components")
+
     return jinja_env

{blurry_cli-0.9.1 → blurry_cli-0.11.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "blurry-cli"
-version = "0.9.1"
+version = "0.11.0"
 description = "A Mistune-based static site generator for Python"
 authors = ["John Franey <franey@duck.com>"]
 license = "MIT"
@@ -28,17 +28,18 @@ Jinja2 = "^3.0.0"
 PyLD = "^2.0.3"
 Wand = "^0.6.6"
 ffmpeg-python = "^0.2.0"
-livereload = "^2.6.3"
-mistune = "^3.0.0rc5"
+livereload = "^2.7.0"
+mistune = "^3.0.2"
 python = "^3.10"
 rich = "^13.3.3"
-selectolax = "^0.3.6"
+selectolax = "^0.3.27"
 toml = "^0.10.2"
 typer = "^0.6.1"
 htmlmin2 = "^0.1.13"
 pydantic2-schemaorg = "^0.2.0"
 dpath = "^2.1.6"
 jinja2-simple-tags = "^0.6.1"
+jinjax = "^0.48"
 
 [tool.poetry.scripts]
 blurry = 'blurry:main'