mirror of
https://github.com/rwf2/Rocket.git
synced 2025-01-02 15:52:41 +00:00
2893ce754d
Catchers can now be scoped to paths, with preference given to the
longest-prefix, then the status code. This a breaking change for all
applications that register catchers:
* `Rocket::register()` takes a base path to scope catchers under.
- The previous behavior is recovered with `::register("/", ...)`.
* Catchers now fallibly, instead of silently, collide.
* `ErrorKind::Collision` is now `ErrorKind::Collisions`.
Related changes:
* `Origin` implements `TryFrom<String>`, `TryFrom<&str>`.
* All URI variants implement `TryFrom<Uri>`.
* Added `Segments::prefix_of()`.
* `Rocket::mount()` takes a `TryInto<Origin<'_>>` instead of `&str`
for the base mount point.
* Extended `errors` example with scoped catchers.
* Added scoped sections to catchers guide.
Internal changes:
* Moved router code to `router/router.rs`.
44 lines
1.2 KiB
Rust
44 lines
1.2 KiB
Rust
#[macro_use] extern crate rocket;
|
|
|
|
use rocket::local::blocking::Client;
|
|
|
|
// Test that raw idents can be used for route parameter names
|
|
|
|
#[get("/<enum>?<type>")]
|
|
fn get(r#enum: String, r#type: i32) -> String {
|
|
format!("{} is {}", r#enum, r#type)
|
|
}
|
|
|
|
#[get("/swap/<raw>/<bare>")]
|
|
fn swap(r#raw: String, bare: String) -> String {
|
|
format!("{}, {}", raw, bare)
|
|
}
|
|
|
|
#[catch(400)]
|
|
fn catch(r#raw: &rocket::Request) -> String {
|
|
format!("{}", raw.method())
|
|
}
|
|
|
|
#[test]
|
|
fn test_raw_ident() {
|
|
let rocket = rocket::ignite()
|
|
.mount("/", routes![get, swap])
|
|
.register("/", catchers![catch]);
|
|
|
|
let client = Client::debug(rocket).unwrap();
|
|
|
|
let response = client.get("/example?type=1").dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "example is 1");
|
|
|
|
let uri_named = uri!(get: r#enum = "test_named", r#type = 1);
|
|
assert_eq!(uri_named.to_string(), "/test_named?type=1");
|
|
|
|
let uri_unnamed = uri!(get: "test_unnamed", 2);
|
|
assert_eq!(uri_unnamed.to_string(), "/test_unnamed?type=2");
|
|
|
|
let uri_raws = uri!(swap: r#raw = "1", r#bare = "2");
|
|
assert_eq!(uri_raws.to_string(), "/swap/1/2");
|
|
let uri_bare = uri!(swap: raw = "1", bare = "2");
|
|
assert_eq!(uri_bare.to_string(), "/swap/1/2");
|
|
}
|