refactor: just renaming things

Author: lsfratel

README.md

@@ -160,7 +160,7 @@ Ensure your incoming data is valid by defining schemas. If validation fails, Web
 Define a schema by inheriting from `Schema` and adding fields.
 
 ```python
-from webspark.schema import Schema, StringField, IntegerField, EmailField
+from webspark.validation import Schema, StringField, IntegerField, EmailField
 
 class UserSchema(Schema):
     name = StringField(required=True, max_length=100)
@@ -376,7 +376,7 @@ You can apply the SchemaPlugin using the `@apply` decorator from `webspark.utils
 from webspark.contrib.plugins import SchemaPlugin
 from webspark.core import View
 from webspark.http import Context
-from webspark.schema import Schema, StringField, IntegerField
+from webspark.validation import Schema, StringField, IntegerField
 from webspark.utils import apply
 
 # Define a schema for validation

examples/database_example.py

@@ -11,7 +11,6 @@
 
 from webspark.core import View, WebSpark, path
 from webspark.http import Context
-from webspark.schema import IntegerField, Schema, StringField
 from webspark.utils import HTTPException
 
 # Database configuration
@@ -45,19 +44,6 @@ def get_db_connection():
         conn.close()
 
 
-# Schema for product creation
-class ProductSchema(Schema):
-    name = StringField(required=True, max_length=100)
-    description = StringField(max_length=500)
-    price = IntegerField(min_value=0)
-
-
-class ProductUpdateSchema(Schema):
-    name = StringField(max_length=100)
-    description = StringField(max_length=500)
-    price = IntegerField(min_value=0)
-
-
 class ProductListView(View):
     """Handle operations on the collection of products."""
 

examples/schema_example.py

@@ -8,22 +8,16 @@
 
 from webspark.core import View, WebSpark, path
 from webspark.http import Context
-from webspark.schema import (
-    BooleanField,
-    EmailField,
-    IntegerField,
-    Schema,
-    StringField,
-)
 from webspark.utils import HTTPException
+from webspark.validation import Schema, fields
 
 
 # Define a schema for user data
 class UserSchema(Schema):
-    name = StringField(required=True, max_length=100)
-    age = IntegerField(min_value=1, max_value=120)
-    email = EmailField(required=True)
-    is_active = BooleanField(default=True)
+    name = fields.StringField(required=True, max_length=100)
+    age = fields.IntegerField(min_value=1, max_value=120)
+    email = fields.EmailField(required=True)
+    is_active = fields.BooleanField(default=True)
 
 
 # In-memory storage
@@ -34,8 +28,6 @@ class UserSchema(Schema):
 class UserView(View):
     """Handle user operations with schema validation."""
 
-    body_schema = UserSchema  # Attach the schema for automatic validation
-
     def handle_get(self, ctx: Context):
         """Return all users."""
         ctx.json({"users": users})
@@ -44,9 +36,11 @@ def handle_post(self, ctx: Context):
         """Create a new user with validation."""
         global next_id
 
-        # When body_schema is defined, WebSpark automatically validates the request body
-        # and makes the validated data available through self.validated_body()
-        validated_data, errors = self.validated_body(raise_=True)
+        schema_instance = UserSchema(data=ctx.body)
+        if not schema_instance.is_valid():
+            raise HTTPException(schema_instance.errors, status_code=400)
+
+        validated_data = schema_instance.validated_data
 
         # Create new user with validated data
         new_user = {
@@ -89,6 +83,6 @@ def handle_get(self, ctx: Context):
 
 if __name__ == "__main__":
     # For development purposes, you can run this with a WSGI server like:
-    # gunicorn examples.schema_example:app
+    # gunicorn examples.validation_example:app
     print("Schema Validation Example")
-    print("Run with: gunicorn examples.schema_example:app")
+    print("Run with: gunicorn examples.validation_example:app")

examples/schema_plugin_example.py

@@ -9,23 +9,17 @@
 from webspark.contrib.plugins.schema import SchemaPlugin
 from webspark.core import View, WebSpark, path
 from webspark.http import Context
-from webspark.schema import (
-    BooleanField,
-    EmailField,
-    IntegerField,
-    Schema,
-    StringField,
-)
 from webspark.utils import HTTPException
 from webspark.utils.decorators import apply
+from webspark.validation import Schema, fields
 
 
 # Define a schema for user data
 class UserSchema(Schema):
-    name = StringField(required=True, max_length=100)
-    email = EmailField(required=True)
-    age = IntegerField(min_value=1, max_value=120)
-    is_active = BooleanField(default=True)
+    name = fields.StringField(required=True, max_length=100)
+    email = fields.EmailField(required=True)
+    age = fields.IntegerField(min_value=1, max_value=120)
+    is_active = fields.BooleanField(default=True)
 
 
 # In-memory storage
@@ -36,23 +30,17 @@ class UserSchema(Schema):
 class UserView(View):
     """Handle user operations with schema validation."""
 
-    body_schema = UserSchema  # Attach the schema for automatic validation
-
     def handle_get(self, ctx: Context):
         """Return all users."""
         ctx.json({"users": users})
 
     @apply(
-        SchemaPlugin(UserSchema, prop="body", kw="body"),
+        SchemaPlugin(UserSchema, prop="body"),
     )
     def handle_post(self, ctx: Context, body: dict):
         """Create a new user with validation."""
         global next_id
 
-        # When body_schema is defined, WebSpark automatically validates the request body
-        # and makes the validated data available through self.validated_body()
-        # validated_data, errors = self.validated_body(raise_=True)
-
         # Create new user with validated data
         new_user = {
             "id": next_id,
@@ -95,5 +83,5 @@ def handle_get(self, ctx: Context):
 if __name__ == "__main__":
     # For development purposes, you can run this with a WSGI server like:
     # gunicorn examples.schema_example:app
-    print("Schema Validation Example")
+    print("Schema Plugin Example")
     print("Run with: gunicorn examples.schema_plugin_example:app")

tests/contrib/plugins/test_schema.py

@@ -5,9 +5,9 @@
 from webspark.contrib.plugins.schema import SchemaPlugin
 from webspark.core.views import View
 from webspark.http.context import Context
-from webspark.schema.fields import IntegerField, StringField
-from webspark.schema.schema import Schema
 from webspark.utils import HTTPException
+from webspark.validation import Schema
+from webspark.validation.fields import IntegerField, StringField
 
 
 # Sample schema for testing

tests/schema/test_schema.py

@@ -6,7 +6,9 @@
 
 import pytest
 
-from webspark.schema.fields import (
+from webspark.utils import HTTPException
+from webspark.validation import Schema
+from webspark.validation.fields import (
     UNDEFINED,
     BaseField,
     BooleanField,
@@ -24,8 +26,6 @@
     URLField,
     UUIDField,
 )
-from webspark.schema.schema import Schema
-from webspark.utils import HTTPException
 
 
 def test_base_field_initialization():

tests/utils/test_apply.py

@@ -4,10 +4,10 @@
 
 from webspark.contrib.plugins.schema import SchemaPlugin
 from webspark.core.views import View
-from webspark.schema.fields import IntegerField, StringField
-from webspark.schema.schema import Schema
 from webspark.utils import HTTPException
 from webspark.utils.decorators import apply
+from webspark.validation import Schema
+from webspark.validation.fields import IntegerField, StringField
 
 
 # Sample schema for testing

webspark/contrib/plugins/schema.py

@@ -9,7 +9,7 @@
 
     from ...core.views import View
     from ...http.context import Context
-    from ...schema.schema import Schema
+    from ...validation.schema import Schema
 
 from ...core.plugin import Plugin
 from ...utils.exceptions import HTTPException

webspark/schema/__init__.py webspark/validation/__init__.pywebspark/schema/__init__.py renamed to webspark/validation/__init__.py

@@ -12,7 +12,7 @@
     from collections.abc import Callable
     from typing import Any
 
-    from .schema import Schema
+    from .validation import Schema
 
 from ..constants import UNDEFINED
 from ..utils import HTTPException