From aef8b800a21172af62a322666cc214b41871e14b Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Tue, 16 Mar 2021 11:40:46 +0600 Subject: [PATCH] use patterns for scopes prefix definitions --- ntex-router/src/lib.rs | 2 +- ntex/CHANGES.md | 4 ++ ntex/Cargo.toml | 8 +-- ntex/src/web/scope.rs | 115 ++++++++++++++++++++++++++++++++++------- ntex/src/web/util.rs | 2 +- 5 files changed, 105 insertions(+), 26 deletions(-) diff --git a/ntex-router/src/lib.rs b/ntex-router/src/lib.rs index b8786d1a..04909052 100644 --- a/ntex-router/src/lib.rs +++ b/ntex-router/src/lib.rs @@ -1,5 +1,5 @@ #![deny(rust_2018_idioms, unreachable_pub)] -#![allow(clippy::cognitive_complexity)] +#![warn(nonstandard_style, future_incompatible)] //! Resource path matching library. mod de; diff --git a/ntex/CHANGES.md b/ntex/CHANGES.md index 087382bd..c82e51f8 100644 --- a/ntex/CHANGES.md +++ b/ntex/CHANGES.md @@ -1,5 +1,9 @@ # Changes +## [0.3.11] - 2021-03-16 + +* web: use patterns for scope's prefix definitions + ## [0.3.10] - 2021-03-15 * add buffer_params() api diff --git a/ntex/Cargo.toml b/ntex/Cargo.toml index 27d252b6..11588fef 100644 --- a/ntex/Cargo.toml +++ b/ntex/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex" -version = "0.3.10" +version = "0.3.11" authors = ["ntex contributors "] description = "Framework for composable network services" readme = "README.md" @@ -38,7 +38,7 @@ cookie = ["coo-kie", "coo-kie/percent-encode"] [dependencies] ntex-codec = "0.4.0" ntex-rt = "0.2.1" -ntex-router = "0.4.1" +ntex-router = "0.4.2" ntex-service = "0.1.5" ntex-macros = "0.1.3" @@ -56,12 +56,12 @@ http = "0.2.1" httparse = "1.3" log = "0.4" mime = "0.3" -mio = "0.7.9" +mio = "0.7.10" num_cpus = "1.13" percent-encoding = "2.1" pin-project-lite = "0.2" rand = "0.8" -regex = "1.3" +regex = "1.4" sha-1 = "0.9" slab = "0.4" serde = { version = "1.0", features=["derive"] } diff --git a/ntex/src/web/scope.rs b/ntex/src/web/scope.rs index 5fd712e7..e1a3e032 100644 --- a/ntex/src/web/scope.rs +++ b/ntex/src/web/scope.rs @@ -3,7 +3,7 @@ use std::{cell::RefCell, fmt, rc::Rc, task::Context, task::Poll}; use futures::future::{ok, Either, Future, FutureExt, LocalBoxFuture, Ready}; use crate::http::Response; -use crate::router::{ResourceDef, ResourceInfo, Router}; +use crate::router::{IntoPattern, ResourceDef, ResourceInfo, Router}; use crate::service::boxed::{self, BoxService, BoxServiceFactory}; use crate::service::{ apply, apply_fn_factory, IntoServiceFactory, Service, ServiceFactory, Transform, @@ -61,7 +61,7 @@ type BoxedResponse = /// pub struct Scope> { endpoint: T, - rdef: String, + rdef: Vec, data: Option, services: Vec>>, guards: Vec>, @@ -72,11 +72,11 @@ pub struct Scope> { impl Scope { /// Create a new scope - pub fn new(path: &str) -> Scope { + pub fn new(path: T) -> Scope { let fref = Rc::new(RefCell::new(None)); Scope { endpoint: ScopeEndpoint::new(fref.clone()), - rdef: path.to_string(), + rdef: path.patterns(), data: None, guards: Vec::new(), services: Vec::new(), @@ -430,8 +430,8 @@ where .into_iter() .for_each(|mut srv| srv.register(&mut cfg)); - let slesh = self.rdef.ends_with('/'); - let mut rmap = ResourceMap::new(ResourceDef::root_prefix(&self.rdef)); + let slesh = self.rdef.iter().find(|s| s.ends_with('/')).is_some(); + let mut rmap = ResourceMap::new(ResourceDef::root_prefix(self.rdef.clone())); // external resources for mut rdef in std::mem::take(&mut self.external) { @@ -475,7 +475,7 @@ where // register final service config.register_service( - ResourceDef::root_prefix(&self.rdef), + ResourceDef::root_prefix(self.rdef), guards, self.endpoint, Some(Rc::new(rmap)), @@ -657,6 +657,32 @@ mod tests { assert_eq!(resp.status(), StatusCode::CREATED); } + #[crate::rt_test] + async fn test_scope_root_multi() { + let srv = init_service( + App::new().service( + web::scope(["/app", "/app2"]) + .service(web::resource("").to(|| async { HttpResponse::Ok() })) + .service( + web::resource("/").to(|| async { HttpResponse::Created() }), + ), + ), + ) + .await; + + for url in &["/app", "/app2"] { + let req = TestRequest::with_uri(url).to_request(); + let resp = srv.call(req).await.unwrap(); + assert_eq!(resp.status(), StatusCode::OK); + } + + for url in &["/app/", "/app2/"] { + let req = TestRequest::with_uri(url).to_request(); + let resp = srv.call(req).await.unwrap(); + assert_eq!(resp.status(), StatusCode::CREATED); + } + } + #[crate::rt_test] async fn test_scope_root2() { let srv = init_service( @@ -676,6 +702,29 @@ mod tests { assert_eq!(resp.status(), StatusCode::OK); } + #[crate::rt_test] + async fn test_scope_root2_multi() { + let srv = init_service( + App::new().service( + web::scope(["/app/", "/app2/"]) + .service(web::resource("").to(|| async { HttpResponse::Ok() })), + ), + ) + .await; + + for url in &["/app", "/app2"] { + let req = TestRequest::with_uri(url).to_request(); + let resp = srv.call(req).await.unwrap(); + assert_eq!(resp.status(), StatusCode::NOT_FOUND); + } + + for url in &["/app/", "/app2/"] { + let req = TestRequest::with_uri(url).to_request(); + let resp = srv.call(req).await.unwrap(); + assert_eq!(resp.status(), StatusCode::OK); + } + } + #[crate::rt_test] async fn test_scope_root3() { let srv = init_service( @@ -706,21 +755,47 @@ mod tests { ) .await; - let req = TestRequest::with_uri("/app/path1").to_request(); - let resp = srv.call(req).await.unwrap(); - assert_eq!(resp.status(), StatusCode::OK); + for (m, status) in &[ + (Method::GET, StatusCode::OK), + (Method::DELETE, StatusCode::OK), + (Method::POST, StatusCode::NOT_FOUND), + ] { + let req = TestRequest::with_uri("/app/path1") + .method(m.clone()) + .to_request(); + let resp = srv.call(req).await.unwrap(); + assert_eq!(resp.status(), status.clone()); + } + } - let req = TestRequest::with_uri("/app/path1") - .method(Method::DELETE) - .to_request(); - let resp = srv.call(req).await.unwrap(); - assert_eq!(resp.status(), StatusCode::OK); + #[crate::rt_test] + async fn test_scope_route_multi() { + let srv = init_service( + App::new().service( + web::scope(["app", "app2"]) + .route("/path1", web::get().to(|| async { HttpResponse::Ok() })) + .route("/path1", web::delete().to(|| async { HttpResponse::Ok() })), + ), + ) + .await; - let req = TestRequest::with_uri("/app/path1") - .method(Method::POST) - .to_request(); - let resp = srv.call(req).await.unwrap(); - assert_eq!(resp.status(), StatusCode::NOT_FOUND); + for (m, status) in &[ + (Method::GET, StatusCode::OK), + (Method::DELETE, StatusCode::OK), + (Method::POST, StatusCode::NOT_FOUND), + ] { + let req = TestRequest::with_uri("/app/path1") + .method(m.clone()) + .to_request(); + let resp = srv.call(req).await.unwrap(); + assert_eq!(resp.status(), status.clone()); + + let req = TestRequest::with_uri("/app2/path1") + .method(m.clone()) + .to_request(); + let resp = srv.call(req).await.unwrap(); + assert_eq!(resp.status(), status.clone()); + } } #[crate::rt_test] diff --git a/ntex/src/web/util.rs b/ntex/src/web/util.rs index 6fc7ed79..50705e99 100644 --- a/ntex/src/web/util.rs +++ b/ntex/src/web/util.rs @@ -75,7 +75,7 @@ pub fn resource(path: T) -> Resource { /// * /{project_id}/path2 /// * /{project_id}/path3 /// -pub fn scope(path: &str) -> Scope { +pub fn scope(path: T) -> Scope { Scope::new(path) }