plain 0.43.1__tar.gz → 0.45.0__tar.gz

{plain-0.43.1 → plain-0.45.0}/.gitignore

@@ -14,4 +14,5 @@ plain*/tests/.plain
 
 /llms-full.txt
 
-/.plain
+# Plain temp dirs
+.plain

{plain-0.43.1 → plain-0.45.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain
-Version: 0.43.1
+Version: 0.45.0
 Summary: A web framework for building products with Python.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-File: LICENSE
@@ -42,7 +42,7 @@ The `plain` package includes everything you need to start handling web requests
 - [plain.cache](/plain-cache/plain/cache/README.md) - A database-driven general purpose cache.
 - [plain.email](/plain-email/plain/email/README.md) - Send emails with SMTP or custom backends.
 - [plain.sessions](/plain-sessions/plain/sessions/README.md) - User sessions and cookies.
-- [plain.worker](/plain-worker/plain/worker/README.md) - Backgrounb jobs stored in the database.
+- [plain.worker](/plain-worker/plain/worker/README.md) - Background jobs stored in the database.
 - [plain.api](/plain-api/plain/api/README.md) - Build APIs with Plain views.
 
 ## Auth Packages

{plain-0.43.1 → plain-0.45.0}/plain/README.md

@@ -31,7 +31,7 @@ The `plain` package includes everything you need to start handling web requests
 - [plain.cache](/plain-cache/plain/cache/README.md) - A database-driven general purpose cache.
 - [plain.email](/plain-email/plain/email/README.md) - Send emails with SMTP or custom backends.
 - [plain.sessions](/plain-sessions/plain/sessions/README.md) - User sessions and cookies.
-- [plain.worker](/plain-worker/plain/worker/README.md) - Backgrounb jobs stored in the database.
+- [plain.worker](/plain-worker/plain/worker/README.md) - Background jobs stored in the database.
 - [plain.api](/plain-api/plain/api/README.md) - Build APIs with Plain views.
 
 ## Auth Packages

{plain-0.43.1 → plain-0.45.0}/plain/cli/scaffold.py

@@ -38,6 +38,8 @@ def create(package_name):
         (package_dir / "urls.py").write_text(
             f"""from plain.urls import path, Router
 
+from . import views
+
 
 class {package_name.capitalize()}Router(Router):
     namespace = f"{package_name}"

{plain-0.43.1 → plain-0.45.0}/plain/csrf/middleware.py

@@ -8,6 +8,7 @@ against request forgeries from other sites.
 import logging
 import string
 from collections import defaultdict
+from functools import cached_property
 from urllib.parse import urlparse
 
 from plain.exceptions import DisallowedHost
@@ -16,7 +17,6 @@ from plain.logs import log_response
 from plain.runtime import settings
 from plain.utils.cache import patch_vary_headers
 from plain.utils.crypto import constant_time_compare, get_random_string
-from plain.utils.functional import cached_property
 from plain.utils.http import is_same_domain
 from plain.utils.regex_helper import _lazy_re_compile
 

{plain-0.43.1 → plain-0.45.0}/plain/forms/fields.py

@@ -4,6 +4,7 @@ Field classes.
 
 import copy
 import datetime
+import enum
 import json
 import math
 import re
@@ -773,6 +774,8 @@ class ChoiceField(Field):
         super().__init__(**kwargs)
         if hasattr(choices, "choices"):
             choices = choices.choices
+        elif isinstance(choices, enum.EnumMeta):
+            choices = [(member.value, member.name) for member in choices]
         self.choices = choices
 
     def __deepcopy__(self, memo):

{plain-0.43.1 → plain-0.45.0}/plain/forms/forms.py

@@ -3,9 +3,9 @@ Form classes
 """
 
 import copy
+from functools import cached_property
 
 from plain.exceptions import NON_FIELD_ERRORS
-from plain.utils.functional import cached_property
 
 from .exceptions import ValidationError
 from .fields import Field, FileField

{plain-0.43.1 → plain-0.45.0}/plain/http/request.py

@@ -2,6 +2,7 @@ import codecs
 import copy
 import json
 import uuid
+from functools import cached_property
 from io import BytesIO
 from itertools import chain
 from urllib.parse import parse_qsl, quote, urlencode, urljoin, urlsplit
@@ -25,7 +26,6 @@ from plain.utils.datastructures import (
     MultiValueDict,
 )
 from plain.utils.encoding import iri_to_uri
-from plain.utils.functional import cached_property
 from plain.utils.http import is_same_domain, parse_header_parameters
 from plain.utils.regex_helper import _lazy_re_compile
 

{plain-0.43.1 → plain-0.45.0}/plain/http/response.py

@@ -18,7 +18,7 @@ from plain.json import PlainJSONEncoder
 from plain.runtime import settings
 from plain.utils import timezone
 from plain.utils.datastructures import CaseInsensitiveMapping
-from plain.utils.encoding import iri_to_uri
+from plain.utils.encoding import force_bytes, iri_to_uri
 from plain.utils.http import content_disposition_header, http_date
 from plain.utils.regex_helper import _lazy_re_compile
 
@@ -258,7 +258,17 @@ class ResponseBase:
             self.cookies[key]["samesite"] = samesite
 
     def set_signed_cookie(self, key, value, salt="", **kwargs):
-        value = signing.get_cookie_signer(salt=key + salt).sign(value)
+        """Set a cookie signed with the SECRET_KEY."""
+
+        def _cookie_key(k):
+            return b"plain.http.cookies" + force_bytes(k)
+
+        signer = signing.TimestampSigner(
+            key=_cookie_key(settings.SECRET_KEY),
+            fallback_keys=map(_cookie_key, settings.SECRET_KEY_FALLBACKS),
+            salt=key + salt,
+        )
+        value = signer.sign(value)
         return self.set_cookie(key, value, **kwargs)
 
     def delete_cookie(self, key, path="/", domain=None, samesite=None):

{plain-0.43.1 → plain-0.45.0}/plain/internal/files/base.py

@@ -1,8 +1,8 @@
 import os
+from functools import cached_property
 from io import UnsupportedOperation
 
 from plain.internal.files.utils import FileProxyMixin
-from plain.utils.functional import cached_property
 
 
 class File(FileProxyMixin):

{plain-0.43.1 → plain-0.45.0}/plain/internal/handlers/wsgi.py

@@ -1,11 +1,11 @@
 import uuid
+from functools import cached_property
 from io import IOBase
 from urllib.parse import quote
 
 from plain import signals
 from plain.http import HttpRequest, QueryDict, parse_cookie
 from plain.internal.handlers import base
-from plain.utils.functional import cached_property
 from plain.utils.regex_helper import _lazy_re_compile
 
 _slashes_re = _lazy_re_compile(rb"/+")
@@ -125,15 +125,13 @@ class WSGIRequest(HttpRequest):
 
 
 class WSGIHandler(base.BaseHandler):
-    request_class = WSGIRequest
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.load_middleware()
 
     def __call__(self, environ, start_response):
         signals.request_started.send(sender=self.__class__, environ=environ)
-        request = self.request_class(environ)
+        request = WSGIRequest(environ)
         response = self.get_response(request)
 
         response._handler_class = self.__class__

{plain-0.43.1 → plain-0.45.0}/plain/paginator.py

@@ -1,9 +1,9 @@
 import collections.abc
 import inspect
 import warnings
+from functools import cached_property
 from math import ceil
 
-from plain.utils.functional import cached_property
 from plain.utils.inspect import method_has_no_args
 
 

{plain-0.43.1 → plain-0.45.0}/plain/runtime/global_settings.py

@@ -109,12 +109,6 @@ HTTP_ERROR_VIEWS: dict[int] = {}
 # phase the middleware will be applied in reverse order.
 MIDDLEWARE: list[str] = []
 
-###########
-# SIGNING #
-###########
-
-COOKIE_SIGNING_BACKEND = "plain.signing.TimestampSigner"
-
 ########
 # CSRF #
 ########

{plain-0.43.1 → plain-0.45.0}/plain/runtime/user_settings.py

@@ -121,7 +121,9 @@ class Settings:
             if setting in self._settings:
                 setting_def = self._settings[setting]
                 try:
-                    parsed_value = _parse_env_value(value, setting_def.annotation)
+                    parsed_value = _parse_env_value(
+                        value, setting_def.annotation, setting
+                    )
                     setting_def.set_value(parsed_value, "env")
                 except ImproperlyConfigured as e:
                     self._errors.append(str(e))
@@ -211,9 +213,11 @@ class Settings:
         return f'<Settings "{self._settings_module}">'
 
 
-def _parse_env_value(value, annotation):
+def _parse_env_value(value, annotation, setting_name):
     if not annotation:
-        raise ImproperlyConfigured("Type hint required to set from environment.")
+        raise ImproperlyConfigured(
+            f"{setting_name}: Type hint required to set from environment."
+        )
 
     if annotation is bool:
         # Special case for bools
@@ -226,7 +230,7 @@ def _parse_env_value(value, annotation):
             return json.loads(value)
         except json.JSONDecodeError as e:
             raise ImproperlyConfigured(
-                f"Invalid JSON value for setting: {e.msg}"
+                f"Invalid JSON value for setting '{setting_name}': {e.msg}"
             ) from e
 
 

{plain-0.43.1 → plain-0.45.0}/plain/signing.py

@@ -41,8 +41,6 @@ import zlib
 
 from plain.runtime import settings
 from plain.utils.crypto import constant_time_compare, salted_hmac
-from plain.utils.encoding import force_bytes
-from plain.utils.module_loading import import_string
 from plain.utils.regex_helper import _lazy_re_compile
 
 _SEP_UNSAFE = _lazy_re_compile(r"^[A-z0-9-_=]*$")
@@ -101,20 +99,6 @@ def base64_hmac(salt, value, key, algorithm="sha1"):
     ).decode()
 
 
-def _cookie_signer_key(key):
-    # SECRET_KEYS items may be str or bytes.
-    return b"plain.http.cookies" + force_bytes(key)
-
-
-def get_cookie_signer(salt="plain.signing.get_cookie_signer"):
-    Signer = import_string(settings.COOKIE_SIGNING_BACKEND)
-    return Signer(
-        key=_cookie_signer_key(settings.SECRET_KEY),
-        fallback_keys=map(_cookie_signer_key, settings.SECRET_KEY_FALLBACKS),
-        salt=salt,
-    )
-
-
 class JSONSerializer:
     """
     Simple wrapper around json to be used in signing.dumps and

{plain-0.43.1 → plain-0.45.0}/plain/utils/connection.py

@@ -1,7 +1,7 @@
+from functools import cached_property
 from threading import local
 
 from plain.runtime import settings as plain_settings
-from plain.utils.functional import cached_property
 
 
 class ConnectionProxy:

{plain-0.43.1 → plain-0.45.0}/plain/utils/functional.py

@@ -4,49 +4,6 @@ import operator
 from functools import total_ordering, wraps
 
 
-class cached_property:
-    """
-    Decorator that converts a method with a single self argument into a
-    property cached on the instance.
-
-    A cached property can be made out of an existing method:
-    (e.g. ``url = cached_property(get_absolute_url)``).
-    """
-
-    name = None
-
-    @staticmethod
-    def func(instance):
-        raise TypeError(
-            "Cannot use cached_property instance without calling __set_name__() on it."
-        )
-
-    def __init__(self, func):
-        self.real_func = func
-        self.__doc__ = getattr(func, "__doc__")
-
-    def __set_name__(self, owner, name):
-        if self.name is None:
-            self.name = name
-            self.func = self.real_func
-        elif name != self.name:
-            raise TypeError(
-                "Cannot assign the same cached_property to two different names "
-                f"({self.name!r} and {name!r})."
-            )
-
-    def __get__(self, instance, cls=None):
-        """
-        Call the function and put the return value in instance.__dict__ so that
-        subsequent attribute access on the instance returns the cached value
-        instead of calling cached_property.__get__().
-        """
-        if instance is None:
-            return self
-        res = instance.__dict__[self.name] = self.func(instance)
-        return res
-
-
 class classproperty:
     """
     Decorator that converts a method with a single cls argument into a property

{plain-0.43.1 → plain-0.45.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain"
-version = "0.43.1"
+version = "0.45.0"
 description = "A web framework for building products with Python."
 authors = [{name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev"}]
 readme = "README.md"

plain-0.45.0/tests/test_cli.py

@@ -0,0 +1,17 @@
+from click.testing import CliRunner
+
+from plain.cli.core import cli
+
+
+def test_plain_cli_help():
+    runner = CliRunner()
+    result = runner.invoke(cli, ["--help"], prog_name="plain")
+    assert result.exit_code == 0
+    assert result.output.startswith("Usage: plain")
+
+
+def test_plain_cli_build():
+    runner = CliRunner()
+    result = runner.invoke(cli, ["build"], prog_name="plain")
+    assert result.exit_code == 0
+    assert "Compiled 0 assets into 0 files" in result.output

plain-0.43.1/tests/test_cli.py

@@ -1,11 +0,0 @@
-import subprocess
-
-
-def test_plain_cli_help():
-    output = subprocess.check_output(["plain", "--help"])
-    assert output.startswith(b"Usage: plain")
-
-
-def test_plain_cli_build():
-    output = subprocess.check_output(["plain", "build"])
-    assert b"Compiled 0 assets into 0 files" in output