plain 0.22.1__py3-none-any.whl → 0.23.0__py3-none-any.whl

plain/urls/resolvers.py

@@ -16,7 +16,6 @@ from urllib.parse import quote
 from plain.preflight.urls import check_resolver
 from plain.runtime import settings
 from plain.utils.datastructures import MultiValueDict
-from plain.utils.functional import cached_property
 from plain.utils.http import RFC3986_SUBDELIMS, escape_leading_slashes
 from plain.utils.regex_helper import normalize
 
@@ -106,7 +105,7 @@ def _get_cached_resolver(urls_module):
         urls_module = import_module(urls_module)
 
     router = routers_registry.get_module_router(urls_module)
-    return URLResolver(pattern=RegexPattern(r"^/"), router_class=router)
+    return URLResolver(pattern=RegexPattern(r"^/"), router=router)
 
 
 @functools.cache
@@ -120,16 +119,18 @@ def get_ns_resolver(ns_pattern, resolver, converters):
     pattern.converters = dict(converters)
 
     class _NestedRouter(RouterBase):
+        namespace = ""
         urls = resolver.url_patterns
 
-    ns_resolver = URLResolver(pattern=pattern, router_class=_NestedRouter)
+    ns_resolver = URLResolver(pattern=pattern, router=_NestedRouter())
 
     class _NamespacedRouter(RouterBase):
+        namespace = ""
         urls = [ns_resolver]
 
     return URLResolver(
         pattern=RegexPattern(r"^/"),
-        router_class=_NamespacedRouter,
+        router=_NamespacedRouter(),
     )
 
 
@@ -138,18 +139,23 @@ class URLResolver:
         self,
         *,
         pattern,
-        router_class,
+        router,
     ):
         self.pattern = pattern
-        self.router_class = router_class
+        self.router = router
         self._reverse_dict = {}
         self._namespace_dict = {}
         self._app_dict = {}
         self._populated = False
         self._local = local()
 
+        # Set these immediately, in part so we can find routers
+        # where the attributes weren't set correctly.
+        self.namespace = self.router.namespace
+        self.url_patterns = self.router.urls
+
     def __repr__(self):
-        return f"<{self.__class__.__name__} {repr(self.router_class)} ({self.namespace}) {self.pattern.describe()}>"
+        return f"<{self.__class__.__name__} {repr(self.router)} ({self.namespace}) {self.pattern.describe()}>"
 
     def check(self):
         messages = []
@@ -313,15 +319,6 @@ class URLResolver:
             raise Resolver404({"tried": tried, "path": new_path})
         raise Resolver404({"path": path})
 
-    @cached_property
-    def url_patterns(self):
-        # Don't need to instantiate the class because they are just class attributes for now.
-        return self.router_class.urls
-
-    @cached_property
-    def namespace(self):
-        return self.router_class.namespace
-
     def reverse(self, lookup_view, *args, **kwargs):
         if args and kwargs:
             raise ValueError("Don't mix *args and **kwargs in call to reverse()!")

plain/urls/routers.py

@@ -1,5 +1,4 @@
 import re
-from abc import ABC
 from types import ModuleType
 from typing import TYPE_CHECKING
 
@@ -14,9 +13,16 @@ if TYPE_CHECKING:
     from plain.views import View
 
 
-class RouterBase(ABC):
-    namespace: str = ""
-    urls: list  # Required
+class RouterBase:
+    """
+    Base class for defining url patterns.
+
+    A namespace is required, and generally recommended,
+    except for the root router in app.urls where it is typically "".
+    """
+
+    namespace: str
+    urls: list
 
 
 class RoutersRegistry:
@@ -26,9 +32,12 @@ class RoutersRegistry:
         self._routers = {}
 
     def register_router(self, router_class):
+        router = (
+            router_class()
+        )  # Don't necessarily need to instantiate it yet, but will likely add methods.
         router_module_name = router_class.__module__
-        self._routers[router_module_name] = router_class
-        return router_class
+        self._routers[router_module_name] = router
+        return router
 
     def get_module_router(self, module):
         if isinstance(module, str):
@@ -62,17 +71,18 @@ def include(
         # We were given an explicit list of sub-patterns,
         # so we generate a router for it
         class _IncludeRouter(RouterBase):
+            namespace = ""
             urls = module_or_urls
 
-        return URLResolver(pattern=pattern, router_class=_IncludeRouter)
+        return URLResolver(pattern=pattern, router=_IncludeRouter())
     else:
         # We were given a module, so we need to look up the router for that module
         module = module_or_urls
-        router_class = routers_registry.get_module_router(module)
+        router = routers_registry.get_module_router(module)
 
         return URLResolver(
             pattern=pattern,
-            router_class=router_class,
+            router=router,
         )
 
 
@@ -109,4 +119,9 @@ def path(route: str | re.Pattern, view: "View", *, name: str = "") -> URLPattern
 
 
 routers_registry = RoutersRegistry()
-register_router = routers_registry.register_router
+
+
+def register_router(router_class):
+    """Decorator to register a router class"""
+    routers_registry.register_router(router_class)
+    return router_class  # Return the class, not the instance

{plain-0.22.1.dist-info → plain-0.23.0.dist-info}/METADATA

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

{plain-0.22.1.dist-info → plain-0.23.0.dist-info}/RECORD

@@ -96,8 +96,8 @@ plain/urls/__init__.py,sha256=XF-W2GqLMA4bHbDRKnpZ7tiUtJ-BhWN-yAzw4nNnHdc,590
 plain/urls/converters.py,sha256=s2JZVOdzZC16lgobsI93hygcdH5L0Kj4742WEkXsVcs,1193
 plain/urls/exceptions.py,sha256=q4iPh3Aa-zHbA-tw8v6WyX1J1n5WdAady2xvxFuyXB0,114
 plain/urls/patterns.py,sha256=bU_xfhZbKMSgRG9OJ8w_NSuYRm_9zGnqoz_WY44fhUk,9358
-plain/urls/resolvers.py,sha256=T_N7hZ2VrWWpLNkMbzpNcPK8OJb4yPt6QoK_qIls4D8,15592
-plain/urls/routers.py,sha256=0vwzL5udLfQDwFfE4_3lzRVq0Lsx9RcDF4rnnEiJJ1w,3613
+plain/urls/resolvers.py,sha256=bVh7risata9V7F42o7a1BL3GuxjBsmvI-kEFUi_U9zI,15488
+plain/urls/routers.py,sha256=RtOBeivHAJbaFW5DMu-gma47UKqyO9PSmxp_y5cTJCs,4029
 plain/urls/utils.py,sha256=WiGq6hHI-5DLFOxCQTAZ2qm0J-UdGosLcjuxlfK6_Tg,2137
 plain/utils/README.md,sha256=Bf5OG-MkOJDz_U8RGVreDfAI4M4nnPaLtk-LdinxHSc,99
 plain/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -138,8 +138,8 @@ plain/views/forms.py,sha256=RhlaUcZCkeqokY_fvv-NOS-kgZAG4XhDLOPbf9K_Zlc,2691
 plain/views/objects.py,sha256=g5Lzno0Zsv0K449UpcCtxwCoO7WMRAWqKlxxV2V0_qg,8263
 plain/views/redirect.py,sha256=9zHZgKvtSkdrMX9KmsRM8hJTPmBktxhc4d8OitbuniI,1724
 plain/views/templates.py,sha256=cBkFNCSXgVi8cMqQbhsqJ4M_rIQYVl8cUvq9qu4YIes,1951
-plain-0.22.1.dist-info/METADATA,sha256=lbcAVRTvoSbCtA3Nlt-ShyzQV1UOhb2bk_FSDKL5pS4,319
-plain-0.22.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain-0.22.1.dist-info/entry_points.txt,sha256=DHHprvufgd7xypiBiqMANYRnpJ9xPPYhYbnPGwOkWqE,40
-plain-0.22.1.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
-plain-0.22.1.dist-info/RECORD,,
+plain-0.23.0.dist-info/METADATA,sha256=bxiquJgm2Ost04nSXFcMdh8rLoPkO3EeCceWqod97pc,319
+plain-0.23.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain-0.23.0.dist-info/entry_points.txt,sha256=DHHprvufgd7xypiBiqMANYRnpJ9xPPYhYbnPGwOkWqE,40
+plain-0.23.0.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
+plain-0.23.0.dist-info/RECORD,,