rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
Rocket/lib/src/catcher.rs

115 lines
3.1 KiB
Rust
Raw Normal View History

Major overhual: Request, ErrorHandler, ContentType.
2016-08-26 08:55:11 +00:00
use handler::ErrorHandler;
Progress on errors. Started Todo example. The error function now takes in a "RoutingError" structure. The idea is that the structure includes all of the information necessary for a user to processor the error as they wish. This interface is very incomplete and may change. At a minimum, the error structure should include: 1) The request that failed. 2) Why the request failed. 3) The chain of attempted route matches, if any. 4) Something else?
2016-07-16 04:09:08 +00:00
use response::Response;
Progress on error handling. Calling them 'catchers' for now. Added `error` decorator and `errors` macro. The current idea is that you can have "catchers" for all valid errors code (in range [400, 500). At the moment, catchers are just request handlers, and the decorator expected an empty function signature for the error handler. Obviously, this is pretty useless. Not sure on what the API should be here. But, progress. Oh, one more thing: who should handle forwarding a request to a catcher? Probably not the router. So, the main Rocket should?
2016-04-06 10:26:43 +00:00
use codegen::StaticCatchInfo;
Major overhual: Request, ErrorHandler, ContentType.
2016-08-26 08:55:11 +00:00
use error::Error;
use request::Request;
Progress on error handling. Calling them 'catchers' for now. Added `error` decorator and `errors` macro. The current idea is that you can have "catchers" for all valid errors code (in range [400, 500). At the moment, catchers are just request handlers, and the decorator expected an empty function signature for the error handler. Obviously, this is pretty useless. Not sure on what the API should be here. But, progress. Oh, one more thing: who should handle forwarding a request to a catcher? Probably not the router. So, the main Rocket should?
2016-04-06 10:26:43 +00:00
use std::fmt;
use term_painter::ToStyle;
use term_painter::Color::*;
pub struct Catcher {
pub code: u16,
Major overhual: Request, ErrorHandler, ContentType.
2016-08-26 08:55:11 +00:00
handler: ErrorHandler,
Improve default catcher error messages.
2016-09-09 08:00:51 +00:00
is_default: bool,
Progress on error handling. Calling them 'catchers' for now. Added `error` decorator and `errors` macro. The current idea is that you can have "catchers" for all valid errors code (in range [400, 500). At the moment, catchers are just request handlers, and the decorator expected an empty function signature for the error handler. Obviously, this is pretty useless. Not sure on what the API should be here. But, progress. Oh, one more thing: who should handle forwarding a request to a catcher? Probably not the router. So, the main Rocket should?
2016-04-06 10:26:43 +00:00
}
Progress on errors. Started Todo example. The error function now takes in a "RoutingError" structure. The idea is that the structure includes all of the information necessary for a user to processor the error as they wish. This interface is very incomplete and may change. At a minimum, the error structure should include: 1) The request that failed. 2) Why the request failed. 3) The chain of attempted route matches, if any. 4) Something else?
2016-07-16 04:09:08 +00:00
// TODO: Should `Catcher` be an interface? Should there be an `ErrorHandler`
// that takes in a `RoutingError` and returns a `Response`? What's the right
// interface here?
Progress on error handling. Calling them 'catchers' for now. Added `error` decorator and `errors` macro. The current idea is that you can have "catchers" for all valid errors code (in range [400, 500). At the moment, catchers are just request handlers, and the decorator expected an empty function signature for the error handler. Obviously, this is pretty useless. Not sure on what the API should be here. But, progress. Oh, one more thing: who should handle forwarding a request to a catcher? Probably not the router. So, the main Rocket should?
2016-04-06 10:26:43 +00:00
impl Catcher {
Major overhual: Request, ErrorHandler, ContentType.
2016-08-26 08:55:11 +00:00
pub fn new(code: u16, handler: ErrorHandler) -> Catcher {
Working error handling! Not quite there yet though. A few important things needs to get this to be 'right': 1a. Have a way to return a response with a status code. 1b. Use that mechanism in the default catchers. 2. Automatically fill in that code from the #[error] handler. 3. Have a way for a responder to say if responding succeeded. 4. Try next highest ranking route if responding with one handler fails.
2016-04-06 20:50:02 +00:00
Catcher::new_with_default(code, handler, false)
}
Allow different lifetimes in handler Request reference and its contents.
2016-10-07 03:38:13 +00:00
pub fn handle<'b, 'r>(&self, err: Error, request: &'b Request<'r>) -> Response<'b> {
Improve default catcher error messages.
2016-09-09 08:00:51 +00:00
(self.handler)(err, request)
Progress on errors. Started Todo example. The error function now takes in a "RoutingError" structure. The idea is that the structure includes all of the information necessary for a user to processor the error as they wish. This interface is very incomplete and may change. At a minimum, the error structure should include: 1) The request that failed. 2) Why the request failed. 3) The chain of attempted route matches, if any. 4) Something else?
2016-07-16 04:09:08 +00:00
}
Major overhual: Request, ErrorHandler, ContentType.
2016-08-26 08:55:11 +00:00
fn new_with_default(code: u16, handler: ErrorHandler, default: bool) -> Catcher {
Progress on error handling. Calling them 'catchers' for now. Added `error` decorator and `errors` macro. The current idea is that you can have "catchers" for all valid errors code (in range [400, 500). At the moment, catchers are just request handlers, and the decorator expected an empty function signature for the error handler. Obviously, this is pretty useless. Not sure on what the API should be here. But, progress. Oh, one more thing: who should handle forwarding a request to a catcher? Probably not the router. So, the main Rocket should?
2016-04-06 10:26:43 +00:00
Catcher {
code: code,
handler: handler,
Improve default catcher error messages.
2016-09-09 08:00:51 +00:00
is_default: default,
Progress on error handling. Calling them 'catchers' for now. Added `error` decorator and `errors` macro. The current idea is that you can have "catchers" for all valid errors code (in range [400, 500). At the moment, catchers are just request handlers, and the decorator expected an empty function signature for the error handler. Obviously, this is pretty useless. Not sure on what the API should be here. But, progress. Oh, one more thing: who should handle forwarding a request to a catcher? Probably not the router. So, the main Rocket should?
2016-04-06 10:26:43 +00:00
}
}
Working error handling! Not quite there yet though. A few important things needs to get this to be 'right': 1a. Have a way to return a response with a status code. 1b. Use that mechanism in the default catchers. 2. Automatically fill in that code from the #[error] handler. 3. Have a way for a responder to say if responding succeeded. 4. Try next highest ranking route if responding with one handler fails.
2016-04-06 20:50:02 +00:00
pub fn is_default(&self) -> bool {
self.is_default
}
Progress on error handling. Calling them 'catchers' for now. Added `error` decorator and `errors` macro. The current idea is that you can have "catchers" for all valid errors code (in range [400, 500). At the moment, catchers are just request handlers, and the decorator expected an empty function signature for the error handler. Obviously, this is pretty useless. Not sure on what the API should be here. But, progress. Oh, one more thing: who should handle forwarding a request to a catcher? Probably not the router. So, the main Rocket should?
2016-04-06 10:26:43 +00:00
}
impl<'a> From<&'a StaticCatchInfo> for Catcher {
fn from(info: &'a StaticCatchInfo) -> Catcher {
Catcher::new(info.code, info.handler)
}
}
impl fmt::Display for Catcher {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
Working error handling! Not quite there yet though. A few important things needs to get this to be 'right': 1a. Have a way to return a response with a status code. 1b. Use that mechanism in the default catchers. 2. Automatically fill in that code from the #[error] handler. 3. Have a way for a responder to say if responding succeeded. 4. Try next highest ranking route if responding with one handler fails.
2016-04-06 20:50:02 +00:00
write!(f, "{}", Blue.paint(&self.code))
Progress on error handling. Calling them 'catchers' for now. Added `error` decorator and `errors` macro. The current idea is that you can have "catchers" for all valid errors code (in range [400, 500). At the moment, catchers are just request handlers, and the decorator expected an empty function signature for the error handler. Obviously, this is pretty useless. Not sure on what the API should be here. But, progress. Oh, one more thing: who should handle forwarding a request to a catcher? Probably not the router. So, the main Rocket should?
2016-04-06 10:26:43 +00:00
}
}
Working error handling! Not quite there yet though. A few important things needs to get this to be 'right': 1a. Have a way to return a response with a status code. 1b. Use that mechanism in the default catchers. 2. Automatically fill in that code from the #[error] handler. 3. Have a way for a responder to say if responding succeeded. 4. Try next highest ranking route if responding with one handler fails.
2016-04-06 20:50:02 +00:00
pub mod defaults {
Namespace HTTP-related type under `http`.
2016-10-04 00:09:13 +00:00
use super::Catcher;
use std::collections::HashMap;
Working error handling! Not quite there yet though. A few important things needs to get this to be 'right': 1a. Have a way to return a response with a status code. 1b. Use that mechanism in the default catchers. 2. Automatically fill in that code from the #[error] handler. 3. Have a way for a responder to say if responding succeeded. 4. Try next highest ranking route if responding with one handler fails.
2016-04-06 20:50:02 +00:00
use request::Request;
Namespace HTTP-related type under `http`.
2016-10-04 00:09:13 +00:00
use response::Response;
Rename data_type to data and don't export inner types.
2016-09-21 03:02:33 +00:00
use response::data;
Major overhual: Request, ErrorHandler, ContentType.
2016-08-26 08:55:11 +00:00
use error::Error;
Namespace HTTP-related type under `http`.
2016-10-04 00:09:13 +00:00
use http::hyper::StatusCode;
Working error handling! Not quite there yet though. A few important things needs to get this to be 'right': 1a. Have a way to return a response with a status code. 1b. Use that mechanism in the default catchers. 2. Automatically fill in that code from the #[error] handler. 3. Have a way for a responder to say if responding succeeded. 4. Try next highest ranking route if responding with one handler fails.
2016-04-06 20:50:02 +00:00
Allow different lifetimes in handler Request reference and its contents.
2016-10-07 03:38:13 +00:00
pub fn not_found<'r>(_error: Error, _request: &'r Request) -> Response<'r> {
Rename data_type to data and don't export inner types.
2016-09-21 03:02:33 +00:00
Response::with_status(StatusCode::NotFound, data::HTML(r#"
Improve default catcher error messages.
2016-09-09 08:00:51 +00:00
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>404: Not Found</title>
</head>
<body>
<div align="center">
<h1>404: Not Found</h1>
<p>The page you were looking for could not be found.<p>
<hr />
<small>Rocket</small>
</div>
</body>
</html>
"#))
Working error handling! Not quite there yet though. A few important things needs to get this to be 'right': 1a. Have a way to return a response with a status code. 1b. Use that mechanism in the default catchers. 2. Automatically fill in that code from the #[error] handler. 3. Have a way for a responder to say if responding succeeded. 4. Try next highest ranking route if responding with one handler fails.
2016-04-06 20:50:02 +00:00
}
Improve default catcher error messages.
2016-09-09 08:00:51 +00:00
pub fn internal_error<'r>(_error: Error,
Allow different lifetimes in handler Request reference and its contents.
2016-10-07 03:38:13 +00:00
_request: &'r Request)
Improve default catcher error messages.
2016-09-09 08:00:51 +00:00
-> Response<'r> {
Rename data_type to data and don't export inner types.
2016-09-21 03:02:33 +00:00
Response::with_status(StatusCode::InternalServerError, data::HTML(r#"
Improve default catcher error messages.
2016-09-09 08:00:51 +00:00
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>500: Internal Server Error</title>
</head>
<body align="center">
<div align="center">
<h1>500: Internal Server Error</h1>
<p>The server encountered a problem processing your request.<p>
<hr />
<small>Rocket</small>
</div>
</body>
</html>
"#))
Working error handling! Not quite there yet though. A few important things needs to get this to be 'right': 1a. Have a way to return a response with a status code. 1b. Use that mechanism in the default catchers. 2. Automatically fill in that code from the #[error] handler. 3. Have a way for a responder to say if responding succeeded. 4. Try next highest ranking route if responding with one handler fails.
2016-04-06 20:50:02 +00:00
}
Progress on errors. Started Todo example. The error function now takes in a "RoutingError" structure. The idea is that the structure includes all of the information necessary for a user to processor the error as they wish. This interface is very incomplete and may change. At a minimum, the error structure should include: 1) The request that failed. 2) Why the request failed. 3) The chain of attempted route matches, if any. 4) Something else?
2016-07-16 04:09:08 +00:00
pub fn get() -> HashMap<u16, Catcher> {
Improve default catcher error messages.
2016-09-09 08:00:51 +00:00
let mut map = HashMap::new();
map.insert(404, Catcher::new_with_default(404, not_found, true));
map.insert(500, Catcher::new_with_default(500, internal_error, true));
map
Progress on errors. Started Todo example. The error function now takes in a "RoutingError" structure. The idea is that the structure includes all of the information necessary for a user to processor the error as they wish. This interface is very incomplete and may change. At a minimum, the error structure should include: 1) The request that failed. 2) Why the request failed. 3) The chain of attempted route matches, if any. 4) Something else?
2016-07-16 04:09:08 +00:00
}
}