diff --git a/src/scope.rs b/src/scope.rs index 29d51518..f1d27159 100644 --- a/src/scope.rs +++ b/src/scope.rs @@ -42,6 +42,7 @@ type ScopeResources = Rc>>)>> /// * /app/path3 - `HEAD` requests /// pub struct Scope { + handler: Option>>>, middlewares: Rc>>>, default: Rc>>, resources: ScopeResources, @@ -56,12 +57,54 @@ impl Default for Scope { impl Scope { pub fn new() -> Scope { Scope { + handler: None, resources: Rc::new(Vec::new()), middlewares: Rc::new(Vec::new()), default: Rc::new(UnsafeCell::new(ResourceHandler::default_not_found())), } } + /// Create scope with new state. + /// + /// ```rust + /// # extern crate actix_web; + /// use actix_web::{http, App, HttpRequest, HttpResponse, Path}; + /// + /// struct AppState; + /// + /// fn index(req: HttpRequest) -> &'static str { + /// "Welcome!" + /// } + /// + /// fn main() { + /// let app = App::new() + /// .scope("/app", |scope| { + /// scope.with_state(AppState, |scope| { + /// scope.resource("/test1", |r| r.f(index)) + /// }) + /// }); + /// } + /// ``` + pub fn with_state(mut self, state: T, f: F) -> Scope + where + F: FnOnce(Scope) -> Scope, + { + let scope = Scope { + handler: None, + resources: Rc::new(Vec::new()), + middlewares: Rc::new(Vec::new()), + default: Rc::new(UnsafeCell::new(ResourceHandler::default_not_found())), + }; + let scope = f(scope); + + self.handler = Some(UnsafeCell::new(Box::new(Wrapper { + scope, + state: Rc::new(state), + }))); + + self + } + /// Configure route for a specific path. /// /// This is a simplified version of the `Scope::resource()` method. @@ -184,6 +227,7 @@ impl RouteHandler for Scope { let path = unsafe { &*(&req.match_info()["tail"] as *const _) }; let path = if path == "" { "/" } else { path }; + // recognize paths for &(ref pattern, ref resource) in self.resources.iter() { if pattern.match_with_params(path, req.match_info_mut()) { let default = unsafe { &mut *self.default.as_ref().get() }; @@ -202,20 +246,39 @@ impl RouteHandler for Scope { } } - let default = unsafe { &mut *self.default.as_ref().get() }; - if self.middlewares.is_empty() { - default.handle(req, None) + // nested scope + if let Some(ref handler) = self.handler { + let hnd: &mut RouteHandler<_> = unsafe { (&mut *(handler.get())).as_mut() }; + hnd.handle(req) } else { - Reply::async(Compose::new( - req, - Rc::clone(&self.middlewares), - Rc::clone(&self.default), - None, - )) + // default handler + let default = unsafe { &mut *self.default.as_ref().get() }; + if self.middlewares.is_empty() { + default.handle(req, None) + } else { + Reply::async(Compose::new( + req, + Rc::clone(&self.middlewares), + Rc::clone(&self.default), + None, + )) + } } } } +struct Wrapper { + state: Rc, + scope: Scope, +} + +impl RouteHandler for Wrapper { + fn handle(&mut self, req: HttpRequest) -> Reply { + self.scope + .handle(req.change_state(Rc::clone(&self.state))) + } +} + /// Compose resource level middlewares with route handler. struct Compose { info: ComposeInfo, @@ -574,6 +637,26 @@ mod tests { assert_eq!(resp.as_response().unwrap().status(), StatusCode::OK); } + #[test] + fn test_scope_with_state() { + struct State; + + let mut app = App::new() + .scope("/app", |scope| { + scope.with_state(State, |scope| { + scope.resource("/path1", |r| r.f(|_| HttpResponse::Created())) + }) + }) + .finish(); + + let req = TestRequest::with_uri("/app/path1").finish(); + let resp = app.run(req); + assert_eq!( + resp.as_response().unwrap().status(), + StatusCode::CREATED + ); + } + #[test] fn test_default_resource() { let mut app = App::new()