From c1607f16984576817f3642ccee2ce725dd802735 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Wed, 1 Apr 2020 14:34:45 +0600 Subject: [PATCH] refactor Factory trait --- Cargo.toml | 4 +- {ntex-web-macros => ntex-macros}/CHANGES.md | 0 {ntex-web-macros => ntex-macros}/Cargo.toml | 6 +- {ntex-web-macros => ntex-macros}/LICENSE | 0 {ntex-web-macros => ntex-macros}/README.md | 0 {ntex-web-macros => ntex-macros}/src/lib.rs | 36 ++++----- {ntex-web-macros => ntex-macros}/src/route.rs | 2 +- .../tests/test_macro.rs | 0 ntex/Cargo.toml | 2 +- ntex/examples/basic.rs | 2 +- ntex/examples/uds.rs | 1 - ntex/src/web/handler.rs | 76 ++++++++++--------- ntex/src/web/mod.rs | 27 +++---- ntex/src/web/resource.rs | 12 ++- ntex/src/web/route.rs | 23 ++---- ntex/src/web/util.rs | 13 ++-- 16 files changed, 96 insertions(+), 108 deletions(-) rename {ntex-web-macros => ntex-macros}/CHANGES.md (100%) rename {ntex-web-macros => ntex-macros}/Cargo.toml (78%) rename {ntex-web-macros => ntex-macros}/LICENSE (100%) rename {ntex-web-macros => ntex-macros}/README.md (100%) rename {ntex-web-macros => ntex-macros}/src/lib.rs (83%) rename {ntex-web-macros => ntex-macros}/src/route.rs (99%) rename {ntex-web-macros => ntex-macros}/tests/test_macro.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index cbe42108..9f223578 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ members = [ "ntex-rt", "ntex-rt-macros", "ntex-service", - # "ntex-web-macros", + "ntex-macros", ] [patch.crates-io] @@ -16,4 +16,4 @@ ntex-router = { path = "ntex-router" } ntex-rt = { path = "ntex-rt" } ntex-rt-macros = { path = "ntex-rt-macros" } ntex-service = { path = "ntex-service" } -ntex-web-macros = { path = "ntex-web-macros" } +ntex-macros = { path = "ntex-macros" } diff --git a/ntex-web-macros/CHANGES.md b/ntex-macros/CHANGES.md similarity index 100% rename from ntex-web-macros/CHANGES.md rename to ntex-macros/CHANGES.md diff --git a/ntex-web-macros/Cargo.toml b/ntex-macros/Cargo.toml similarity index 78% rename from ntex-web-macros/Cargo.toml rename to ntex-macros/Cargo.toml index 955e2a47..c010631d 100644 --- a/ntex-web-macros/Cargo.toml +++ b/ntex-macros/Cargo.toml @@ -1,10 +1,10 @@ [package] -name = "ntex-web-macros" +name = "ntex-macros" version = "0.1.0" -description = "ntex web proc macros" +description = "ntex proc macros" readme = "README.md" authors = ["Nikolay Kim "] -license = "MIT/Apache-2.0" +license = "MIT" edition = "2018" [lib] diff --git a/ntex-web-macros/LICENSE b/ntex-macros/LICENSE similarity index 100% rename from ntex-web-macros/LICENSE rename to ntex-macros/LICENSE diff --git a/ntex-web-macros/README.md b/ntex-macros/README.md similarity index 100% rename from ntex-web-macros/README.md rename to ntex-macros/README.md diff --git a/ntex-web-macros/src/lib.rs b/ntex-macros/src/lib.rs similarity index 83% rename from ntex-web-macros/src/lib.rs rename to ntex-macros/src/lib.rs index 8a03a3f5..89e528fb 100644 --- a/ntex-web-macros/src/lib.rs +++ b/ntex-macros/src/lib.rs @@ -7,15 +7,15 @@ //! //! Macros: //! -//! - [get](attr.get.html) -//! - [post](attr.post.html) -//! - [put](attr.put.html) -//! - [delete](attr.delete.html) -//! - [head](attr.head.html) -//! - [connect](attr.connect.html) -//! - [options](attr.options.html) -//! - [trace](attr.trace.html) -//! - [patch](attr.patch.html) +//! - [web_get](attr.get.html) +//! - [web_post](attr.post.html) +//! - [web_put](attr.put.html) +//! - [web_delete](attr.delete.html) +//! - [web_head](attr.head.html) +//! - [web_connect](attr.connect.html) +//! - [web_options](attr.options.html) +//! - [web_trace](attr.trace.html) +//! - [web_patch](attr.patch.html) //! //! ### Attributes: //! @@ -55,7 +55,7 @@ use syn::parse_macro_input; /// - `"path"` - Raw literal string with path for which to register handler. Mandatory. /// - `guard="function_name"` - Registers function as guard using `ntex::web::guard::fn_guard` #[proc_macro_attribute] -pub fn get(args: TokenStream, input: TokenStream) -> TokenStream { +pub fn web_get(args: TokenStream, input: TokenStream) -> TokenStream { let args = parse_macro_input!(args as syn::AttributeArgs); let gen = match route::Route::new(args, input, route::GuardType::Get) { Ok(gen) => gen, @@ -70,7 +70,7 @@ pub fn get(args: TokenStream, input: TokenStream) -> TokenStream { /// /// Attributes are the same as in [get](attr.get.html) #[proc_macro_attribute] -pub fn post(args: TokenStream, input: TokenStream) -> TokenStream { +pub fn web_post(args: TokenStream, input: TokenStream) -> TokenStream { let args = parse_macro_input!(args as syn::AttributeArgs); let gen = match route::Route::new(args, input, route::GuardType::Post) { Ok(gen) => gen, @@ -85,7 +85,7 @@ pub fn post(args: TokenStream, input: TokenStream) -> TokenStream { /// /// Attributes are the same as in [get](attr.get.html) #[proc_macro_attribute] -pub fn put(args: TokenStream, input: TokenStream) -> TokenStream { +pub fn web_put(args: TokenStream, input: TokenStream) -> TokenStream { let args = parse_macro_input!(args as syn::AttributeArgs); let gen = match route::Route::new(args, input, route::GuardType::Put) { Ok(gen) => gen, @@ -100,7 +100,7 @@ pub fn put(args: TokenStream, input: TokenStream) -> TokenStream { /// /// Attributes are the same as in [get](attr.get.html) #[proc_macro_attribute] -pub fn delete(args: TokenStream, input: TokenStream) -> TokenStream { +pub fn web_delete(args: TokenStream, input: TokenStream) -> TokenStream { let args = parse_macro_input!(args as syn::AttributeArgs); let gen = match route::Route::new(args, input, route::GuardType::Delete) { Ok(gen) => gen, @@ -115,7 +115,7 @@ pub fn delete(args: TokenStream, input: TokenStream) -> TokenStream { /// /// Attributes are the same as in [head](attr.head.html) #[proc_macro_attribute] -pub fn head(args: TokenStream, input: TokenStream) -> TokenStream { +pub fn web_head(args: TokenStream, input: TokenStream) -> TokenStream { let args = parse_macro_input!(args as syn::AttributeArgs); let gen = match route::Route::new(args, input, route::GuardType::Head) { Ok(gen) => gen, @@ -130,7 +130,7 @@ pub fn head(args: TokenStream, input: TokenStream) -> TokenStream { /// /// Attributes are the same as in [connect](attr.connect.html) #[proc_macro_attribute] -pub fn connect(args: TokenStream, input: TokenStream) -> TokenStream { +pub fn web_connect(args: TokenStream, input: TokenStream) -> TokenStream { let args = parse_macro_input!(args as syn::AttributeArgs); let gen = match route::Route::new(args, input, route::GuardType::Connect) { Ok(gen) => gen, @@ -145,7 +145,7 @@ pub fn connect(args: TokenStream, input: TokenStream) -> TokenStream { /// /// Attributes are the same as in [options](attr.options.html) #[proc_macro_attribute] -pub fn options(args: TokenStream, input: TokenStream) -> TokenStream { +pub fn web_options(args: TokenStream, input: TokenStream) -> TokenStream { let args = parse_macro_input!(args as syn::AttributeArgs); let gen = match route::Route::new(args, input, route::GuardType::Options) { Ok(gen) => gen, @@ -160,7 +160,7 @@ pub fn options(args: TokenStream, input: TokenStream) -> TokenStream { /// /// Attributes are the same as in [trace](attr.trace.html) #[proc_macro_attribute] -pub fn trace(args: TokenStream, input: TokenStream) -> TokenStream { +pub fn web_trace(args: TokenStream, input: TokenStream) -> TokenStream { let args = parse_macro_input!(args as syn::AttributeArgs); let gen = match route::Route::new(args, input, route::GuardType::Trace) { Ok(gen) => gen, @@ -175,7 +175,7 @@ pub fn trace(args: TokenStream, input: TokenStream) -> TokenStream { /// /// Attributes are the same as in [patch](attr.patch.html) #[proc_macro_attribute] -pub fn patch(args: TokenStream, input: TokenStream) -> TokenStream { +pub fn web_patch(args: TokenStream, input: TokenStream) -> TokenStream { let args = parse_macro_input!(args as syn::AttributeArgs); let gen = match route::Route::new(args, input, route::GuardType::Patch) { Ok(gen) => gen, diff --git a/ntex-web-macros/src/route.rs b/ntex-macros/src/route.rs similarity index 99% rename from ntex-web-macros/src/route.rs rename to ntex-macros/src/route.rs index 2d76847c..da248770 100644 --- a/ntex-web-macros/src/route.rs +++ b/ntex-macros/src/route.rs @@ -161,7 +161,7 @@ impl Route { .unwrap(); let stream = quote! { - // #[allow(non_camel_case_types)] + #[allow(non_camel_case_types)] pub struct #name; impl<__E: 'static> ntex::web::dev::HttpServiceFactory<__E> for #name diff --git a/ntex-web-macros/tests/test_macro.rs b/ntex-macros/tests/test_macro.rs similarity index 100% rename from ntex-web-macros/tests/test_macro.rs rename to ntex-macros/tests/test_macro.rs diff --git a/ntex/Cargo.toml b/ntex/Cargo.toml index c4dc4113..d7bcf31c 100644 --- a/ntex/Cargo.toml +++ b/ntex/Cargo.toml @@ -41,7 +41,7 @@ ntex-rt = "0.1" ntex-rt-macros = "0.1" ntex-router = "0.3" ntex-service = "0.1" -ntex-web-macros = "0.1" +ntex-macros = "0.1" actix-threadpool = "0.3.1" base64 = "0.12" diff --git a/ntex/examples/basic.rs b/ntex/examples/basic.rs index 39a87982..50e6927c 100644 --- a/ntex/examples/basic.rs +++ b/ntex/examples/basic.rs @@ -37,7 +37,7 @@ async fn main() -> std::io::Result<()> { .default_service( web::route().to(|| async { HttpResponse::MethodNotAllowed() }), ) - .route(web::get().to(web::dev::__assert_handler1(index_async))), + .route(web::get().to(index_async)), ) .service(web::resource("/test1.html").to(|| async { "Test\r\n" })) }) diff --git a/ntex/examples/uds.rs b/ntex/examples/uds.rs index cbd6ee26..325a370f 100644 --- a/ntex/examples/uds.rs +++ b/ntex/examples/uds.rs @@ -27,7 +27,6 @@ async fn main() -> std::io::Result<()> { HttpServer::new(|| { App::new() .wrap(middleware::DefaultHeaders::new().header("X-Version", "0.2")) - .wrap(middleware::Compress::default()) .wrap(middleware::Logger::default()) .service(web::resource("/resource1/{name}/index.html").to(index)) .service(web::resource("/").route(web::get().to(no_params))) diff --git a/ntex/src/web/handler.rs b/ntex/src/web/handler.rs index 66f1db2f..dcd5391d 100644 --- a/ntex/src/web/handler.rs +++ b/ntex/src/web/handler.rs @@ -12,23 +12,27 @@ use super::request::HttpRequest; use super::responder::Responder; use super::service::{WebRequest, WebResponse}; -/// Async handler converter factory -pub trait Factory: Clone + 'static +/// Async fn handler factory +pub trait Factory: Clone + 'static where - R: Future, - O: Responder, Err: ErrorRenderer, { - fn call(&self, param: T) -> R; + type Future: Future + 'static; + type Result: Responder; + + fn call(&self, param: T) -> Self::Future; } -impl Factory<(), R, O, Err> for F +impl Factory<(), Err> for F where F: Fn() -> R + Clone + 'static, - R: Future, - O: Responder, + R: Future + 'static, + R::Output: Responder, Err: ErrorRenderer, { + type Future = R; + type Result = R::Output; + fn call(&self, _: ()) -> R { (self)() } @@ -45,12 +49,12 @@ pub(super) trait HandlerFn { pub(super) struct Handler where - F: Factory, + F: Factory, T: FromRequest, - >::Error: Into, - R: Future, + T::Error: Into, + R: Future + 'static, O: Responder, - >::Error: Into, + O::Error: Into, Err: ErrorRenderer, { hnd: F, @@ -59,12 +63,12 @@ where impl Handler where - F: Factory, + F: Factory, T: FromRequest, - >::Error: Into, - R: Future, + T::Error: Into, + R: Future + 'static, O: Responder, - >::Error: Into, + O::Error: Into, Err: ErrorRenderer, { pub(super) fn new(hnd: F) -> Self { @@ -77,12 +81,12 @@ where impl HandlerFn for Handler where - F: Factory, + F: Factory, T: FromRequest + 'static, - >::Error: Into, + T::Error: Into, R: Future + 'static, O: Responder + 'static, - >::Error: Into, + O::Error: Into, Err: ErrorRenderer, { fn call( @@ -111,12 +115,12 @@ where impl Clone for Handler where - F: Factory, + F: Factory, T: FromRequest, - >::Error: Into, - R: Future, + T::Error: Into, + R: Future + 'static, O: Responder, - >::Error: Into, + O::Error: Into, Err: ErrorRenderer, { fn clone(&self) -> Self { @@ -130,12 +134,12 @@ where #[pin_project] pub(super) struct HandlerWebResponse where - F: Factory, + F: Factory, T: FromRequest, - >::Error: Into, - R: Future, + T::Error: Into, + R: Future + 'static, O: Responder, - >::Error: Into, + O::Error: Into, Err: ErrorRenderer, { hnd: F, @@ -150,12 +154,12 @@ where impl Future for HandlerWebResponse where - F: Factory, + F: Factory, T: FromRequest, - >::Error: Into, - R: Future, + T::Error: Into, + R: Future + 'static, O: Responder, - >::Error: Into, + O::Error: Into, Err: ErrorRenderer, { type Output = Result; @@ -212,13 +216,15 @@ where /// FromRequest trait impl for tuples macro_rules! factory_tuple ({ $(($n:tt, $T:ident)),+} => { - impl Factory<($($T,)+), Res, O, Err> for Func + impl Factory<($($T,)+), Err> for Func where Func: Fn($($T,)+) -> Res + Clone + 'static, - Res: Future, - O: Responder, - // >::Error: Into, + Res: Future + 'static, + Res::Output: Responder, Err: ErrorRenderer, { + type Future = Res; + type Result = Res::Output; + fn call(&self, param: ($($T,)+)) -> Res { (self)($(param.$n,)+) } diff --git a/ntex/src/web/mod.rs b/ntex/src/web/mod.rs index 0fd6c2ca..0538364d 100644 --- a/ntex/src/web/mod.rs +++ b/ntex/src/web/mod.rs @@ -91,7 +91,11 @@ pub mod test; pub mod types; mod util; -pub use ntex_web_macros::*; +pub use ntex_macros::{ + web_connect as connect, web_delete as delete, web_get as get, web_head as head, + web_options as options, web_patch as patch, web_post as post, web_put as put, + web_trace as trace, +}; pub use crate::http::Response as HttpResponse; pub use crate::http::ResponseBuilder as HttpResponseBuilder; @@ -190,15 +194,14 @@ pub mod dev { #[doc(hidden)] #[inline(always)] - pub fn __assert_handler( + pub fn __assert_handler( f: Fun, - ) -> impl Factory<(), Fut, Res, Err> + ) -> impl Factory<(), Err, Future = Fut, Result = Fut::Output> where Err: super::ErrorRenderer, Fun: Fn() -> Fut + Clone + 'static, - Fut: std::future::Future, - Res: super::Responder, - // >::Error: Into, + Fut: std::future::Future + 'static, + Fut::Output: super::Responder, { f } @@ -206,17 +209,15 @@ pub mod dev { macro_rules! assert_handler ({ $name:ident, $($T:ident),+} => { #[doc(hidden)] #[inline(always)] - pub fn $name( + pub fn $name( f: Fun, - ) -> impl Factory<($($T,)+), Fut, Res, Err> + ) -> impl Factory<($($T,)+), Err, Future = Fut, Result = Fut::Output> where Err: $crate::web::ErrorRenderer, Fun: Fn($($T,)+) -> Fut + Clone + 'static, - Fut: std::future::Future, - Res: $crate::web::Responder, - // >::Error: Into, - $($T: $crate::web::FromRequest),+, - // $(<$T as $crate::web::FromRequest>::Error: Into),+ + Fut: std::future::Future + 'static, + Fut::Output: $crate::web::Responder, + $($T: $crate::web::FromRequest),+, { f } diff --git a/ntex/src/web/resource.rs b/ntex/src/web/resource.rs index 611b3119..aa584569 100644 --- a/ntex/src/web/resource.rs +++ b/ntex/src/web/resource.rs @@ -229,14 +229,12 @@ where /// # async fn index(req: HttpRequest) -> HttpResponse { unimplemented!() } /// App::new().service(web::resource("/").route(web::route().to(index))); /// ``` - pub fn to(mut self, handler: F) -> Self + pub fn to(mut self, handler: F) -> Self where - F: Factory, - I: FromRequest + 'static, - >::Error: Into, - R: Future + 'static, - U: Responder + 'static, - >::Error: Into, + F: Factory, + Args: FromRequest + 'static, + Args::Error: Into, + >::Error: Into, { self.routes.push(Route::new().to(handler)); self diff --git a/ntex/src/web/route.rs b/ntex/src/web/route.rs index 8e1c6715..569ef85a 100644 --- a/ntex/src/web/route.rs +++ b/ntex/src/web/route.rs @@ -1,4 +1,3 @@ -use std::future::Future; use std::rc::Rc; use std::task::{Context, Poll}; @@ -180,30 +179,18 @@ impl Route { /// ); /// } /// ``` - pub fn to(mut self, handler: F) -> Self + pub fn to(mut self, handler: F) -> Self where - F: Factory, - T: FromRequest + 'static, - >::Error: Into, - R: Future + 'static, - U: Responder + 'static, - >::Error: Into, + F: Factory, + Args: FromRequest + 'static, + Args::Error: Into, + >::Error: Into, { self.handler = Box::new(Handler::new(handler)); self } } -// fn call(&mut self, req: WebRequest) -> Self::Future { -// self.service -// .call(req) -// .map(|res| match res { -// Ok(res) => Ok(res), -// Err((e, _)) => Err(e), -// }) -// .boxed_local() -// } - #[cfg(test)] mod tests { use std::time::Duration; diff --git a/ntex/src/web/util.rs b/ntex/src/web/util.rs index 032c3984..201881aa 100644 --- a/ntex/src/web/util.rs +++ b/ntex/src/web/util.rs @@ -1,6 +1,5 @@ //! Essentials helper functions and types for application registration. use std::fmt; -use std::future::Future; use ntex_router::IntoPattern; @@ -222,15 +221,13 @@ pub fn method(method: Method) -> Route { /// web::resource("/").route(web::to(index)) /// ); /// ``` -pub fn to(handler: F) -> Route +pub fn to(handler: F) -> Route where - F: Factory, - I: FromRequest + 'static, - R: Future + 'static, - U: Responder + 'static, + F: Factory, + Args: FromRequest + 'static, Err: ErrorRenderer, - Err::Container: From<>::Error>, - Err::Container: From<>::Error>, + Err::Container: From, + Err::Container: From<>::Error>, { Route::new().to(handler) }