mirror of
https://github.com/rwf2/Rocket.git
synced 2024-12-28 13:22:38 +00:00
63a14525d8
So. Many. Changes. This is an insane commit: simultaneously one of the best (because of all the wonderful improvements!) and one of the worst (because it is just massive) in the project's history. Routing: * All UTF-8 characters are accepted everywhere in route paths. (#998) * `path` is now `uri` in `route` attribute: `#[route(GET, path = "..")]` becomes `#[route(GET, uri = "..")]`. Forms Revamp * All form related types now reside in a new `form` module. * Multipart forms are supported. (resolves #106) * Collections are supported in forms and queries. (resolves #205) * Nested structures in forms and queries are supported. (resolves #313) * Form fields can be ad-hoc validated with `#[field(validate = expr)]`. * `FromFormValue` is now `FromFormField`, blanket implements `FromForm`. * Form field values are always percent-decoded apriori. Temporary Files * A new `TempFile` data and form guard allows streaming data directly to a file which can then be persisted. * A new `temp_dir` config parameter specifies where to store `TempFile`. * The limits `file` and `file/$ext`, where `$ext` is the file extension, determines the data limit for a `TempFile`. Capped * A new `Capped` type is used to indicate when data has been truncated due to incoming data limits. It allows checking whether data is complete or truncated. * `DataStream` methods return `Capped` types. * `DataStream` API has been revamped to account for `Capped` types. * Several `Capped<T>` types implement `FromData`, `FromForm`. * HTTP 413 (Payload Too Large) errors are now returned when data limits are exceeded. (resolves #972) Hierarchical Limits * Data limits are now hierarchical, delimited with `/`. A limit of `a/b/c` falls back to `a/b` then `a`. Core * `&RawStr` no longer implements `FromParam`. * `&str` implements `FromParam`, `FromData`, `FromForm`. * `FromTransformedData` was removed. * `FromData` gained a lifetime for use with request-local data. * The default error HTML is more compact. * `&Config` is a request guard. * The `DataStream` interface was entirely revamped. * `State` is only exported via `rocket::State`. * A `request::local_cache!()` macro was added for storing values in request-local cache without consideration for type uniqueness by using a locally generated anonymous type. * `Request::get_param()` is now `Request::param()`. * `Request::get_segments()` is now `Request::segments()`, takes a range. * `Request::get_query_value()` is now `Request::query_value()`, can parse any `FromForm` including sequences. * `std::io::Error` implements `Responder` like `Debug<std::io::Error>`. * `(Status, R)` where `R: Responder` implements `Responder` by overriding the `Status` of `R`. * The name of a route is printed first during route matching. * `FlashMessage` now only has one lifetime generic. HTTP * `RawStr` implements `serde::{Serialize, Deserialize}`. * `RawStr` implements _many_ more methods, in particular, those related to the `Pattern` API. * `RawStr::from_str()` is now `RawStr::new()`. * `RawStr::url_decode()` and `RawStr::url_decode_lossy()` only allocate as necessary, return `Cow`. * `Status` implements `Default` with `Status::Ok`. * `Status` implements `PartialEq`, `Eq`, `Hash`, `PartialOrd`, `Ord`. * Authority and origin part of `Absolute` can be modified with new `Absolute::{with,set}_authority()`, `Absolute::{with,set}_origin()` methods. * `Origin::segments()` was removed in favor of methods split into query and path parts and into raw and decoded versions. * The `Segments` iterator is smarter, returns decoded `&str` items. * `Segments::into_path_buf()` is now `Segments::to_path_buf()`. * A new `QuerySegments` is the analogous query segment iterator. * Once set, `expires` on private cookies is not overwritten. (resolves #1506) * `Origin::path()` and `Origin::query()` return `&RawStr`, not `&str`. Codegen * Preserve more spans in `uri!` macro. * Preserve spans `FromForm` field types. * All dynamic parameters in a query string must typecheck as `FromForm`. * `FromFormValue` derive removed; `FromFormField` added. * The `form` `FromForm` and `FromFormField` field attribute is now named `field`. `#[form(field = ..)]` is now `#[field(name = ..)]`. Contrib * `Json` implements `FromForm`. * `MsgPack` implements `FromForm`. * The `json!` macro is exported as `rocket_contrib::json::json!`. * Added clarifying docs to `StaticFiles`. Examples * `form_validation` and `form_kitchen_sink` removed in favor of `forms`. * The `hello_world` example uses unicode in paths. * The `json` example only allocates as necessary. Internal * Codegen uses new `exports` module with the following conventions: - Locals starts with `__` and are lowercased. - Rocket modules start with `_` and are lowercased. - `std` types start with `_` and are titlecased. - Rocket types are titlecased. * A `header` module was added to `http`, contains header types. * `SAFETY` is used as doc-string keyword for `unsafe` related comments. * The `Uri` parser no longer recognizes Rocket route URIs.
118 lines
3.9 KiB
Rust
118 lines
3.9 KiB
Rust
#[macro_use] extern crate rocket;
|
|
|
|
use rocket::local::blocking::Client;
|
|
use rocket::http::{ContentType, MediaType, Accept, Status};
|
|
|
|
// Test that known formats work as expected, including not colliding.
|
|
|
|
#[post("/", format = "json")]
|
|
fn json() -> &'static str { "json" }
|
|
|
|
#[post("/", format = "xml")]
|
|
fn xml() -> &'static str { "xml" }
|
|
|
|
// Unreachable. Written for codegen.
|
|
#[post("/", format = "application/json", rank = 2)]
|
|
fn json_long() -> &'static str { "json_long" }
|
|
|
|
#[post("/", format = "application/msgpack")]
|
|
fn msgpack_long() -> &'static str { "msgpack_long" }
|
|
|
|
// Unreachable. Written for codegen.
|
|
#[post("/", format = "msgpack", rank = 2)]
|
|
fn msgpack() -> &'static str { "msgpack" }
|
|
|
|
#[get("/", format = "plain")]
|
|
fn plain() -> &'static str { "plain" }
|
|
|
|
#[get("/", format = "binary", rank = 2)]
|
|
fn binary() -> &'static str { "binary" }
|
|
|
|
#[get("/", rank = 3)]
|
|
fn other() -> &'static str { "other" }
|
|
|
|
#[test]
|
|
fn test_formats() {
|
|
let rocket = rocket::ignite()
|
|
.mount("/", routes![json, xml, json_long, msgpack_long, msgpack,
|
|
plain, binary, other]);
|
|
|
|
let client = Client::tracked(rocket).unwrap();
|
|
|
|
let response = client.post("/").header(ContentType::JSON).dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "json");
|
|
|
|
let response = client.post("/").header(ContentType::MsgPack).dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "msgpack_long");
|
|
|
|
let response = client.post("/").header(ContentType::XML).dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "xml");
|
|
|
|
let response = client.get("/").header(Accept::Plain).dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "plain");
|
|
|
|
let response = client.get("/").header(Accept::Binary).dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "binary");
|
|
|
|
let response = client.get("/").header(ContentType::JSON).dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "plain");
|
|
|
|
let response = client.get("/").dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "plain");
|
|
|
|
let response = client.put("/").header(ContentType::HTML).dispatch();
|
|
assert_eq!(response.status(), Status::NotFound);
|
|
}
|
|
|
|
// Test custom formats.
|
|
|
|
// TODO: #[rocket(allow(unknown_format))]
|
|
#[get("/", format = "application/foo")]
|
|
fn get_foo() -> &'static str { "get_foo" }
|
|
|
|
// TODO: #[rocket(allow(unknown_format))]
|
|
#[post("/", format = "application/foo")]
|
|
fn post_foo() -> &'static str { "post_foo" }
|
|
|
|
// TODO: #[rocket(allow(unknown_format))]
|
|
#[get("/", format = "bar/baz", rank = 2)]
|
|
fn get_bar_baz() -> &'static str { "get_bar_baz" }
|
|
|
|
// TODO: #[rocket(allow(unknown_format))]
|
|
#[put("/", format = "bar/baz")]
|
|
fn put_bar_baz() -> &'static str { "put_bar_baz" }
|
|
|
|
#[test]
|
|
fn test_custom_formats() {
|
|
let rocket = rocket::ignite()
|
|
.mount("/", routes![get_foo, post_foo, get_bar_baz, put_bar_baz]);
|
|
|
|
let client = Client::tracked(rocket).unwrap();
|
|
|
|
let foo_a = Accept::new(&[MediaType::new("application", "foo").into()]);
|
|
let foo_ct = ContentType::new("application", "foo");
|
|
let bar_baz_ct = ContentType::new("bar", "baz");
|
|
let bar_baz_a = Accept::new(&[MediaType::new("bar", "baz").into()]);
|
|
|
|
let response = client.get("/").header(foo_a).dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "get_foo");
|
|
|
|
let response = client.post("/").header(foo_ct).dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "post_foo");
|
|
|
|
let response = client.get("/").header(bar_baz_a).dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "get_bar_baz");
|
|
|
|
let response = client.put("/").header(bar_baz_ct).dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "put_bar_baz");
|
|
|
|
let response = client.get("/").dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "get_foo");
|
|
|
|
let response = client.put("/").header(ContentType::HTML).dispatch();
|
|
assert_eq!(response.status(), Status::NotFound);
|
|
|
|
let response = client.post("/").header(ContentType::HTML).dispatch();
|
|
assert_eq!(response.status(), Status::NotFound);
|
|
}
|