plain 0.29.0__py3-none-any.whl → 0.31.0__py3-none-any.whl

plain/assets/urls.py

@@ -1,12 +1,11 @@
 from plain.runtime import settings
-from plain.urls import RouterBase, path, register_router, reverse
+from plain.urls import Router, path, reverse
 
 from .fingerprints import get_fingerprinted_url_path
 from .views import AssetView
 
 
-@register_router
-class Router(RouterBase):
+class AssetsRouter(Router):
     namespace = "assets"
     urls = [
         path("<path:path>", AssetView, name="asset"),
@@ -29,4 +28,4 @@ def get_asset_url(url_path):
     if settings.ASSETS_BASE_URL:
         return settings.ASSETS_BASE_URL + resolved_url_path
 
-    return reverse(Router.namespace + ":asset", path=resolved_url_path)
+    return reverse(AssetsRouter.namespace + ":asset", path=resolved_url_path)

plain/assets/views.py

@@ -206,9 +206,9 @@ class AssetView(View):
             # or we're already looking at it.
             return
 
-        from .urls import Router
+        from .urls import AssetsRouter
 
-        namespace = Router.namespace
+        namespace = AssetsRouter.namespace
 
         return ResponseRedirect(
             redirect_to=reverse(f"{namespace}:asset", fingerprinted_url_path),

plain/cli/core.py

@@ -379,10 +379,10 @@ def create(package_name):
     # Create a urls.py file with a default namespace
     if not (package_dir / "urls.py").exists():
         (package_dir / "urls.py").write_text(
-            f"""from plain.urls import path, RouterBase, register_router
+            f"""from plain.urls import path, Router
 
-@register_router
-class Router(RouterBase):
+
+class {package_name.capitalize()}Router(Router):
     namespace = f"{package_name}"
     urls = [
         # path("", views.IndexView, name="index"),
@@ -422,10 +422,15 @@ def generate_secret_key():
 @plain_cli.command()
 @click.option("--flat", is_flag=True, help="List all URLs in a flat list")
 def urls(flat):
-    """Print all URL patterns under settings.URLS_MODULE"""
+    """Print all URL patterns under settings.URLS_ROUTER"""
+    from plain.runtime import settings
     from plain.urls import URLResolver, get_resolver
 
-    resolver = get_resolver()
+    if not settings.URLS_ROUTER:
+        click.secho("URLS_ROUTER is not set", fg="red")
+        sys.exit(1)
+
+    resolver = get_resolver(settings.URLS_ROUTER)
     if flat:
 
         def flat_list(patterns, prefix="", curr_ns=""):

plain/forms/fields.py

@@ -43,7 +43,6 @@ __all__ = (
     "FloatField",
     "DecimalField",
     "JSONField",
-    "SlugField",
     "TypedChoiceField",
     "UUIDField",
 )
@@ -900,16 +899,6 @@ class MultipleChoiceField(ChoiceField):
         return data.getlist(html_name)
 
 
-class SlugField(CharField):
-    default_validators = [validators.validate_slug]
-
-    def __init__(self, *, allow_unicode=False, **kwargs):
-        self.allow_unicode = allow_unicode
-        if self.allow_unicode:
-            self.default_validators = [validators.validate_unicode_slug]
-        super().__init__(**kwargs)
-
-
 class UUIDField(CharField):
     default_error_messages = {
         "invalid": "Enter a valid UUID.",

plain/preflight/urls.py

@@ -7,11 +7,12 @@ from . import Error, Warning, register
 
 @register
 def check_url_config(package_configs, **kwargs):
-    if getattr(settings, "URLS_MODULE", None):
+    if getattr(settings, "URLS_ROUTER", None):
         from plain.urls import get_resolver
 
         resolver = get_resolver()
         return check_resolver(resolver)
+
     return []
 
 
@@ -33,7 +34,7 @@ def check_url_namespaces_unique(package_configs, **kwargs):
     """
     Warn if URL namespaces used in applications aren't unique.
     """
-    if not getattr(settings, "URLS_MODULE", None):
+    if not getattr(settings, "URLS_ROUTER", None):
         return []
 
     from plain.urls import get_resolver

plain/runtime/global_settings.py

@@ -74,7 +74,7 @@ SECRET_KEY: str
 # secret key rotation.
 SECRET_KEY_FALLBACKS: list[str] = []
 
-URLS_MODULE = "app.urls"
+URLS_ROUTER: str
 
 # List of upload handler classes to be applied in order.
 FILE_UPLOAD_HANDLERS = [

plain/urls/__init__.py

@@ -6,7 +6,7 @@ from .resolvers import (
     URLResolver,
     get_resolver,
 )
-from .routers import RouterBase, include, path, register_router
+from .routers import Router, include, path
 from .utils import (
     reverse,
     reverse_lazy,
@@ -24,6 +24,5 @@ __all__ = [
     "register_converter",
     "reverse",
     "reverse_lazy",
-    "RouterBase",
-    "register_router",
+    "Router",
 ]

plain/urls/resolvers.py

@@ -8,7 +8,6 @@ attributes of the resolved URL match.
 
 import functools
 import re
-from importlib import import_module
 from pickle import PicklingError
 from threading import local
 from urllib.parse import quote
@@ -17,6 +16,7 @@ from plain.preflight.urls import check_resolver
 from plain.runtime import settings
 from plain.utils.datastructures import MultiValueDict
 from plain.utils.http import RFC3986_SUBDELIMS, escape_leading_slashes
+from plain.utils.module_loading import import_string
 from plain.utils.regex_helper import normalize
 
 from .exceptions import NoReverseMatch, Resolver404
@@ -87,30 +87,26 @@ class ResolverMatch:
         raise PicklingError(f"Cannot pickle {self.__class__.__qualname__}.")
 
 
-def get_resolver(urls_module=None):
-    if urls_module is None:
-        urls_module = settings.URLS_MODULE
+def get_resolver(router=None):
+    if router is None:
+        router = settings.URLS_ROUTER
 
-    return _get_cached_resolver(urls_module)
+    return _get_cached_resolver(router)
 
 
 @functools.cache
-def _get_cached_resolver(urls_module):
-    from .routers import routers_registry
+def _get_cached_resolver(router):
+    if isinstance(router, str):
+        # Do this inside the cached call, primarily for the URLS_ROUTER
+        router_class = import_string(router)
+        router = router_class()
 
-    if isinstance(urls_module, str):
-        # Need to trigger an import in order for the @register_router
-        # decorators to run. So this is a sensible entrypoint to do that,
-        # usually just for the root URLS_MODULE but could be for anything.
-        urls_module = import_module(urls_module)
-
-    router = routers_registry.get_module_router(urls_module)
     return URLResolver(pattern=RegexPattern(r"^/"), router=router)
 
 
 @functools.cache
 def get_ns_resolver(ns_pattern, resolver, converters):
-    from .routers import RouterBase
+    from .routers import Router
 
     # Build a namespaced resolver for the given parent urls_module pattern.
     # This makes it possible to have captured parameters in the parent
@@ -118,13 +114,13 @@ def get_ns_resolver(ns_pattern, resolver, converters):
     pattern = RegexPattern(ns_pattern)
     pattern.converters = dict(converters)
 
-    class _NestedRouter(RouterBase):
+    class _NestedRouter(Router):
         namespace = ""
         urls = resolver.url_patterns
 
     ns_resolver = URLResolver(pattern=pattern, router=_NestedRouter())
 
-    class _NamespacedRouter(RouterBase):
+    class _NamespacedRouter(Router):
         namespace = ""
         urls = [ns_resolver]
 

plain/urls/routers.py

@@ -1,9 +1,6 @@
 import re
-from types import ModuleType
 from typing import TYPE_CHECKING
 
-from plain.exceptions import ImproperlyConfigured
-
 from .patterns import RegexPattern, RoutePattern, URLPattern
 from .resolvers import (
     URLResolver,
@@ -13,7 +10,7 @@ if TYPE_CHECKING:
     from plain.views import View
 
 
-class RouterBase:
+class Router:
     """
     Base class for defining url patterns.
 
@@ -25,37 +22,8 @@ class RouterBase:
     urls: list
 
 
-class RoutersRegistry:
-    """Keep track of all the Routers that are explicitly registered in packages."""
-
-    def __init__(self):
-        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
-        return router
-
-    def get_module_router(self, module):
-        if isinstance(module, str):
-            module_name = module
-        else:
-            module_name = module.__name__
-
-        try:
-            return self._routers[module_name]
-        except KeyError as e:
-            registered_routers = ", ".join(self._routers.keys()) or "None"
-            raise ImproperlyConfigured(
-                f"Router {module_name} is not registered with the resolver. Use @register_router on the Router class in urls.py.\n\nRegistered routers: {registered_routers}"
-            ) from e
-
-
 def include(
-    route: str | re.Pattern, module_or_urls: list | tuple | str | ModuleType
+    route: str | re.Pattern, router_or_urls: list | tuple | str | Router
 ) -> URLResolver:
     """
     Include URLs from another module or a nested list of URL patterns.
@@ -67,23 +35,26 @@ def include(
     else:
         raise TypeError("include() route must be a string or regex")
 
-    if isinstance(module_or_urls, list | tuple):
+    if isinstance(router_or_urls, list | tuple):
         # We were given an explicit list of sub-patterns,
         # so we generate a router for it
-        class _IncludeRouter(RouterBase):
+        class _IncludeRouter(Router):
             namespace = ""
-            urls = module_or_urls
+            urls = router_or_urls
 
         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 = routers_registry.get_module_router(module)
+    elif isinstance(router_or_urls, type) and issubclass(router_or_urls, Router):
+        router_class = router_or_urls
+        router = router_class()
 
         return URLResolver(
             pattern=pattern,
             router=router,
         )
+    else:
+        raise TypeError(
+            f"include() urls must be a list, tuple, or Router class (not a Router() instance): {router_or_urls}"
+        )
 
 
 def path(route: str | re.Pattern, view: "View", *, name: str = "") -> URLPattern:
@@ -116,12 +87,3 @@ def path(route: str | re.Pattern, view: "View", *, name: str = "") -> URLPattern
         return URLPattern(pattern=pattern, view=view, name=name)
 
     raise TypeError("view must be a View class or View.as_view()")
-
-
-routers_registry = RoutersRegistry()
-
-
-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/validators.py

@@ -237,21 +237,6 @@ class EmailValidator:
 
 validate_email = EmailValidator()
 
-slug_re = _lazy_re_compile(r"^[-a-zA-Z0-9_]+\Z")
-validate_slug = RegexValidator(
-    slug_re,
-    # Translators: "letters" means latin letters: a-z and A-Z.
-    "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens.",
-    "invalid",
-)
-
-slug_unicode_re = _lazy_re_compile(r"^[-\w]+\Z")
-validate_unicode_slug = RegexValidator(
-    slug_unicode_re,
-    "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or hyphens."
-    "invalid",
-)
-
 
 def validate_ipv4_address(value):
     try:

{plain-0.29.0.dist-info → plain-0.31.0.dist-info}/METADATA

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

{plain-0.29.0.dist-info → plain-0.31.0.dist-info}/RECORD

@@ -5,18 +5,18 @@ plain/exceptions.py,sha256=Z9cbPE5im_Y-bjVq8cqC85gBoqOr80rLFG5wTKixrwE,5894
 plain/json.py,sha256=McJdsbMT1sYwkGRG--f2NSZz0hVXPMix9x3nKaaak2o,1262
 plain/paginator.py,sha256=-fpLJd6c-V8bLCaNCHfTqPtm-Lm2Y1TuKqFDfy7n3ZE,5857
 plain/signing.py,sha256=sf7g1Mp-FzdjFAEoLxHyu2YvbUl5w4FOtTVDAfq6TO0,8733
-plain/validators.py,sha256=byAdFophb3Mfs09IwqzpIgumQHIil76ZDj2suYNaUNQ,19723
+plain/validators.py,sha256=TePzFHzwR4JXUAZ_Y2vC6mkKgVxHX3QBXI6Oex0rV8c,19236
 plain/wsgi.py,sha256=R6k5FiAElvGDApEbMPTT0MPqSD7n2e2Az5chQqJZU0I,236
 plain/assets/README.md,sha256=Ukm_gU7Xj-itAmEjsWUXXDtU5d8BSRpy7ZgGB2LbSo0,2847
 plain/assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plain/assets/compile.py,sha256=Qg-rMWykij_Jheq4THrPFWlmYv07ihHzWiNsD815HYE,3336
 plain/assets/finders.py,sha256=rhkHG5QW3H3IlBGHB5WJf9J6VTdDWgUC0qEs6u2Z4RQ,1233
 plain/assets/fingerprints.py,sha256=1NKAnnXVlncY5iimXztr0NL3RIjBKsNlZRIe6nmItJc,931
-plain/assets/urls.py,sha256=lW7VzKNzTKY11JqbszhJQ1Yy0HtljZlsHDnnkTPdLOM,992
-plain/assets/views.py,sha256=z7noLzoelGw_8-MXcvGKjXs9KZ43Tivmy2TIfnZIpgw,9253
+plain/assets/urls.py,sha256=3BSvp5B--V6Q03BizmZ6qa2dUamF1r5IdlFbwD401eU,962
+plain/assets/views.py,sha256=s6ERHfgRyoZ8P6mH9ahGZxU1LyN8WByAiJAjlwBCl-k,9265
 plain/cli/README.md,sha256=t3k4jmSK0QFALO3bVWTUsJC09KhY4CvauStTvVLLUdI,1922
 plain/cli/__init__.py,sha256=6w9T7K2WrPwh6DcaMb2oNt_CWU6Bc57nUTO2Bt1p38Y,63
-plain/cli/core.py,sha256=5_4hsXxzk2ocIez5BBY2YoYtFUdyfKks-2twpqy-zoU,18256
+plain/cli/core.py,sha256=8UelQ8vif6ahUwYnJc7jWy2t7Ml68oyEkt0MtQMycxE,18411
 plain/cli/formatting.py,sha256=1hZH13y1qwHcU2K2_Na388nw9uvoeQH8LrWL-O9h8Yc,2207
 plain/cli/print.py,sha256=XraUYrgODOJquIiEv78wSCYGRBplHXtXSS9QtFG5hqY,217
 plain/cli/registry.py,sha256=yKVMSDjW8g10nlV9sPXFGJQmhC_U-k4J4kM7N2OQVLA,1467
@@ -28,7 +28,7 @@ plain/forms/README.md,sha256=fglB9MmHiEgfGGdZmcRstNl6eYaFljrElu2mzapK52M,377
 plain/forms/__init__.py,sha256=UxqPwB8CiYPCQdHmUc59jadqaXqDmXBH8y4bt9vTPms,226
 plain/forms/boundfield.py,sha256=LhydhCVR0okrli0-QBMjGjAJ8-06gTCXVEaBZhBouQk,1741
 plain/forms/exceptions.py,sha256=XCLDRl5snIEDu5-8mLB0NnU_tegcBfyIHMiJxqvbxnc,164
-plain/forms/fields.py,sha256=rsKPsb9cSbvSKhu-eg4yGV1gI-Lv_LaFK_6U22D7oJI,35327
+plain/forms/fields.py,sha256=Fw77LP06aO5h6ZdJmS2S_2On4YSrsl4gu142Y6nGF50,34987
 plain/forms/forms.py,sha256=fEKBee1b8I_DJ-FufzWJGtSQoUoyieYfqUaGEre9B4Q,10418
 plain/http/README.md,sha256=HjEtoAhn14OoMdgb-wK-uc8No7C4d4gZUhzseOp7Fg4,236
 plain/http/__init__.py,sha256=DIsDRbBsCGa4qZgq-fUuQS0kkxfbTU_3KpIM9VvH04w,1067
@@ -69,10 +69,10 @@ plain/preflight/files.py,sha256=wbHCNgps7o1c1zQNBd8FDCaVaqX90UwuvLgEQ_DbUpY,510
 plain/preflight/messages.py,sha256=HwatjA6MRFfzFAnSOa_uAw1Pvk_CLuNfW3IYi71_1Mk,2322
 plain/preflight/registry.py,sha256=7s7f_iEwURzv-Ye515P5lJWcHltd5Ca2fsX1Wpbf1wQ,2306
 plain/preflight/security.py,sha256=sNpv5AHobPcaO48cOUGRNe2EjusTducjY8vyShR8EhI,2645
-plain/preflight/urls.py,sha256=OSTLvCpftAD_8VbQ0V3p1CTPlRRwtlnXVBZeWgr7l2k,2881
+plain/preflight/urls.py,sha256=Wlz6n8nTBPzKhDjcT1helwrsLe4PKRlUPLxuxvjuZz4,2882
 plain/runtime/README.md,sha256=Q8VVO7JRGuYrDxzuYL6ptoilhclbecxKzpRXKgbWGkU,2061
 plain/runtime/__init__.py,sha256=o2RVETiL8U0lMFBpbtfnxflhw_4MFllMV6CEpX3RqZs,1965
-plain/runtime/global_settings.py,sha256=SfOhwzpZe2zpNqSpdx3hHgCN89xdbW9KJVR4KJfS_Gk,5498
+plain/runtime/global_settings.py,sha256=DUx_RPZsyplBV9i8sDy7S1fZdU9LUuxqnXYEBTOMzEI,5490
 plain/runtime/user_settings.py,sha256=uRHHVfzUvHon91_fOKj7K2WaBYwJ1gCPLfeXqKj5CTs,10902
 plain/signals/README.md,sha256=cd3tKEgH-xc88CUWyDxl4-qv-HBXx8VT32BXVwA5azA,230
 plain/signals/__init__.py,sha256=eAs0kLqptuP6I31dWXeAqRNji3svplpAV4Ez6ktjwXM,131
@@ -92,12 +92,12 @@ plain/test/README.md,sha256=Zso3Ir7a8vQerzKB6egjROQWkpveLAbscn7VTROPAiU,37
 plain/test/__init__.py,sha256=rXe88Y602NP8DBnReSyXb7dUzKoWweLuT43j-qwOUl4,138
 plain/test/client.py,sha256=36Cir1KbrNEhza-5FTgdwxe1iZ5zaEDtESrqcnyndnY,31318
 plain/urls/README.md,sha256=pWnCvgYkWN7rG7hSyBOtX4ZUP3iO7FhqM6lvwwYll6c,33
-plain/urls/__init__.py,sha256=XF-W2GqLMA4bHbDRKnpZ7tiUtJ-BhWN-yAzw4nNnHdc,590
+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=bU_xfhZbKMSgRG9OJ8w_NSuYRm_9zGnqoz_WY44fhUk,9358
-plain/urls/resolvers.py,sha256=3ntfYe2-mQa1tR8jF1-UesnnbZaUp_aVNY3OtiSi5R4,15466
-plain/urls/routers.py,sha256=J7v-o4BbTk_iPy_kMP_hOMNOPk-D2lockUmSD0Wx1R0,4056
+plain/urls/resolvers.py,sha256=PyqbO1JIoJq2ayCSmONW_6O8a3vM7cTVbqQJdCJHIK0,15218
+plain/urls/routers.py,sha256=iEsQtTpPNDDVn7r_BQX84FESGSjOeD5qgyO_ep5rzaU,2819
 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
@@ -134,8 +134,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.29.0.dist-info/METADATA,sha256=ONh32xHnWT3cqrGSkuvVsTvkci_KvLkY95bBGf3GW2Y,319
-plain-0.29.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain-0.29.0.dist-info/entry_points.txt,sha256=1Ys2lsSeMepD1vz8RSrJopna0RQfUd951vYvCRsvl6A,45
-plain-0.29.0.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
-plain-0.29.0.dist-info/RECORD,,
+plain-0.31.0.dist-info/METADATA,sha256=TLCqQ6BvVGA9Wq16yoEQGKF3XtbmNEwFj-iiP7KefKw,319
+plain-0.31.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain-0.31.0.dist-info/entry_points.txt,sha256=1Ys2lsSeMepD1vz8RSrJopna0RQfUd951vYvCRsvl6A,45
+plain-0.31.0.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
+plain-0.31.0.dist-info/RECORD,,