mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-04 21:37:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

cleanup http body

Browse source
This commit is contained in:
Nikolay Kim 2020-04-23 10:43:45 +06:00
parent 4d06b61a36
commit 13599ba064
6 changed files with 30 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

28
ntex/src/http/body.rs
View file

@ -79,20 +79,6 @@ impl ResponseBody<Body> {
ResponseBody::Other(b) => ResponseBody::Other(b), ResponseBody::Other(b) => ResponseBody::Other(b),
} }
} }
#[cfg(test)]
pub(crate) fn bin_ref(&self) -> &[u8] {
match self {
ResponseBody::Body(ref b) => match b {
Body::Bytes(ref bin) => &bin,
_ => panic!(),
},
ResponseBody::Other(ref b) => match b {
Body::Bytes(ref bin) => &bin,
_ => panic!(),
},
}
}
} }
impl<B> From<Body> for ResponseBody<B> { impl<B> From<Body> for ResponseBody<B> {
@ -544,6 +530,10 @@ mod tests {
poll_fn(|cx| "test".poll_next_chunk(cx)).await.unwrap().ok(), poll_fn(|cx| "test".poll_next_chunk(cx)).await.unwrap().ok(),
Some(Bytes::from("test")) Some(Bytes::from("test"))
); );
assert_eq!(
poll_fn(|cx| "test".poll_next_chunk(cx)).await.unwrap().ok(),
Some(Bytes::from("test"))
);
} }
#[ntex_rt::test] #[ntex_rt::test]
@ -579,6 +569,13 @@ mod tests {
.ok(), .ok(),
Some(Bytes::from("test")) Some(Bytes::from("test"))
); );
assert_eq!(
poll_fn(|cx| Vec::from("test").poll_next_chunk(cx))
.await
.unwrap()
.ok(),
Some(Bytes::from("test"))
);
} }
#[ntex_rt::test] #[ntex_rt::test]
@ -592,6 +589,7 @@ mod tests {
poll_fn(|cx| b.poll_next_chunk(cx)).await.unwrap().ok(), poll_fn(|cx| b.poll_next_chunk(cx)).await.unwrap().ok(),
Some(Bytes::from("test")) Some(Bytes::from("test"))
); );
assert!(poll_fn(|cx| b.poll_next_chunk(cx)).await.is_none(),);
} }
#[ntex_rt::test] #[ntex_rt::test]
@ -605,6 +603,7 @@ mod tests {
poll_fn(|cx| b.poll_next_chunk(cx)).await.unwrap().ok(), poll_fn(|cx| b.poll_next_chunk(cx)).await.unwrap().ok(),
Some(Bytes::from("test")) Some(Bytes::from("test"))
); );
assert!(poll_fn(|cx| b.poll_next_chunk(cx)).await.is_none(),);
} }
#[ntex_rt::test] #[ntex_rt::test]
@ -620,6 +619,7 @@ mod tests {
poll_fn(|cx| b.poll_next_chunk(cx)).await.unwrap().ok(), poll_fn(|cx| b.poll_next_chunk(cx)).await.unwrap().ok(),
Some(Bytes::from("test")) Some(Bytes::from("test"))
); );
assert!(poll_fn(|cx| b.poll_next_chunk(cx)).await.is_none(),);
} }
#[ntex_rt::test] #[ntex_rt::test]

21
ntex/src/http/error.rs
View file

@ -4,7 +4,6 @@ use std::str::Utf8Error;
use std::string::FromUtf8Error; use std::string::FromUtf8Error;
use std::{fmt, io}; use std::{fmt, io};
use derive_more::{Display, From};
use http::uri::InvalidUri; use http::uri::InvalidUri;
use http::{header, StatusCode}; use http::{header, StatusCode};
@ -67,7 +66,7 @@ where
} }
/// A set of errors that can occur during parsing HTTP streams /// A set of errors that can occur during parsing HTTP streams
#[derive(Debug, Display)] #[derive(Debug, Display, From)]
pub enum ParseError { pub enum ParseError {
/// An invalid `Method`, such as `GE.T`. /// An invalid `Method`, such as `GE.T`.
#[display(fmt = "Invalid Method specified")] #[display(fmt = "Invalid Method specified")]
@ -107,24 +106,6 @@ pub enum ParseError {
impl std::error::Error for ParseError {} impl std::error::Error for ParseError {}
impl From<io::Error> for ParseError {
fn from(err: io::Error) -> ParseError {
ParseError::Io(err)
}
}
impl From<InvalidUri> for ParseError {
fn from(err: InvalidUri) -> ParseError {
ParseError::Uri(err)
}
}
impl From<Utf8Error> for ParseError {
fn from(err: Utf8Error) -> ParseError {
ParseError::Utf8(err)
}
}
impl From<FromUtf8Error> for ParseError { impl From<FromUtf8Error> for ParseError {
fn from(err: FromUtf8Error) -> ParseError { fn from(err: FromUtf8Error) -> ParseError {
ParseError::Utf8(err.utf8_error()) ParseError::Utf8(err.utf8_error())

2
ntex/src/lib.rs
View file

@ -24,6 +24,8 @@
#[macro_use] #[macro_use]
extern crate log; extern crate log;
#[macro_use]
extern crate derive_more;
pub use ntex_rt_macros::{main, test}; pub use ntex_rt_macros::{main, test};

22
ntex/src/web/responder.rs
View file

@ -467,7 +467,7 @@ pub(crate) mod tests {
let resp: HttpResponse = responder("test").respond_to(&req).await; let resp: HttpResponse = responder("test").respond_to(&req).await;
assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.status(), StatusCode::OK);
assert_eq!(resp.body().bin_ref(), b"test"); assert_eq!(resp.body().get_ref(), b"test");
assert_eq!( assert_eq!(
resp.headers().get(CONTENT_TYPE).unwrap(), resp.headers().get(CONTENT_TYPE).unwrap(),
HeaderValue::from_static("text/plain; charset=utf-8") HeaderValue::from_static("text/plain; charset=utf-8")
@ -475,7 +475,7 @@ pub(crate) mod tests {
let resp: HttpResponse = responder(&b"test"[..]).respond_to(&req).await; let resp: HttpResponse = responder(&b"test"[..]).respond_to(&req).await;
assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.status(), StatusCode::OK);
assert_eq!(resp.body().bin_ref(), b"test"); assert_eq!(resp.body().get_ref(), b"test");
assert_eq!( assert_eq!(
resp.headers().get(CONTENT_TYPE).unwrap(), resp.headers().get(CONTENT_TYPE).unwrap(),
HeaderValue::from_static("application/octet-stream") HeaderValue::from_static("application/octet-stream")
@ -483,7 +483,7 @@ pub(crate) mod tests {
let resp: HttpResponse = responder("test".to_string()).respond_to(&req).await; let resp: HttpResponse = responder("test".to_string()).respond_to(&req).await;
assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.status(), StatusCode::OK);
assert_eq!(resp.body().bin_ref(), b"test"); assert_eq!(resp.body().get_ref(), b"test");
assert_eq!( assert_eq!(
resp.headers().get(CONTENT_TYPE).unwrap(), resp.headers().get(CONTENT_TYPE).unwrap(),
HeaderValue::from_static("text/plain; charset=utf-8") HeaderValue::from_static("text/plain; charset=utf-8")
@ -491,7 +491,7 @@ pub(crate) mod tests {
let resp: HttpResponse = responder(&"test".to_string()).respond_to(&req).await; let resp: HttpResponse = responder(&"test".to_string()).respond_to(&req).await;
assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.status(), StatusCode::OK);
assert_eq!(resp.body().bin_ref(), b"test"); assert_eq!(resp.body().get_ref(), b"test");
assert_eq!( assert_eq!(
resp.headers().get(CONTENT_TYPE).unwrap(), resp.headers().get(CONTENT_TYPE).unwrap(),
HeaderValue::from_static("text/plain; charset=utf-8") HeaderValue::from_static("text/plain; charset=utf-8")
@ -501,7 +501,7 @@ pub(crate) mod tests {
.respond_to(&req) .respond_to(&req)
.await; .await;
assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.status(), StatusCode::OK);
assert_eq!(resp.body().bin_ref(), b"test"); assert_eq!(resp.body().get_ref(), b"test");
assert_eq!( assert_eq!(
resp.headers().get(CONTENT_TYPE).unwrap(), resp.headers().get(CONTENT_TYPE).unwrap(),
HeaderValue::from_static("application/octet-stream") HeaderValue::from_static("application/octet-stream")
@ -511,7 +511,7 @@ pub(crate) mod tests {
.respond_to(&req) .respond_to(&req)
.await; .await;
assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.status(), StatusCode::OK);
assert_eq!(resp.body().bin_ref(), b"test"); assert_eq!(resp.body().get_ref(), b"test");
assert_eq!( assert_eq!(
resp.headers().get(CONTENT_TYPE).unwrap(), resp.headers().get(CONTENT_TYPE).unwrap(),
HeaderValue::from_static("application/octet-stream") HeaderValue::from_static("application/octet-stream")
@ -536,7 +536,7 @@ pub(crate) mod tests {
) )
.await; .await;
assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.status(), StatusCode::OK);
assert_eq!(resp.body().bin_ref(), b"test"); assert_eq!(resp.body().get_ref(), b"test");
assert_eq!( assert_eq!(
resp.headers().get(CONTENT_TYPE).unwrap(), resp.headers().get(CONTENT_TYPE).unwrap(),
HeaderValue::from_static("text/plain; charset=utf-8") HeaderValue::from_static("text/plain; charset=utf-8")
@ -559,7 +559,7 @@ pub(crate) mod tests {
.respond_to(&req) .respond_to(&req)
.await; .await;
assert_eq!(res.status(), StatusCode::BAD_REQUEST); assert_eq!(res.status(), StatusCode::BAD_REQUEST);
assert_eq!(res.body().bin_ref(), b"test"); assert_eq!(res.body().get_ref(), b"test");
let res = responder("test".to_string()) let res = responder("test".to_string())
.with_header("content-type", "json") .with_header("content-type", "json")
@ -567,7 +567,7 @@ pub(crate) mod tests {
.await; .await;
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
assert_eq!(res.body().bin_ref(), b"test"); assert_eq!(res.body().get_ref(), b"test");
assert_eq!( assert_eq!(
res.headers().get(CONTENT_TYPE).unwrap(), res.headers().get(CONTENT_TYPE).unwrap(),
HeaderValue::from_static("json") HeaderValue::from_static("json")
@ -583,7 +583,7 @@ pub(crate) mod tests {
) )
.await; .await;
assert_eq!(res.status(), StatusCode::BAD_REQUEST); assert_eq!(res.status(), StatusCode::BAD_REQUEST);
assert_eq!(res.body().bin_ref(), b"test"); assert_eq!(res.body().get_ref(), b"test");
let req = TestRequest::default().to_http_request(); let req = TestRequest::default().to_http_request();
let res = CustomResponder::<_, DefaultError>::new(( let res = CustomResponder::<_, DefaultError>::new((
@ -594,7 +594,7 @@ pub(crate) mod tests {
.respond_to(&req) .respond_to(&req)
.await; .await;
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
assert_eq!(res.body().bin_ref(), b"test"); assert_eq!(res.body().get_ref(), b"test");
assert_eq!( assert_eq!(
res.headers().get(CONTENT_TYPE).unwrap(), res.headers().get(CONTENT_TYPE).unwrap(),
HeaderValue::from_static("json") HeaderValue::from_static("json")

2
ntex/src/web/types/form.rs
View file

@ -491,6 +491,6 @@ mod tests {
HeaderValue::from_static("application/x-www-form-urlencoded") HeaderValue::from_static("application/x-www-form-urlencoded")
); );
assert_eq!(resp.body().bin_ref(), b"hello=world&counter=123"); assert_eq!(resp.body().get_ref(), b"hello=world&counter=123");
} }
} }

2
ntex/src/web/types/json.rs
View file

@ -438,7 +438,7 @@ mod tests {
header::HeaderValue::from_static("application/json") header::HeaderValue::from_static("application/json")
); );
assert_eq!(resp.body().bin_ref(), b"{\"name\":\"test\"}"); assert_eq!(resp.body().get_ref(), b"{\"name\":\"test\"}");
} }
#[ntex_rt::test] #[ntex_rt::test]