Merge pull request #6 from jtgeibel/new-body

jtgeibel · web-flow · commit d077f47d81d9 · 2020-03-03T20:24:53.000-05:00
Add support for changes to `conduit::Body`
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 
 name = "conduit-test"
-version = "0.9.0-alpha.1"
+version = "0.9.0-alpha.2"
 authors = ["wycats@gmail.com",
            "Alex Crichton <alex@alexcrichton.com>"]
 description = "Testing utilities for conduit-based stacks"
 repository = "https://github.com/conduit-rust/conduit-test"
 license = "MIT"
 
 [dependencies]
-conduit = "0.9.0-alpha.1"
+conduit = { git = "https://github.com/jtgeibel/conduit", rev = "0deff5b" } # "0.9.0-alpha.2"
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,15 +1,44 @@
 #![warn(rust_2018_idioms)]
 extern crate conduit;
 
-use std::io::prelude::*;
-use std::io::Cursor;
+use std::borrow::Cow;
+use std::io::{Cursor, Read};
 use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
 
 use conduit::{
     header::{HeaderValue, IntoHeaderName},
-    Extensions, HeaderMap, Host, Method, Scheme, TypeMap, Version,
+    Body, Extensions, HeaderMap, Host, Method, Response, Scheme, TypeMap, Version,
 };
 
+pub trait ResponseExt {
+    fn into_cow(self) -> Cow<'static, [u8]>;
+}
+
+impl ResponseExt for Response<Body> {
+    /// Convert the request into a copy-on-write body
+    ///
+    /// # Blocking
+    ///
+    /// This function may block if the value is a `Body::File`.
+    ///
+    /// # Panics
+    ///
+    /// This function panics if there is an error reading a `Body::File`.
+    fn into_cow(self) -> Cow<'static, [u8]> {
+        use conduit::Body::*;
+
+        match self.into_body() {
+            Static(slice) => slice.into(),
+            Owned(vec) => vec.into(),
+            File(mut file) => {
+                let mut vec = Vec::new();
+                std::io::copy(&mut file, &mut vec).unwrap();
+                vec.into()
+            }
+        }
+    }
+}
+
 pub struct MockRequest {
     path: String,
     method: Method,
@@ -146,7 +175,7 @@ mod tests {
         assert_eq!(req.content_length(), None);
         assert_eq!(req.headers().len(), 0);
         let mut s = String::new();
-        req.body().read_to_string(&mut s).ok().expect("No body");
+        req.body().read_to_string(&mut s).expect("No body");
         assert_eq!(s, "".to_string());
     }
 
@@ -158,7 +187,7 @@ mod tests {
         assert_eq!(req.method(), Method::POST);
         assert_eq!(req.path(), "/articles");
         let mut s = String::new();
-        req.body().read_to_string(&mut s).ok().expect("No body");
+        req.body().read_to_string(&mut s).expect("No body");
         assert_eq!(s, "Hello world".to_string());
         assert_eq!(req.content_length(), Some(11));
     }
