plain.admin 0.21.1__tar.gz → 0.22.0__tar.gz

{plain_admin-0.21.1 → plain_admin-0.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.admin
-Version: 0.21.1
+Version: 0.22.0
 Summary: Admin dashboard and tools for Plain.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-Expression: BSD-3-Clause

{plain_admin-0.21.1 → plain_admin-0.22.0}/plain/admin/impersonate/urls.py

@@ -1,10 +1,9 @@
-from plain.urls import RouterBase, path, register_router
+from plain.urls import Router, path
 
 from .views import ImpersonateStartView, ImpersonateStopView
 
 
-@register_router
-class Router(RouterBase):
+class ImpersonateRouter(Router):
     namespace = "impersonate"
     urls = [
         path("stop/", ImpersonateStopView, name="stop"),

{plain_admin-0.21.1 → plain_admin-0.22.0}/plain/admin/querystats/urls.py

@@ -1,10 +1,9 @@
-from plain.urls import RouterBase, path, register_router
+from plain.urls import Router, path
 
 from . import views
 
 
-@register_router
-class Router(RouterBase):
+class QuerystatsRouter(Router):
     namespace = "querystats"
     urls = [
         path("", views.QuerystatsView, name="querystats"),

{plain_admin-0.21.1 → plain_admin-0.22.0}/plain/admin/urls.py

@@ -1,8 +1,8 @@
 from plain.http import ResponseRedirect
-from plain.urls import RouterBase, include, path, register_router
+from plain.urls import Router, include, path
 
-from .impersonate import urls as impersonate_urls
-from .querystats import urls as querystats_urls
+from .impersonate.urls import ImpersonateRouter
+from .querystats.urls import QuerystatsRouter
 from .views.base import AdminView
 from .views.registry import registry
 
@@ -31,13 +31,12 @@ class AdminSearchView(AdminView):
         return context
 
 
-@register_router
-class Router(RouterBase):
+class AdminRouter(Router):
     namespace = "admin"
     urls = [
         path("search/", AdminSearchView, name="search"),
-        include("impersonate/", impersonate_urls),
-        include("querystats/", querystats_urls),
+        include("impersonate/", ImpersonateRouter),
+        include("querystats/", QuerystatsRouter),
         include("", registry.get_urls()),
         path("", AdminIndexView, name="index"),
     ]

{plain_admin-0.21.1 → plain_admin-0.22.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain.admin"
-version = "0.21.1"
+version = "0.22.0"
 description = "Admin dashboard and tools for Plain."
 authors = [{name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev"}]
 license = "BSD-3-Clause"

{plain_admin-0.21.1 → plain_admin-0.22.0}/tests/app/settings.py

@@ -1,4 +1,5 @@
 SECRET_KEY = "test"
+URLS_ROUTER = "app.urls.AppRouter"
 INSTALLED_PACKAGES = [
     "plain.auth",
     "plain.sessions",

{plain_admin-0.21.1 → plain_admin-0.22.0}/tests/app/urls.py

@@ -1,6 +1,6 @@
-import plain.admin.urls
-import plain.assets.urls
-from plain.urls import RouterBase, include, path, register_router
+from plain.admin.urls import AdminRouter
+from plain.assets.urls import AssetsRouter
+from plain.urls import Router, include, path
 from plain.views import View
 
 
@@ -14,12 +14,11 @@ class LogoutView(View):
         return "Logout!"
 
 
-@register_router
-class Router(RouterBase):
+class AppRouter(Router):
     namespace = ""
     urls = [
-        include("admin/", plain.admin.urls),
-        include("assets/", plain.assets.urls),
+        include("admin/", AdminRouter),
+        include("assets/", AssetsRouter),
         path("login/", LoginView, name="login"),
         path("logout/", LogoutView, name="logout"),
     ]