plain 0.44.0__tar.gz → 0.46.0__tar.gz

{plain-0.44.0 → plain-0.46.0}/PKG-INFO

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

{plain-0.44.0 → plain-0.46.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.44.0 → plain-0.46.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.44.0 → plain-0.46.0}/plain/views/base.py

@@ -71,26 +71,37 @@ class View:
         return self.convert_value_to_response(result)
 
     def convert_value_to_response(self, value) -> ResponseBase:
-        """Convert a value to a Response."""
+        """Convert a return value to a Response."""
         if isinstance(value, ResponseBase):
             return value
 
-        if isinstance(value, str):
-            # Assume a str is rendered HTML
-            return Response(value)
-
-        if isinstance(value, list):
-            return JsonResponse(value, safe=False)
-
-        if isinstance(value, dict):
-            return JsonResponse(value)
-
         if isinstance(value, int):
             return Response(status_code=value)
 
         if value is None:
+            # TODO raise 404 instead?
             return ResponseNotFound()
 
+        status_code = 200
+
+        if isinstance(value, tuple):
+            if len(value) != 2:
+                raise ValueError(
+                    "Tuple response must be of length 2 (status_code, value)"
+                )
+
+            status_code = value[0]
+            value = value[1]
+
+        if isinstance(value, str):
+            return Response(value, status_code=status_code)
+
+        if isinstance(value, list):
+            return JsonResponse(value, status_code=status_code, safe=False)
+
+        if isinstance(value, dict):
+            return JsonResponse(value, status_code=status_code)
+
         raise ValueError(f"Unexpected view return type: {type(value)}")
 
     def options(self) -> Response:

{plain-0.44.0 → plain-0.46.0}/pyproject.toml

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