plain 0.42.1__tar.gz → 0.43.0__tar.gz

{plain-0.42.1 → plain-0.43.0}/.gitignore

@@ -13,3 +13,5 @@ plain*/tests/.plain
 .aider*
 
 /llms-full.txt
+
+/.plain

{plain-0.42.1 → plain-0.43.0}/PKG-INFO

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

{plain-0.42.1 → plain-0.43.0}/plain/assets/compile.py

@@ -2,7 +2,7 @@ import gzip
 import os
 import shutil
 
-from plain.runtime import settings
+from plain.runtime import PLAIN_TEMP_PATH
 
 from .finders import iter_assets
 from .fingerprints import AssetsFingerprintsManifest, get_file_fingerprint
@@ -46,7 +46,7 @@ def get_compiled_path():
 
     There's no reason currently for this to be a user-facing setting.
     """
-    return settings.PLAIN_TEMP_PATH / "assets" / "compiled"
+    return PLAIN_TEMP_PATH / "assets" / "compiled"
 
 
 def compile_assets(*, target_dir, keep_original, fingerprint, compress):

{plain-0.42.1 → plain-0.43.0}/plain/assets/fingerprints.py

@@ -2,7 +2,7 @@ import hashlib
 import json
 from functools import cache
 
-from plain.runtime import settings
+from plain.runtime import PLAIN_TEMP_PATH
 
 FINGERPRINT_LENGTH = 7
 
@@ -13,7 +13,7 @@ class AssetsFingerprintsManifest(dict):
     """
 
     def __init__(self):
-        self.path = settings.PLAIN_TEMP_PATH / "assets" / "fingerprints.json"
+        self.path = PLAIN_TEMP_PATH / "assets" / "fingerprints.json"
 
     def load(self):
         if self.path.exists():

{plain-0.42.1 → plain-0.43.0}/plain/runtime/__init__.py

@@ -13,6 +13,7 @@ except importlib.metadata.PackageNotFoundError:
 
 # Made available without setup or settings
 APP_PATH = Path.cwd() / "app"
+PLAIN_TEMP_PATH = Path.cwd() / ".plain"
 
 # from plain.runtime import settings
 settings = Settings()

{plain-0.42.1 → plain-0.43.0}/plain/runtime/global_settings.py

@@ -3,18 +3,12 @@ Default Plain settings. Override these with settings in the module pointed to
 by the PLAIN_SETTINGS_MODULE environment variable.
 """
 
-from pathlib import Path
-
-from plain.runtime import APP_PATH as default_app_path
-
 ####################
 # CORE             #
 ####################
 
 DEBUG: bool = False
 
-PLAIN_TEMP_PATH: Path = default_app_path.parent / ".plain"
-
 # Hosts/domain names that are valid for this site.
 # "*" matches anything, ".example.com" matches example.com and all subdomains
 ALLOWED_HOSTS: list[str] = []

{plain-0.42.1 → plain-0.43.0}/plain/urls/resolvers.py

@@ -103,7 +103,6 @@ class URLResolver:
         self.router = router
         self._reverse_dict = {}
         self._namespace_dict = {}
-        self._app_dict = {}
         self._populated = False
         self._local = local()
 
@@ -132,7 +131,6 @@ class URLResolver:
             self._local.populating = True
             lookups = MultiValueDict()
             namespaces = {}
-            packages = {}
             for url_pattern in reversed(self.url_patterns):
                 p_pattern = url_pattern.pattern.regex.pattern
                 p_pattern = p_pattern.removeprefix("^")
@@ -158,9 +156,6 @@ class URLResolver:
                 else:  # url_pattern is a URLResolver.
                     url_pattern._populate()
                     if url_pattern.namespace:
-                        packages.setdefault(url_pattern.namespace, []).append(
-                            url_pattern.namespace
-                        )
                         namespaces[url_pattern.namespace] = (p_pattern, url_pattern)
                     else:
                         for name in url_pattern.reverse_dict:
@@ -189,13 +184,7 @@ class URLResolver:
                             current_converters = url_pattern.pattern.converters
                             sub_pattern.pattern.converters.update(current_converters)
                             namespaces[namespace] = (p_pattern + prefix, sub_pattern)
-                        for (
-                            namespace,
-                            namespace_list,
-                        ) in url_pattern.app_dict.items():
-                            packages.setdefault(namespace, []).extend(namespace_list)
             self._namespace_dict = namespaces
-            self._app_dict = packages
             self._reverse_dict = lookups
             self._populated = True
         finally:
@@ -213,12 +202,6 @@ class URLResolver:
             self._populate()
         return self._namespace_dict
 
-    @property
-    def app_dict(self):
-        if not self._app_dict:
-            self._populate()
-        return self._app_dict
-
     @staticmethod
     def _join_route(route1, route2):
         """Join two routes, without the starting ^ in the second route."""

plain-0.43.0/plain/urls/utils.py

@@ -0,0 +1,43 @@
+from plain.utils.functional import lazy
+
+from .exceptions import NoReverseMatch
+from .resolvers import get_ns_resolver, get_resolver
+
+
+def reverse(url_name: str, *args, **kwargs):
+    resolver = get_resolver()
+
+    *path, view = url_name.split(":")
+
+    current_path = None
+
+    resolved_path = []
+    ns_pattern = ""
+    ns_converters = {}
+    for ns in path:
+        current_ns = current_path.pop() if current_path else None
+
+        if ns != current_ns:
+            current_path = None
+
+        try:
+            extra, resolver = resolver.namespace_dict[ns]
+            resolved_path.append(ns)
+            ns_pattern += extra
+            ns_converters.update(resolver.pattern.converters)
+        except KeyError as key:
+            if resolved_path:
+                raise NoReverseMatch(
+                    "{} is not a registered namespace inside '{}'".format(
+                        key, ":".join(resolved_path)
+                    )
+                )
+            else:
+                raise NoReverseMatch(f"{key} is not a registered namespace")
+    if ns_pattern:
+        resolver = get_ns_resolver(ns_pattern, resolver, tuple(ns_converters.items()))
+
+    return resolver.reverse(view, *args, **kwargs)
+
+
+reverse_lazy = lazy(reverse, str)

{plain-0.42.1 → plain-0.43.0}/pyproject.toml

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

plain-0.42.1/plain/urls/utils.py

@@ -1,62 +0,0 @@
-from plain.utils.functional import lazy
-
-from .exceptions import NoReverseMatch
-from .resolvers import get_ns_resolver, get_resolver
-
-
-def reverse(viewname, *args, **kwargs):
-    resolver = get_resolver()
-
-    if not isinstance(viewname, str):
-        view = viewname
-    else:
-        *path, view = viewname.split(":")
-
-        current_path = None
-
-        resolved_path = []
-        ns_pattern = ""
-        ns_converters = {}
-        for ns in path:
-            current_ns = current_path.pop() if current_path else None
-            # Lookup the name to see if it could be an app identifier.
-            try:
-                app_list = resolver.app_dict[ns]
-                # Yes! Path part matches an app in the current Resolver.
-                if current_ns and current_ns in app_list:
-                    # If we are reversing for a particular app, use that
-                    # namespace.
-                    ns = current_ns
-                elif ns not in app_list:
-                    # The name isn't shared by one of the instances (i.e.,
-                    # the default) so pick the first instance as the default.
-                    ns = app_list[0]
-            except KeyError:
-                pass
-
-            if ns != current_ns:
-                current_path = None
-
-            try:
-                extra, resolver = resolver.namespace_dict[ns]
-                resolved_path.append(ns)
-                ns_pattern += extra
-                ns_converters.update(resolver.pattern.converters)
-            except KeyError as key:
-                if resolved_path:
-                    raise NoReverseMatch(
-                        "{} is not a registered namespace inside '{}'".format(
-                            key, ":".join(resolved_path)
-                        )
-                    )
-                else:
-                    raise NoReverseMatch(f"{key} is not a registered namespace")
-        if ns_pattern:
-            resolver = get_ns_resolver(
-                ns_pattern, resolver, tuple(ns_converters.items())
-            )
-
-    return resolver.reverse(view, *args, **kwargs)
-
-
-reverse_lazy = lazy(reverse, str)

plain-0.42.1/tests/.bolt/assets_collected/assets.json

@@ -1 +0,0 @@
-{"paths": {}, "version": "1.1", "hash": "d75171398898"}