Accept body optionvec or vec

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "curl-http-client"
-version = "2.2.0"
+version = "2.3.0"
 edition = "2021"
 authors = ["Lorenzo Leonardo <[email protected]>"]
 license = "MIT"

src/collector.rs

@@ -325,8 +325,20 @@ impl ExtendedHandler for Collector {
     fn get_response_body(&self) -> Option<Vec<u8>> {
         match self {
             Collector::File(_) => None,
-            Collector::Ram(container) => Some(container.clone()),
-            Collector::RamAndHeaders(container, _) => Some(container.clone()),
+            Collector::Ram(container) => {
+                if container.is_empty() {
+                    None
+                } else {
+                    Some(container.clone())
+                }
+            }
+            Collector::RamAndHeaders(container, _) => {
+                if container.is_empty() {
+                    None
+                } else {
+                    Some(container.clone())
+                }
+            }
             Collector::FileAndHeaders(_, _) => None,
         }
     }
@@ -338,7 +350,13 @@ impl ExtendedHandler for Collector {
     fn get_response_body_and_headers(&self) -> (Option<Vec<u8>>, Option<HeaderMap>) {
         match self {
             Collector::File(_) => (None, None),
-            Collector::Ram(container) => (Some(container.clone()), None),
+            Collector::Ram(container) => {
+                if container.is_empty() {
+                    (None, None)
+                } else {
+                    (Some(container.clone()), None)
+                }
+            }
             Collector::RamAndHeaders(container, headers) => {
                 let header_str = std::str::from_utf8(headers).unwrap();
                 let mut header_map = HeaderMap::new();
@@ -354,7 +372,11 @@ impl ExtendedHandler for Collector {
                         }
                     }
                 }
-                (Some(container.clone()), Some(header_map))
+                if container.is_empty() {
+                    (None, Some(header_map))
+                } else {
+                    (Some(container.clone()), Some(header_map))
+                }
             }
             Collector::FileAndHeaders(_, headers) => {
                 let header_str = std::str::from_utf8(headers).unwrap();

src/http_client.rs

@@ -58,7 +58,7 @@ where
     ///
     /// The HttpRequest can be customized by the caller by setting the Url, Method Type,
     /// Headers and the Body.
-    pub fn request(mut self, request: Request<Option<Vec<u8>>>) -> Result<Self, Error<C>> {
+    pub fn request<B: CurlBodyRequest>(mut self, request: Request<B>) -> Result<Self, Error<C>> {
         self.easy
             .url(request.uri().to_string().as_str())
             .map_err(|e| {
@@ -94,7 +94,7 @@ where
             Method::POST => {
                 self.easy.post(true).map_err(Error::Curl)?;
 
-                if let Some(body) = request.body() {
+                if let Some(body) = request.body().get_bytes() {
                     self.easy.post_field_size(body.len() as u64).map_err(|e| {
                         trace!("{:?}", e);
                         Error::Curl(e)
@@ -1013,3 +1013,25 @@ impl From<usize> for FileSize {
         Self(value)
     }
 }
+
+/// The purpose of this trait is to be able to accept
+/// request body with Option<Vec<u8>> or Vec<u8>
+pub trait CurlBodyRequest {
+    fn get_bytes(&self) -> Option<&Vec<u8>>;
+}
+
+impl CurlBodyRequest for Vec<u8> {
+    fn get_bytes(&self) -> Option<&Vec<u8>> {
+        if self.is_empty() {
+            None
+        } else {
+            Some(self)
+        }
+    }
+}
+
+impl CurlBodyRequest for Option<Vec<u8>> {
+    fn get_bytes(&self) -> Option<&Vec<u8>> {
+        self.as_ref()
+    }
+}