chore: bump version to 0.8.7

Author: j03-dev

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "oxapy"
-version = "0.8.6"
+version = "0.8.7"
 edition = "2024"
 authors = ["FITAHIANA Nomeniavo Joe <24nomeniavo@gmail.com>"]
 repository = "https://github.com/j03-dev/oxapy"

Cargo.toml

@@ -370,18 +370,18 @@ impl RequestBuilder {
                     .into_py_exception()?;
                 request.form = parsed_multipart.fields;
                 request.files = parsed_multipart.files;
-            } else if content_type.starts_with("application/x-www-form-urlencoded") {
+            } else if content_type.starts_with("application/json") {
+                let body = String::from_utf8_lossy(&bytes).to_string();
+                if !body.is_empty() {
+                    request.data = Some(body.clone());
+                }
+            } else {
                 let form = String::from_utf8_lossy(&bytes).to_string();
                 if !form.is_empty() {
                     request.form = form_urlencoded::parse(form.as_bytes())
                         .map(|(k, v)| (k.to_string(), v.to_string()))
                         .collect();
                 }
-            } else {
-                let body = String::from_utf8_lossy(&bytes).to_string();
-                if !body.is_empty() {
-                    request.data = Some(body.clone());
-                }
             }
         }
 

src/request.rs

@@ -62,6 +62,12 @@ def ping(_request):
     return {"message": "pong"}
 
 
+@post("/ping")
+def ping_post(request):
+    body = request.json()
+    return {"message": "pong", "body": body}
+
+
 @post("/echo")
 def echo(request):
     return {"echo": request.json()}
@@ -74,6 +80,18 @@ def redirect_handler(_request):
     return Redirect("/api/v1/ping")
 
 
+@post("/upload")
+def upload_handler(request):
+    files_info = {}
+    for name, file in request.files.items():
+        files_info[name] = {
+            "filename": file.name,
+            "content_type": file.content_type,
+            "size": len(file.content),
+        }
+    return {"files": files_info, "form": dict(request.form)}
+
+
 @get("/error")
 def error_handler(_request):
     return Status.INTERNAL_SERVER_ERROR
@@ -88,7 +106,9 @@ def main(static_dir: Path):
             .routes(
                 [
                     ping,
+                    ping_post,
                     echo,
+                    upload_handler,
                     count_handler,
                     form,
                     hello,

tests/conftest.py

@@ -8,6 +8,13 @@ def test_ping_endpoint(oxapy_server):
     assert res.json()["message"] == "pong"
     assert "application/json" in res.headers["Content-Type"]
 
+    body = {"foo": "bar"}
+    res = requests.post(f"{oxapy_server}/api/v1/ping", json=body)
+    assert res.status_code == 200
+    assert res.json()["message"] == "pong"
+    assert res.json()["body"] == body
+    assert "application/json" in res.headers["Content-Type"]
+
 
 def test_echo_endpoint(oxapy_server):
     payload = {"msg": "hello"}
@@ -71,6 +78,31 @@ def test_form(oxapy_server):
     assert res.json() == form_data
 
 
+def test_urlencoded_form(oxapy_server):
+    form_data = {"username": "John Does", "email": "johndoes@email.com"}
+    res = requests.post(
+        f"{oxapy_server}/api/v1/form",
+        data=form_data,
+        headers={"Content-Type": "application/x-www-form-urlencoded"},
+    )
+    assert res.status_code == 200
+    assert res.json() == form_data
+
+
+def test_multipart_file_upload(oxapy_server):
+    res = requests.post(
+        f"{oxapy_server}/api/v1/upload",
+        files={"document": ("hello.txt", b"Hello, World!", "text/plain")},
+        data={"description": "test file"},
+    )
+    assert res.status_code == 200
+    data = res.json()
+    assert data["files"]["document"]["filename"] == "hello.txt"
+    assert data["files"]["document"]["content_type"] == "text/plain"
+    assert data["files"]["document"]["size"] == 13
+    assert data["form"]["description"] == "test file"
+
+
 def test_protected_route_unauthorized(oxapy_server):
     res = requests.get(f"{oxapy_server}/api/v1/protected")
     assert res.status_code == 401