msrd0/deprecated-gotham-restful
1
0
Fork 0
mirror of https://gitlab.com/msrd0/gotham-restful.git synced 2025-02-23 04:52:28 +00:00
Code Issues Releases Activity Actions

get resources work

Browse source
This commit is contained in:
Dominic 2019-09-27 16:36:38 +02:00
parent 595705ee31
commit 8db145587f
Signed by: msrd0
GPG key ID: DCC8C247452E98F9
6 changed files with 91 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Cargo.lock generated
View file

@ -330,15 +330,24 @@ dependencies = [
"fake 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
"gotham 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gotham_derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log4rs 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
"mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "gotham_derive"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "h2"
version = "0.1.26"
@ -966,6 +975,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "serde"
version = "1.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "serde_derive"
@ -1474,6 +1486,7 @@ dependencies = [
"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
"checksum gotham 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb734995f768833f633d6acaee1fe768e1395dafc75362a2dac404ba32d7883a"
"checksum gotham_derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b207d2aa120b2d7be4bb7edc48b199297ebce4227979127b0879890a84163480"
"checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
"checksum http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "372bcb56f939e449117fb0869c2e8fd8753a8223d92a172c6e808cf123a5b6e4"
"checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"

4
Cargo.toml
View file

@ -19,10 +19,10 @@ gitlab = { repository = "msrd0/gotham-restful", branch = "master" }
failure = "0.1"
futures = "0.1"
gotham = "0.4"
gotham_derive = "0.4"
hyper = "0.12"
mime = "0.3"
serde = "1"
serde_derive = "1"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
[dev-dependencies]

16
examples/users.rs
View file

@ -1,6 +1,4 @@
extern crate log;
#[macro_use]
extern crate serde_derive;
#[macro_use] extern crate serde;
use fake::{faker::internet::en::Username, Fake};
use gotham::{
@ -9,7 +7,7 @@ use gotham::{
router::builder::*,
state::State
};
use gotham_restful::{DrawResources, DrawResourceRoutes, IndexResource, Resource, Success};
use gotham_restful::{DrawResources, DrawResourceRoutes, GetResource, IndexResource, Resource, Success};
use log::LevelFilter;
use log4rs::{
append::console::ConsoleAppender,
@ -37,11 +35,21 @@ impl IndexResource<Success<Vec<User>>> for Users
}
}
impl GetResource<u64, Success<User>> for Users
{
fn get(_state : &mut State, id : u64) -> Success<User>
{
let username : String = Username().fake();
User { username: format!("{}{}", username, id) }.into()
}
}
impl Resource for Users
{
fn setup<D : DrawResourceRoutes>(mut route : D)
{
route.index::<_, Self>();
route.get::<_, _, Self>();
}
}

6
src/lib.rs
View file

@ -1,5 +1,5 @@
#[macro_use]
extern crate serde_derive;
#[macro_use] extern crate gotham_derive;
#[macro_use] extern crate serde;
pub use hyper::StatusCode;
@ -8,7 +8,7 @@ pub use resource::{
Resource,
IndexResource,
GetResource,
PostResource
CreateResource
};
mod result;

16
src/resource.rs
View file

@ -1,23 +1,31 @@
use crate::{DrawResourceRoutes, ResourceResult};
use gotham::state::State;
use serde::de::DeserializeOwned;
use std::panic::RefUnwindSafe;
/// This trait must be implemented by every RESTful Resource. It will
/// allow you to register the different methods for this Resource.
pub trait Resource
{
fn setup<D : DrawResourceRoutes>(route : D);
}
/// Handle a GET request on the Resource root.
pub trait IndexResource<R : ResourceResult>
{
fn index(state : &mut State) -> R;
}
pub trait GetResource<ID : DeserializeOwned>
/// Handle a GET request on the Resource with an id.
pub trait GetResource<ID, R : ResourceResult>
where
ID : DeserializeOwned + Clone + RefUnwindSafe + Send + Sync + 'static
{
fn get(state : State, id : ID) -> dyn ResourceResult;
fn get(state : &mut State, id : ID) -> R;
}
pub trait PostResource<Body : DeserializeOwned>
/// Handle a POST request on the Resource root.
pub trait CreateResource<Body : DeserializeOwned, R : ResourceResult>
{
fn post(state : State, body : Body) -> dyn ResourceResult;
fn post(state : &mut State, body : Body) -> R;
}

54
src/routing.rs
View file

@ -1,15 +1,23 @@
use crate::{IndexResource, Resource, ResourceResult};
use crate::{GetResource, IndexResource, Resource, ResourceResult};
use futures::future::{err, ok};
use gotham::{
handler::{HandlerFuture, IntoHandlerError},
helpers::http::response::create_response,
pipeline::chain::PipelineHandleChain,
router::builder::*,
state::State
state::{FromState, State}
};
use mime::APPLICATION_JSON;
use serde::de::DeserializeOwned;
use std::panic::RefUnwindSafe;
/// Allow us to extract an id from a path.
#[derive(Deserialize, StateData, StaticResponseExtender)]
struct PathExtractor<ID : RefUnwindSafe + Send + 'static>
{
id : ID
}
/// This trait adds the `resource` method to gotham's routing. It allows you to register
/// any RESTful `Resource` with a path.
pub trait DrawResources
@ -21,7 +29,16 @@ pub trait DrawResources
/// `Resource::setup` method.
pub trait DrawResourceRoutes
{
fn index<R : ResourceResult, IR : IndexResource<R>>(&mut self);
fn index<R, IR>(&mut self)
where
R : ResourceResult,
IR : IndexResource<R>;
fn get<ID, R, IR>(&mut self)
where
ID : DeserializeOwned + Clone + RefUnwindSafe + Send + Sync + 'static,
R : ResourceResult,
IR : GetResource<ID, R>;
}
fn to_handler_future<F, R>(mut state : State, get_result : F) -> Box<HandlerFuture>
@ -44,6 +61,17 @@ fn index_handler<R : ResourceResult, IR : IndexResource<R>>(state : State) -> Bo
to_handler_future(state, |state| IR::index(state))
}
fn get_handler<ID, R : ResourceResult, GR : GetResource<ID, R>>(state : State) -> Box<HandlerFuture>
where
ID : DeserializeOwned + Clone + RefUnwindSafe + Send + Sync + 'static
{
let id = {
let path : &PathExtractor<ID> = PathExtractor::borrow_from(&state);
path.id.clone()
};
to_handler_future(state, |state| GR::get(state, id))
}
macro_rules! implDrawResourceRoutes {
($implType:ident) => {
impl<'a, C, P> DrawResources for $implType<'a, C, P>
@ -62,10 +90,24 @@ macro_rules! implDrawResourceRoutes {
C : PipelineHandleChain<P> + Copy + Send + Sync + 'static,
P : RefUnwindSafe + Send + Sync + 'static
{
/// Register an `IndexResource` with this resource.
fn index<R : ResourceResult, IR : IndexResource<R>>(&mut self)
fn index<R, IR>(&mut self)
where
R : ResourceResult,
IR : IndexResource<R>
{
self.0.get(&self.1).to(|state| index_handler::<R, IR>(state));
self.0.get(&self.1)
.to(|state| index_handler::<R, IR>(state));
}
fn get<ID, R, IR>(&mut self)
where
ID : DeserializeOwned + Clone + RefUnwindSafe + Send + Sync + 'static,
R : ResourceResult,
IR : GetResource<ID, R>
{
self.0.get(&format!("{}/:id", self.1))
.with_path_extractor::<PathExtractor<ID>>()
.to(|state| get_handler::<ID, R, IR>(state));
}
}
}