plain 0.18.0__tar.gz → 0.19.0__tar.gz

{plain-0.18.0 → plain-0.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain
-Version: 0.18.0
+Version: 0.19.0
 Summary: A web framework for building products with Python.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-File: LICENSE

{plain-0.18.0 → plain-0.19.0}/plain/assets/views.py

@@ -28,8 +28,11 @@ class AssetView(View):
     This class could be subclassed to further tweak the responses or behavior.
     """
 
+    def get_url_path(self):
+        return self.url_kwargs["path"]
+
     def get(self):
-        url_path = self.url_kwargs["path"]
+        url_path = self.get_url_path()
 
         # Make a trailing slash work, but we don't expect it
         url_path = url_path.rstrip("/")

{plain-0.18.0 → plain-0.19.0}/plain/cli/cli.py

@@ -1,9 +1,9 @@
 import importlib
-import json
 import os
 import shutil
 import subprocess
 import sys
+import tomllib
 import traceback
 from importlib.metadata import entry_points
 from importlib.util import find_spec
@@ -292,22 +292,23 @@ def compile(keep_original, fingerprint, compress):
         result = entry_point.load()()
         print()
 
-    # TODO also look in [tool.plain.compile.run]
-
-    # Run a "compile" script from package.json automatically
-    package_json = Path("package.json")
-    if package_json.exists():
-        with package_json.open() as f:
-            package = json.load(f)
-
-        if package.get("scripts", {}).get("compile"):
-            click.secho("Running `npm run compile`", bold=True)
-            result = subprocess.run(["npm", "run", "compile"])
+    pyproject_path = plain.runtime.APP_PATH.parent / "pyproject.toml"
+    if pyproject_path.exists():
+        with pyproject_path.open("rb") as f:
+            pyproject = tomllib.load(f)
+
+        for name, data in (
+            pyproject.get("tool", {})
+            .get("plain", {})
+            .get("compile", {})
+            .get("run", {})
+            .items()
+        ):
+            click.secho(f"Running {name} from pyproject.toml", bold=True)
+            result = subprocess.run(data["cmd"], shell=True)
             print()
             if result.returncode:
-                click.secho(
-                    f"Error in `npm run compile` (exit {result.returncode})", fg="red"
-                )
+                click.secho(f"Error in {name} (exit {result.returncode})", fg="red")
                 sys.exit(result.returncode)
 
     # Compile our assets

{plain-0.18.0 → plain-0.19.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain"
-version = "0.18.0"
+version = "0.19.0"
 description = "A web framework for building products with Python."
 authors = [{name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev"}]
 readme = "README.md"