mirror of https://github.com/rwf2/Rocket.git
Reenable the options decorator.
This commit is contained in:
parent
ecc62beeac
commit
b69527c392
|
@ -314,6 +314,4 @@ method_decorator!(post_decorator, Post);
|
||||||
method_decorator!(delete_decorator, Delete);
|
method_decorator!(delete_decorator, Delete);
|
||||||
method_decorator!(head_decorator, Head);
|
method_decorator!(head_decorator, Head);
|
||||||
method_decorator!(patch_decorator, Patch);
|
method_decorator!(patch_decorator, Patch);
|
||||||
|
method_decorator!(options_decorator, Options);
|
||||||
// TODO: Allow this once Diesel incompatibility is fixed.
|
|
||||||
// method_decorator!(options_decorator, Options);
|
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
//! * **delete**
|
//! * **delete**
|
||||||
//! * **head**
|
//! * **head**
|
||||||
//! * **patch**
|
//! * **patch**
|
||||||
|
//! * **options**
|
||||||
//! * **error**
|
//! * **error**
|
||||||
//!
|
//!
|
||||||
//! The grammar for all _route_ attributes, including **route**, **get**,
|
//! The grammar for all _route_ attributes, including **route**, **get**,
|
||||||
|
@ -173,9 +174,8 @@ pub fn plugin_registrar(reg: &mut Registry) {
|
||||||
"post" => post_decorator,
|
"post" => post_decorator,
|
||||||
"delete" => delete_decorator,
|
"delete" => delete_decorator,
|
||||||
"head" => head_decorator,
|
"head" => head_decorator,
|
||||||
"patch" => patch_decorator
|
"patch" => patch_decorator,
|
||||||
// TODO: Allow this once Diesel incompatibility is fixed. Fix docs too.
|
"options" => options_decorator
|
||||||
// "options" => options_decorator
|
|
||||||
);
|
);
|
||||||
|
|
||||||
register_lints!(reg, RocketLint);
|
register_lints!(reg, RocketLint);
|
||||||
|
|
|
@ -21,8 +21,7 @@ extern crate rocket;
|
||||||
#[patch("/")] fn patch() { }
|
#[patch("/")] fn patch() { }
|
||||||
#[route(PATCH, "/")] fn patch_r() { }
|
#[route(PATCH, "/")] fn patch_r() { }
|
||||||
|
|
||||||
// TODO: Allow this once Diesel incompatibility is fixed.
|
#[options("/")] fn options() { }
|
||||||
// #[options("/")] fn options() { }
|
|
||||||
#[route(OPTIONS, "/")] fn options_r() { }
|
#[route(OPTIONS, "/")] fn options_r() { }
|
||||||
|
|
||||||
fn main() { }
|
fn main() { }
|
||||||
|
|
|
@ -7,20 +7,31 @@ a result, you'll need to have `sqlite3` and its headers installed:
|
||||||
* **Debian/Ubuntu:** `apt-get install libsqlite3-dev`
|
* **Debian/Ubuntu:** `apt-get install libsqlite3-dev`
|
||||||
* **Arch:** `pacman -S sqlite`
|
* **Arch:** `pacman -S sqlite`
|
||||||
|
|
||||||
**Before running this example, you'll also need to ensure there's a database
|
|
||||||
file with the correct tables present.** On a Unix machine or with bash
|
|
||||||
installed, you can simply run the `boostrap.sh` script. The script installs the
|
|
||||||
`diesel_cli` tools if they're not already installed and runs the migrations.
|
|
||||||
|
|
||||||
## Manually Running Migrations
|
|
||||||
|
|
||||||
You can also run the migrations manually with the following commands:
|
|
||||||
|
|
||||||
```
|
|
||||||
cargo install diesel_cli # install diesel CLI tools
|
|
||||||
DATABASE_URL=db/db.sql diesel migration run # create db/db.sql
|
|
||||||
```
|
|
||||||
|
|
||||||
## Running
|
## Running
|
||||||
|
|
||||||
Run this example using: `DATABASE_URL=db/db.sql cargo run`
|
**Before running, building, or testing this example, you'll need to ensure the
|
||||||
|
following:**
|
||||||
|
|
||||||
|
1. A SQLite database file with the proper schema is present.
|
||||||
|
|
||||||
|
On a Unix machine or with bash installed, you can simply run the
|
||||||
|
`boostrap.sh` script to create the database. The script installs the
|
||||||
|
`diesel_cli` tools if they're not already installed and runs the migrations.
|
||||||
|
The script will output a `DATABASE_URL` variable.
|
||||||
|
|
||||||
|
You can also run the migrations manually with the following commands:
|
||||||
|
|
||||||
|
```
|
||||||
|
cargo install diesel_cli # install diesel CLI tools
|
||||||
|
DATABASE_URL=db/db.sql diesel migration run # create db/db.sql
|
||||||
|
```
|
||||||
|
|
||||||
|
2. A `DATABASE_URL` environment variable is set that points to the SQLite
|
||||||
|
database file.
|
||||||
|
|
||||||
|
Use the `DATABASE_URL` variable emitted from the `bootstrap.sh` script, or
|
||||||
|
enter it manually, as follows:
|
||||||
|
|
||||||
|
* `DATABASE_URL=db/db.sql cargo build`
|
||||||
|
* `DATABASE_URL=db/db.sql cargo test`
|
||||||
|
* `DATABASE_URL=db/db.sql cargo run`
|
||||||
|
|
Loading…
Reference in New Issue