plain 0.20.0__py3-none-any.whl → 0.21.1__py3-none-any.whl

plain/internal/handlers/base.py

@@ -14,11 +14,16 @@ logger = logging.getLogger("plain.request")
 
 
 # These middleware classes are always used by Plain.
-BUILTIN_MIDDLEWARE = [
-    "plain.internal.middleware.headers.DefaultHeadersMiddleware",
-    "plain.internal.middleware.https.HttpsRedirectMiddleware",
+BUILTIN_BEFORE_MIDDLEWARE = [
+    "plain.internal.middleware.headers.DefaultHeadersMiddleware",  # Runs after response, to set missing headers
+    "plain.internal.middleware.https.HttpsRedirectMiddleware",  # Runs before response, to redirect to HTTPS quickly
+    "plain.csrf.middleware.CsrfViewMiddleware",  # Runs before and after get_response...
+]
+
+BUILTIN_AFTER_MIDDLEWARE = [
+    # Want this to run first (when reversed) so the slash middleware
+    # can immediately redirect to the slash-appended path if there is one.
     "plain.internal.middleware.slash.RedirectSlashMiddleware",
-    "plain.csrf.middleware.CsrfViewMiddleware",
 ]
 
 
@@ -34,7 +39,9 @@ class BaseHandler:
         get_response = self._get_response
         handler = convert_exception_to_response(get_response)
 
-        middlewares = reversed(BUILTIN_MIDDLEWARE + settings.MIDDLEWARE)
+        middlewares = reversed(
+            BUILTIN_BEFORE_MIDDLEWARE + settings.MIDDLEWARE + BUILTIN_AFTER_MIDDLEWARE
+        )
 
         for middleware_path in middlewares:
             middleware = import_string(middleware_path)

plain/views/objects.py

@@ -1,5 +1,6 @@
 from plain.exceptions import ImproperlyConfigured, ObjectDoesNotExist
-from plain.http import Http404, Response, ResponseRedirect
+from plain.forms import Form
+from plain.http import Http404, Response
 
 from .forms import FormView
 from .templates import TemplateView
@@ -80,6 +81,8 @@ class CreateView(ObjectTemplateViewMixin, FormView):
     View for creating a new object, with a response rendered by a template.
     """
 
+    template_name_suffix = "_form"
+
     def post(self) -> Response:
         """
         Handle POST requests: instantiate a form instance with the passed
@@ -152,30 +155,41 @@ class UpdateView(ObjectTemplateViewMixin, FormView):
         return kwargs
 
 
-class DeleteView(ObjectTemplateViewMixin, TemplateView):
+class DeleteView(ObjectTemplateViewMixin, FormView):
     """
     View for deleting an object retrieved with self.get_object(), with a
     response rendered by a template.
     """
 
+    class EmptyDeleteForm(Form):
+        def __init__(self, instance, *args, **kwargs):
+            self.instance = instance
+            super().__init__(*args, **kwargs)
+
+        def save(self):
+            self.instance.delete()
+
+    form_class = EmptyDeleteForm
     template_name_suffix = "_confirm_delete"
 
+    def post(self) -> Response:
+        """
+        Handle POST requests: instantiate a form instance with the passed
+        POST variables and then check if it's valid.
+        """
+        self.load_object()
+        return super().post()
+
     def get_form_kwargs(self):
         """Return the keyword arguments for instantiating the form."""
         kwargs = super().get_form_kwargs()
         kwargs.update({"instance": self.object})
         return kwargs
 
-    def get_success_url(self):
-        if self.success_url:
-            return self.success_url.format(**self.object.__dict__)
-        else:
-            raise ImproperlyConfigured("No URL to redirect to. Provide a success_url.")
-
-    def post(self):
-        self.load_object()
-        self.object.delete()
-        return ResponseRedirect(self.get_success_url())
+    def form_valid(self, form):
+        """If the form is valid, save the associated model."""
+        form.save()
+        return super().form_valid(form)
 
 
 class ListView(TemplateView):

{plain-0.20.0.dist-info → plain-0.21.1.dist-info}/METADATA

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

{plain-0.20.0.dist-info → plain-0.21.1.dist-info}/RECORD

@@ -47,7 +47,7 @@ plain/internal/files/uploadedfile.py,sha256=JRB7T3quQjg-1y3l1ASPxywtSQZhaeMc45uF
 plain/internal/files/uploadhandler.py,sha256=eEnd5onstypjHYtg367PnVWwCaF1kAPlLPSV7goIf_E,7198
 plain/internal/files/utils.py,sha256=xN4HTJXDRdcoNyrL1dFd528MBwodRlHZM8DGTD_oBIg,2646
 plain/internal/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-plain/internal/handlers/base.py,sha256=_1aRNrNgqdx8kkUlXYRJNOTnZ_Z236JNYNcTdp7RRjc,4228
+plain/internal/handlers/base.py,sha256=M9P3f5JaMmGxzxW7b6p72zAHxFXHuNl57aRcmRCMoWo,4609
 plain/internal/handlers/exception.py,sha256=DH9gh1FyqgetFpMaB8yLIVE6phBTVPKQLA1GIn9MOeI,4555
 plain/internal/handlers/wsgi.py,sha256=estA1QKHTk3ZqziWxenHsw5UO2cwPp3Zr0XjkDeM5TY,7561
 plain/internal/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -135,11 +135,11 @@ plain/views/csrf.py,sha256=7q6l5xzLWhRnMY64aNj0hR6G-3pxI2yhRwG6k_5j00E,144
 plain/views/errors.py,sha256=Y4oGX4Z6D2COKcDEfINvXE1acE8Ad15KwNNWPs5BCfc,967
 plain/views/exceptions.py,sha256=b4euI49ZUKS9O8AGAcFfiDpstzkRAuuj_uYQXzWNHME,138
 plain/views/forms.py,sha256=RhlaUcZCkeqokY_fvv-NOS-kgZAG4XhDLOPbf9K_Zlc,2691
-plain/views/objects.py,sha256=fRfS6KNehIGqkbPw4nSafj8HStxYExHmbggolBbzcxs,7921
+plain/views/objects.py,sha256=g5Lzno0Zsv0K449UpcCtxwCoO7WMRAWqKlxxV2V0_qg,8263
 plain/views/redirect.py,sha256=KLnlktzK6ZNMTlaEiZpMKQMEP5zeTgGLJ9BIkIJfwBo,1733
 plain/views/templates.py,sha256=nF9CcdhhjAyp3LB0RrSYnBaHpHzMfPSw719RCdcXk7o,2007
-plain-0.20.0.dist-info/METADATA,sha256=xC6F5-ztR9t_Fa39_xt2VG8d2OqeVp4BSeoq7MG7afU,2518
-plain-0.20.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain-0.20.0.dist-info/entry_points.txt,sha256=DHHprvufgd7xypiBiqMANYRnpJ9xPPYhYbnPGwOkWqE,40
-plain-0.20.0.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
-plain-0.20.0.dist-info/RECORD,,
+plain-0.21.1.dist-info/METADATA,sha256=N4d5IZSoIdNKWvbTZHzyvcGCaj1D5pD2iNzvIywz-iw,2518
+plain-0.21.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain-0.21.1.dist-info/entry_points.txt,sha256=DHHprvufgd7xypiBiqMANYRnpJ9xPPYhYbnPGwOkWqE,40
+plain-0.21.1.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
+plain-0.21.1.dist-info/RECORD,,