Merge branch 'release/v2.0.0'

rousan · rousan · commit ca7bd7facc50 · 2021-07-13T20:13:44.000+05:30
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "routerify-json-response"
-version = "1.1.0"
+version = "2.0.0"
 description = "A Routerify utility library to generate JSON response."
 homepage = "https://github.com/routerify/routerify-json-response"
 repository = "https://github.com/routerify/routerify-json-response"
@@ -12,11 +12,12 @@ license = "MIT"
 edition = "2018"
 
 [dependencies]
-hyper = "0.13"
-routerify = "1.1"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+http-body = "0.4"
+http = "0.2"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
 
 [dev-dependencies]
-tokio = { version = "0.2", features = ["full"] }
-stream-body = "0.1"
+tokio = { version = "1", features = ["full"] }
+hyper = { version = "0.14", features = ["server"] }
+routerify = "2"
diff --git a/README.md b/README.md
@@ -30,13 +30,13 @@ In `Failed` case, It generates JSON response in the following format:
 [Docs](https://docs.rs/routerify-json-response)
 
 ## Install
-
+ 
 Add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-routerify = "1.1"
-routerify-json-response = "1.1"
+routerify = "2"
+routerify-json-response = "2"
 ```
 
 ## Example
@@ -48,7 +48,7 @@ use routerify_json_response::{json_failed_resp_with_message, json_success_resp};
 use routerify::{Router, RouterService};
 use std::net::SocketAddr;
 
-async fn list_users_handler(_: Request<Body>) -> Result<Response<Body>, routerify::Error> {
+async fn list_users_handler(_: Request<Body>) -> Result<Response<Body>, routerify_json_response::Error> {
     // Fetch response data from somewhere.
     let users = ["Alice", "John"];
 
@@ -57,7 +57,7 @@ async fn list_users_handler(_: Request<Body>) -> Result<Response<Body>, routerif
     json_success_resp(&users)
 }
 
-async fn list_books_handler(_: Request<Body>) -> Result<Response<Body>, routerify::Error> {
+async fn list_books_handler(_: Request<Body>) -> Result<Response<Body>, routerify_json_response::Error> {
     // Generate a failed JSON response in the following format:
     // { "status": "failed", code: 500, data: "Internal Server Error: Couldn't fetch book list from database" }
     json_failed_resp_with_message(
@@ -67,7 +67,7 @@ async fn list_books_handler(_: Request<Body>) -> Result<Response<Body>, routerif
 }
 
 // Create a router.
-fn router() -> Router<Body, routerify::Error> {
+fn router() -> Router<Body, routerify_json_response::Error> {
     Router::builder()
         // Attach the handlers.
         .get("/users", list_users_handler)
diff --git a/examples/example.rs b/examples/example.rs
@@ -4,7 +4,7 @@ use routerify::{Router, RouterService};
 use routerify_json_response::{json_failed_resp_with_message, json_success_resp};
 use std::net::SocketAddr;
 
-async fn list_users_handler(_: Request<Body>) -> Result<Response<Body>, routerify::Error> {
+async fn list_users_handler(_: Request<Body>) -> routerify_json_response::Result<Response<Body>> {
     // Fetch response data from somewhere.
     let users = ["Alice", "John"];
 
@@ -13,7 +13,7 @@ async fn list_users_handler(_: Request<Body>) -> Result<Response<Body>, routerif
     json_success_resp(&users)
 }
 
-async fn list_books_handler(_: Request<Body>) -> Result<Response<Body>, routerify::Error> {
+async fn list_books_handler(_: Request<Body>) -> routerify_json_response::Result<Response<Body>> {
     // Generate a failed JSON response in the following format:
     // { "status": "failed", code: 500, data: "Internal Server Error: Couldn't fetch book list from database" }
     json_failed_resp_with_message(
@@ -23,7 +23,7 @@ async fn list_books_handler(_: Request<Body>) -> Result<Response<Body>, routerif
 }
 
 // Create a router.
-fn router() -> Router<Body, routerify::Error> {
+fn router() -> Router<Body, routerify_json_response::Error> {
     Router::builder()
         // Attach the handlers.
         .get("/users", list_users_handler)
diff --git a/examples/test.rs b/examples/test.rs
diff --git a/examples/test_stream_body.rs b/examples/test_stream_body.rs
diff --git a/src/error.rs b/src/error.rs
@@ -0,0 +1,3 @@
+use std::error::Error as StdError;
+
+pub type Error = Box<dyn StdError + Send + Sync + 'static>;
diff --git a/src/failed_resp.rs b/src/failed_resp.rs
@@ -1,5 +1,6 @@
 use crate::gen_resp::gen_response;
-use hyper::{body::HttpBody, Response, StatusCode};
+use http::{Response, StatusCode};
+use http_body::Body as HttpBody;
 use serde::Serialize;
 
 const STATUS_FAILED: &'static str = "failed";
@@ -30,7 +31,7 @@ struct FailedResp {
 /// use hyper::{Body, Request, Response, StatusCode};
 /// use routerify_json_response::{json_failed_resp_with_message};
 ///
-/// async fn list_books_handler(_: Request<Body>) -> Result<Response<Body>, routerify::Error> {
+/// async fn list_books_handler(_: Request<Body>) -> Result<Response<Body>, routerify_json_response::Error> {
 ///     // Generate a failed JSON response in the following format:
 ///     // { "status": "failed", code: 500, data: "Internal Server Error: Couldn't fetch book list from database" }
 ///     json_failed_resp_with_message(
@@ -39,7 +40,7 @@ struct FailedResp {
 ///      )
 /// }
 /// ```
-pub fn json_failed_resp_with_message<B, M>(code: StatusCode, message: M) -> routerify::Result<Response<B>>
+pub fn json_failed_resp_with_message<B, M>(code: StatusCode, message: M) -> crate::Result<Response<B>>
 where
     B: HttpBody + From<Vec<u8>> + Send + Sync + Unpin + 'static,
     M: Into<String>,
@@ -71,13 +72,13 @@ where
 /// use hyper::{Body, Request, Response, StatusCode};
 /// use routerify_json_response::{json_failed_resp};
 ///
-/// async fn list_books_handler(_: Request<Body>) -> Result<Response<Body>, routerify::Error> {
+/// async fn list_books_handler(_: Request<Body>) -> Result<Response<Body>, routerify_json_response::Error> {
 ///     // Generate a failed JSON response in the following format:
 ///     // { "status": "failed", code: 500, data: "Internal Server Error" }
 ///     json_failed_resp(StatusCode::INTERNAL_SERVER_ERROR)
 /// }
 /// ```
-pub fn json_failed_resp<B>(code: StatusCode) -> routerify::Result<Response<B>>
+pub fn json_failed_resp<B>(code: StatusCode) -> crate::Result<Response<B>>
 where
     B: HttpBody + From<Vec<u8>> + Send + Sync + Unpin + 'static,
 {
diff --git a/src/gen_resp.rs b/src/gen_resp.rs
@@ -1,17 +1,21 @@
-use hyper::{body::HttpBody, header, Response, StatusCode};
+use http::{header, Response, StatusCode};
+use http_body::Body as HttpBody;
 use serde::Serialize;
 
-pub(crate) fn gen_response<B, D>(code: StatusCode, resp_data: &D) -> routerify::Result<Response<B>>
+pub(crate) fn gen_response<B, D>(code: StatusCode, resp_data: &D) -> crate::Result<Response<B>>
 where
     B: HttpBody + From<Vec<u8>> + Send + Sync + Unpin + 'static,
     D: Serialize + Send + Sync + Unpin,
 {
     let json_resp_data = match serde_json::to_vec(&resp_data) {
         Ok(json_data) => json_data,
         Err(err) => {
-            return Err(routerify::Error::new(format!(
-                "routerify-json-response: Failed to convert the response data as JSON: {}",
-                err
+            return Err(Box::new(std::io::Error::new(
+                std::io::ErrorKind::Other,
+                format!(
+                    "routerify-json-response: Failed to convert the response data as JSON: {}",
+                    err
+                ),
             )));
         }
     };
@@ -27,9 +31,9 @@ where
 
     match resp {
         Ok(resp) => Ok(resp),
-        Err(err) => Err(routerify::Error::new(format!(
-            "routerify-json-response: Failed to create response: {}",
-            err
+        Err(err) => Err(Box::new(std::io::Error::new(
+            std::io::ErrorKind::Other,
+            format!("routerify-json-response: Failed to create response: {}", err),
         ))),
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
@@ -29,7 +29,7 @@
 //! use routerify::{Router, RouterService};
 //! use std::net::SocketAddr;
 //!
-//! async fn list_users_handler(_: Request<Body>) -> Result<Response<Body>, routerify::Error> {
+//! async fn list_users_handler(_: Request<Body>) -> Result<Response<Body>, routerify_json_response::Error> {
 //!     // Fetch response data from somewhere.
 //!     let users = ["Alice", "John"];
 //!
@@ -38,7 +38,7 @@
 //!     json_success_resp(&users)
 //! }
 //!
-//! async fn list_books_handler(_: Request<Body>) -> Result<Response<Body>, routerify::Error> {
+//! async fn list_books_handler(_: Request<Body>) -> Result<Response<Body>, routerify_json_response::Error> {
 //!     // Generate a failed JSON response in the following format:
 //!     // { "status": "failed", code: 500, data: "Internal Server Error: Couldn't fetch book list from database" }
 //!     json_failed_resp_with_message(
@@ -48,7 +48,7 @@
 //! }
 //!
 //! // Create a router.
-//! fn router() -> Router<Body, routerify::Error> {
+//! fn router() -> Router<Body, routerify_json_response::Error> {
 //!     Router::builder()
 //!         // Attach the handlers.
 //!         .get("/users", list_users_handler)
@@ -77,9 +77,13 @@
 //! }
 //! ```
 
+pub use error::Error;
 pub use failed_resp::{json_failed_resp, json_failed_resp_with_message};
 pub use success_resp::{json_success_resp, json_success_resp_with_code};
 
+mod error;
 mod failed_resp;
 mod gen_resp;
 mod success_resp;
+
+pub type Result<T> = std::result::Result<T, Error>;
diff --git a/src/success_resp.rs b/src/success_resp.rs
@@ -1,5 +1,6 @@
 use crate::gen_resp::gen_response;
-use hyper::{body::HttpBody, Response, StatusCode};
+use http::{Response, StatusCode};
+use http_body::Body as HttpBody;
 use serde::Serialize;
 
 const STATUS_SUCCESS: &'static str = "success";
@@ -33,7 +34,7 @@ where
 /// use hyper::{Body, Request, Response, StatusCode};
 /// use routerify_json_response::{json_success_resp_with_code};
 ///
-/// async fn list_users_handler(_: Request<Body>) -> Result<Response<Body>, routerify::Error> {
+/// async fn list_users_handler(_: Request<Body>) -> Result<Response<Body>, routerify_json_response::Error> {
 ///     // Fetch response data from somewhere.
 ///     let users = ["Alice", "John"];
 ///
@@ -42,7 +43,7 @@ where
 ///     json_success_resp_with_code(StatusCode::CREATED, &users)
 /// }
 /// ```
-pub fn json_success_resp_with_code<B, D>(code: StatusCode, data: &D) -> routerify::Result<Response<B>>
+pub fn json_success_resp_with_code<B, D>(code: StatusCode, data: &D) -> crate::Result<Response<B>>
 where
     B: HttpBody + From<Vec<u8>> + Send + Sync + Unpin + 'static,
     D: Serialize + Send + Sync + Unpin,
@@ -74,7 +75,7 @@ where
 /// use hyper::{Body, Request, Response, StatusCode};
 /// use routerify_json_response::{json_success_resp};
 ///
-/// async fn list_users_handler(_: Request<Body>) -> Result<Response<Body>, routerify::Error> {
+/// async fn list_users_handler(_: Request<Body>) -> Result<Response<Body>, routerify_json_response::Error> {
 ///     // Fetch response data from somewhere.
 ///     let users = ["Alice", "John"];
 ///
@@ -83,7 +84,7 @@ where
 ///     json_success_resp(&users)
 /// }
 /// ```
-pub fn json_success_resp<B, D>(data: &D) -> routerify::Result<Response<B>>
+pub fn json_success_resp<B, D>(data: &D) -> crate::Result<Response<B>>
 where
     B: HttpBody + From<Vec<u8>> + Send + Sync + Unpin + 'static,
     D: Serialize + Send + Sync + Unpin,

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+use std::error::Error as StdError;`
	`2`	`+`
	`3`	`+pub type Error = Box<dyn StdError + Send + Sync + 'static>;`