1
0
mirror of https://github.com/fafhrd91/actix-web synced 2025-08-28 15:57:47 +02:00

add resource level middlewares support

This commit is contained in:
Nikolay Kim
2018-01-09 20:00:18 -08:00
parent 6c7dda495b
commit e8412672a2
7 changed files with 401 additions and 39 deletions

View File

@@ -1,3 +1,4 @@
use std::rc::Rc;
use std::marker::PhantomData;
use http::{Method, StatusCode};
@@ -6,6 +7,7 @@ use pred;
use body::Body;
use route::Route;
use handler::{Reply, Handler, Responder};
use middleware::Middleware;
use httprequest::HttpRequest;
use httpresponse::HttpResponse;
@@ -33,6 +35,7 @@ pub struct Resource<S=()> {
name: String,
state: PhantomData<S>,
routes: Vec<Route<S>>,
middlewares: Rc<Vec<Box<Middleware<S>>>>,
}
impl<S> Default for Resource<S> {
@@ -40,7 +43,8 @@ impl<S> Default for Resource<S> {
Resource {
name: String::new(),
state: PhantomData,
routes: Vec::new() }
routes: Vec::new(),
middlewares: Rc::new(Vec::new()) }
}
}
@@ -50,7 +54,8 @@ impl<S> Resource<S> {
Resource {
name: String::new(),
state: PhantomData,
routes: Vec::new() }
routes: Vec::new(),
middlewares: Rc::new(Vec::new()) }
}
/// Set resource name
@@ -126,12 +131,25 @@ impl<S: 'static> Resource<S> {
self.routes.last_mut().unwrap().f(handler)
}
pub(crate) fn handle(&mut self, mut req: HttpRequest<S>, default: Option<&mut Resource<S>>)
-> Reply
/// Register a middleware
///
/// This is similar to `Application's` middlewares, but
/// middlewares get invoked on resource level.
pub fn middleware<M: Middleware<S>>(&mut self, mw: M) {
Rc::get_mut(&mut self.middlewares).unwrap().push(Box::new(mw));
}
pub(crate) fn handle(&mut self,
mut req: HttpRequest<S>,
default: Option<&mut Resource<S>>) -> Reply
{
for route in &mut self.routes {
if route.check(&mut req) {
return route.handle(req)
return if self.middlewares.is_empty() {
route.handle(req)
} else {
route.compose(req, Rc::clone(&self.middlewares))
};
}
}
if let Some(resource) = default {