spikard 0.5.0 → 0.6.1

data/vendor/crates/spikard-http/src/testing/form.rs

@@ -1,52 +1,52 @@
-use serde_json::Value;
-
-/// Encode JSON form data as application/x-www-form-urlencoded bytes.
-pub fn encode_urlencoded_body(value: &Value) -> Result<Vec<u8>, String> {
-    match value {
-        Value::String(s) => Ok(s.as_bytes().to_vec()),
-        Value::Null => Ok(Vec::new()),
-        Value::Bool(b) => Ok(b.to_string().into_bytes()),
-        Value::Number(num) => Ok(num.to_string().into_bytes()),
-        Value::Object(_) | Value::Array(_) => serde_qs::to_string(value)
-            .map(|encoded| encoded.into_bytes())
-            .map_err(|err| err.to_string()),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-
-    #[test]
-    fn encodes_string_as_raw_bytes() {
-        let out = encode_urlencoded_body(&Value::String("a=b&c=d".to_string())).unwrap();
-        assert_eq!(out, b"a=b&c=d");
-    }
-
-    #[test]
-    fn encodes_null_as_empty_body() {
-        let out = encode_urlencoded_body(&Value::Null).unwrap();
-        assert!(out.is_empty());
-    }
-
-    #[test]
-    fn encodes_bool_as_text() {
-        assert_eq!(encode_urlencoded_body(&json!(true)).unwrap(), b"true");
-        assert_eq!(encode_urlencoded_body(&json!(false)).unwrap(), b"false");
-    }
-
-    #[test]
-    fn encodes_number_as_text() {
-        assert_eq!(encode_urlencoded_body(&json!(42)).unwrap(), b"42");
-        assert_eq!(encode_urlencoded_body(&json!(3.5)).unwrap(), b"3.5");
-    }
-
-    #[test]
-    fn encodes_object_using_querystring_format() {
-        let out = encode_urlencoded_body(&json!({"a": 1, "b": "x"})).unwrap();
-        let text = std::str::from_utf8(&out).unwrap();
-        assert!(text.contains("a=1"));
-        assert!(text.contains("b=x"));
-    }
-}
+use serde_json::Value;
+
+/// Encode JSON form data as application/x-www-form-urlencoded bytes.
+pub fn encode_urlencoded_body(value: &Value) -> Result<Vec<u8>, String> {
+    match value {
+        Value::String(s) => Ok(s.as_bytes().to_vec()),
+        Value::Null => Ok(Vec::new()),
+        Value::Bool(b) => Ok(b.to_string().into_bytes()),
+        Value::Number(num) => Ok(num.to_string().into_bytes()),
+        Value::Object(_) | Value::Array(_) => serde_qs::to_string(value)
+            .map(|encoded| encoded.into_bytes())
+            .map_err(|err| err.to_string()),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json::json;
+
+    #[test]
+    fn encodes_string_as_raw_bytes() {
+        let out = encode_urlencoded_body(&Value::String("a=b&c=d".to_string())).unwrap();
+        assert_eq!(out, b"a=b&c=d");
+    }
+
+    #[test]
+    fn encodes_null_as_empty_body() {
+        let out = encode_urlencoded_body(&Value::Null).unwrap();
+        assert!(out.is_empty());
+    }
+
+    #[test]
+    fn encodes_bool_as_text() {
+        assert_eq!(encode_urlencoded_body(&json!(true)).unwrap(), b"true");
+        assert_eq!(encode_urlencoded_body(&json!(false)).unwrap(), b"false");
+    }
+
+    #[test]
+    fn encodes_number_as_text() {
+        assert_eq!(encode_urlencoded_body(&json!(42)).unwrap(), b"42");
+        assert_eq!(encode_urlencoded_body(&json!(3.5)).unwrap(), b"3.5");
+    }
+
+    #[test]
+    fn encodes_object_using_querystring_format() {
+        let out = encode_urlencoded_body(&json!({"a": 1, "b": "x"})).unwrap();
+        let text = std::str::from_utf8(&out).unwrap();
+        assert!(text.contains("a=1"));
+        assert!(text.contains("b=x"));
+    }
+}

data/vendor/crates/spikard-http/src/testing/multipart.rs

@@ -1,60 +1,64 @@
-use std::time::{SystemTime, UNIX_EPOCH};
-
-/// File part metadata for multipart/form-data payloads.
-#[derive(Debug, Clone)]
-pub struct MultipartFilePart {
-    pub field_name: String,
-    pub filename: String,
-    pub content_type: Option<String>,
-    pub content: Vec<u8>,
-}
-
-/// Build a multipart/form-data body from fields and files.
-pub fn build_multipart_body(form_fields: &[(String, String)], files: &[MultipartFilePart]) -> (Vec<u8>, String) {
-    let boundary = generate_boundary();
-    let mut body = Vec::new();
-
-    for (name, value) in form_fields {
-        body.extend_from_slice(b"--");
-        body.extend_from_slice(boundary.as_bytes());
-        body.extend_from_slice(b"\r\n");
-        body.extend_from_slice(b"Content-Disposition: form-data; name=\"");
-        body.extend_from_slice(name.as_bytes());
-        body.extend_from_slice(b"\"\r\n\r\n");
-        body.extend_from_slice(value.as_bytes());
-        body.extend_from_slice(b"\r\n");
-    }
-
-    for file in files {
-        body.extend_from_slice(b"--");
-        body.extend_from_slice(boundary.as_bytes());
-        body.extend_from_slice(b"\r\n");
-        body.extend_from_slice(b"Content-Disposition: form-data; name=\"");
-        body.extend_from_slice(file.field_name.as_bytes());
-        body.extend_from_slice(b"\"; filename=\"");
-        body.extend_from_slice(file.filename.as_bytes());
-        body.extend_from_slice(b"\"\r\n");
-        if let Some(content_type) = &file.content_type {
-            body.extend_from_slice(b"Content-Type: ");
-            body.extend_from_slice(content_type.as_bytes());
-            body.extend_from_slice(b"\r\n");
-        }
-        body.extend_from_slice(b"\r\n");
-        body.extend_from_slice(&file.content);
-        body.extend_from_slice(b"\r\n");
-    }
-
-    body.extend_from_slice(b"--");
-    body.extend_from_slice(boundary.as_bytes());
-    body.extend_from_slice(b"--\r\n");
-
-    (body, boundary)
-}
-
-fn generate_boundary() -> String {
-    let nanos = SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .map(|duration| duration.as_nanos())
-        .unwrap_or_default();
-    format!("spikard-boundary-{nanos}")
-}
+use std::time::{SystemTime, UNIX_EPOCH};
+
+/// File part metadata for multipart/form-data payloads.
+#[derive(Debug, Clone)]
+pub struct MultipartFilePart {
+    pub field_name: String,
+    pub filename: String,
+    pub content_type: Option<String>,
+    pub content: Vec<u8>,
+}
+
+/// Build a multipart/form-data body from fields and files.
+pub fn build_multipart_body(form_fields: &[(String, String)], files: &[MultipartFilePart]) -> (Vec<u8>, String) {
+    let boundary = generate_boundary();
+    let mut body = Vec::new();
+
+    for (name, value) in form_fields {
+        body.extend_from_slice(b"--");
+        body.extend_from_slice(boundary.as_bytes());
+        body.extend_from_slice(b"\r\n");
+        body.extend_from_slice(b"Content-Disposition: form-data; name=\"");
+        body.extend_from_slice(name.as_bytes());
+        body.extend_from_slice(b"\"\r\n\r\n");
+        body.extend_from_slice(value.as_bytes());
+        body.extend_from_slice(b"\r\n");
+    }
+
+    for file in files {
+        body.extend_from_slice(b"--");
+        body.extend_from_slice(boundary.as_bytes());
+        body.extend_from_slice(b"\r\n");
+        body.extend_from_slice(b"Content-Disposition: form-data; name=\"");
+        body.extend_from_slice(file.field_name.as_bytes());
+        body.extend_from_slice(b"\"");
+        if !file.filename.is_empty() {
+            body.extend_from_slice(b"; filename=\"");
+            body.extend_from_slice(file.filename.as_bytes());
+            body.extend_from_slice(b"\"");
+        }
+        body.extend_from_slice(b"\r\n");
+        if let Some(content_type) = &file.content_type {
+            body.extend_from_slice(b"Content-Type: ");
+            body.extend_from_slice(content_type.as_bytes());
+            body.extend_from_slice(b"\r\n");
+        }
+        body.extend_from_slice(b"\r\n");
+        body.extend_from_slice(&file.content);
+        body.extend_from_slice(b"\r\n");
+    }
+
+    body.extend_from_slice(b"--");
+    body.extend_from_slice(boundary.as_bytes());
+    body.extend_from_slice(b"--\r\n");
+
+    (body, boundary)
+}
+
+fn generate_boundary() -> String {
+    let nanos = SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .map(|duration| duration.as_nanos())
+        .unwrap_or_default();
+    format!("spikard-boundary-{nanos}")
+}