plain 0.42.1__py3-none-any.whl → 0.43.0__py3-none-any.whl

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/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/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/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/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/urls/utils.py

@@ -4,57 +4,38 @@ from .exceptions import NoReverseMatch
 from .resolvers import get_ns_resolver, get_resolver
 
 
-def reverse(viewname, *args, **kwargs):
+def reverse(url_name: str, *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)
-                        )
+    *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())
-            )
+                )
+            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)
 

{plain-0.42.1.dist-info → plain-0.43.0.dist-info}/METADATA

@@ -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.dist-info → plain-0.43.0.dist-info}/RECORD

@@ -9,9 +9,9 @@ plain/validators.py,sha256=TePzFHzwR4JXUAZ_Y2vC6mkKgVxHX3QBXI6Oex0rV8c,19236
 plain/wsgi.py,sha256=R6k5FiAElvGDApEbMPTT0MPqSD7n2e2Az5chQqJZU0I,236
 plain/assets/README.md,sha256=wgsmBK5vAHgFMZ010q7LTrgLq5BTfuPuuug5HLZ9GNw,3774
 plain/assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-plain/assets/compile.py,sha256=rABDHj7k_YAIPVvS7JJLCukEgUhb7h5oz9ajt5fGirI,3298
+plain/assets/compile.py,sha256=DT85ygnNcY2_7VeozdsQlBvA-DzV7enUIMO_igJ1PjY,3296
 plain/assets/finders.py,sha256=2k8QZAbfUbc1LykxbzdazTSB6xNxJZnsZaGhWbSFZZs,1452
-plain/assets/fingerprints.py,sha256=2LPHLUkoITMseLDmemTpBtMRDWCR2H5GAHjC6AN4gz0,1367
+plain/assets/fingerprints.py,sha256=D-x0o49sUuWfx86BssDyo87yJCjWrV0go6JGPagvMAE,1365
 plain/assets/urls.py,sha256=zQUA8bAlh9qVqskPJJrqWd9DjvetOi5jPSqy4vUX0J4,1161
 plain/assets/views.py,sha256=T_0Qh6v9qBerEBYbhToigwOzsij-x1z_R-1zETQcIh0,9447
 plain/chores/README.md,sha256=Da8Nw8ZF7PlAE_iVb0AqJGbLOu0F6HC0cj1K451KBak,1946
@@ -82,8 +82,8 @@ plain/preflight/registry.py,sha256=wHLq6LSMkKunkxElBmNwzMzQx3tc6OGYeKyOOi0tuyQ,2
 plain/preflight/security.py,sha256=oxUZBp2M0bpBfUoLYepIxoex2Y90nyjlrL8XU8UTHYY,2438
 plain/preflight/urls.py,sha256=cQ-WnFa_5oztpKdtwhuIGb7pXEml__bHsjs1SWO2YNI,1468
 plain/runtime/README.md,sha256=S_FIOmSq8LkVQHh9Xm6s3EJWKTVdlSr5A_bNXgh02X8,4740
-plain/runtime/__init__.py,sha256=o2RVETiL8U0lMFBpbtfnxflhw_4MFllMV6CEpX3RqZs,1965
-plain/runtime/global_settings.py,sha256=Vi7jabMF-SBolkP5qx1nLnGoDt_kD1KT_wgtbjNlPHw,5580
+plain/runtime/__init__.py,sha256=0Q7k0V-8OfmTaKC0paNvV4Lx92L1_J7xoEWQH9aO5y4,2005
+plain/runtime/global_settings.py,sha256=bg7vnEDGU4mdMKFF7QnnhCFawAUjqqXiocryaOr6gsU,5438
 plain/runtime/user_settings.py,sha256=uRHHVfzUvHon91_fOKj7K2WaBYwJ1gCPLfeXqKj5CTs,10902
 plain/signals/README.md,sha256=FInfJXdVQkb7u93PvD8XgPbz_f6m0l2xIu_4PyttV1E,234
 plain/signals/__init__.py,sha256=eAs0kLqptuP6I31dWXeAqRNji3svplpAV4Ez6ktjwXM,131
@@ -108,9 +108,9 @@ plain/urls/__init__.py,sha256=DFO2OL1IllHW5USPIb5uYvvzf_G-Bl0Qu1zrRLHmWyM,542
 plain/urls/converters.py,sha256=s2JZVOdzZC16lgobsI93hygcdH5L0Kj4742WEkXsVcs,1193
 plain/urls/exceptions.py,sha256=q4iPh3Aa-zHbA-tw8v6WyX1J1n5WdAady2xvxFuyXB0,114
 plain/urls/patterns.py,sha256=7DxL5LWq40lI4hFxAJ2I4MyA3HrbCmNx_dHOk8yYiK8,8259
-plain/urls/resolvers.py,sha256=3I10pLpLvhL4NamABJGH8e5Se6Iqa2y7V6hMAFQxVSg,13264
+plain/urls/resolvers.py,sha256=sZsFQRPlPkogXIVSctZBXJaG0spJzuoJBmtOEZwIXXY,12630
 plain/urls/routers.py,sha256=iEsQtTpPNDDVn7r_BQX84FESGSjOeD5qgyO_ep5rzaU,2819
-plain/urls/utils.py,sha256=WiGq6hHI-5DLFOxCQTAZ2qm0J-UdGosLcjuxlfK6_Tg,2137
+plain/urls/utils.py,sha256=lKxTX_A3XJpIH7FjlNYju108stY6-8Sw2uVdiSsxOKQ,1249
 plain/utils/README.md,sha256=hRRkcg4CxMX-zz8d4Bn6V2uJr_VKgTLurc1jY7QlEx8,198
 plain/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plain/utils/cache.py,sha256=iuvOTIfI1s857iVOAPNLK5lkzlrl0fIiBYaiUXWQu40,5303
@@ -146,8 +146,8 @@ plain/views/forms.py,sha256=ESZOXuo6IeYixp1RZvPb94KplkowRiwO2eGJCM6zJI0,2400
 plain/views/objects.py,sha256=GGbcfg_9fPZ-PiaBwIHG2e__8GfWDR7JQtQ15wTyiHg,5970
 plain/views/redirect.py,sha256=daq2cQIkdDF78bt43sjuZxRAyJm_t_SKw6tyPmiXPIc,1985
 plain/views/templates.py,sha256=SU1fO9gVMp-gEQHYeFplxvmgeMyrLgT8MJ12WNVmQC8,2085
-plain-0.42.1.dist-info/METADATA,sha256=IHizSykNDJ-Emw_cLUPeI9le20o129_Olts1xjYHakM,4297
-plain-0.42.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain-0.42.1.dist-info/entry_points.txt,sha256=1Ys2lsSeMepD1vz8RSrJopna0RQfUd951vYvCRsvl6A,45
-plain-0.42.1.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
-plain-0.42.1.dist-info/RECORD,,
+plain-0.43.0.dist-info/METADATA,sha256=OyYSGi2uaYzHFeHNmMYOzFiBtsurMXzDvJjug6-vTQg,4297
+plain-0.43.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain-0.43.0.dist-info/entry_points.txt,sha256=1Ys2lsSeMepD1vz8RSrJopna0RQfUd951vYvCRsvl6A,45
+plain-0.43.0.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
+plain-0.43.0.dist-info/RECORD,,