plain 0.45.0__tar.gz → 0.47.0__tar.gz

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

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

{plain-0.45.0 → plain-0.47.0}/plain/runtime/__init__.py

@@ -18,16 +18,31 @@ PLAIN_TEMP_PATH = Path.cwd() / ".plain"
 # from plain.runtime import settings
 settings = Settings()
 
+_is_setup_complete = False
+
 
 class AppPathNotFound(RuntimeError):
     pass
 
 
+class SetupError(RuntimeError):
+    pass
+
+
 def setup():
     """
     Configure the settings (this happens as a side effect of accessing the
     first setting), configure logging and populate the app registry.
     """
+    global _is_setup_complete
+
+    if _is_setup_complete:
+        raise SetupError(
+            "Plain runtime is already set up. You can only call `setup()` once."
+        )
+    else:
+        # Make sure we don't call setup() again
+        _is_setup_complete = True
 
     # Packages can hook into the setup process through an entrypoint.
     for entry_point in entry_points().select(group="plain.setup"):

{plain-0.45.0 → plain-0.47.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.45.0 → plain-0.47.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain"
-version = "0.45.0"
+version = "0.47.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 → plain-0.47.0}/tests/test_runtime.py

@@ -1,16 +1,7 @@
 from plain.runtime import settings
-from plain.runtime import (
-    setup as plain_setup,  # Rename so pytest doesn't call setup()...
-)
-
-
-def test_setup():
-    plain_setup()
 
 
 def test_user_settings():
-    plain_setup()
-
     # Relies on env vars in conftest.py
     assert settings.DEFAULT_SETTING == "unchanged default"
     assert settings.EXPLICIT_SETTING == "explicitly changed"

{plain-0.45.0 → plain-0.47.0}/tests/test_wsgi.py

@@ -1,16 +1,16 @@
 from io import BytesIO
 
+from plain.internal.handlers.wsgi import WSGIHandler
 
-def test_wsgi_app():
+
+def test_wsgi_handler():
     """
     Test the default plain.wsgi.app import and
     basic behavior with minimal environ input.
     """
-    # Import this here because just importing triggers setup()
-    # which is usually fine in wsgi usage but not what we want related to our other tests
-    from plain.wsgi import app
 
-    response = app(
+    wsgi = WSGIHandler()
+    response = wsgi(
         {
             "REQUEST_METHOD": "GET",
             "wsgi.input": BytesIO(b""),