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

dependency management

Browse source
This commit is contained in:
Dominic 2020-04-15 23:15:13 +02:00
parent 40e6d1bc03
commit a493071ff8
Signed by: msrd0
GPG key ID: DCC8C247452E98F9
7 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
example/Cargo.toml
View file

@ -18,11 +18,6 @@ fake = "2.2"
gotham = { git = "https://github.com/gotham-rs/gotham", version = "0.5.0-dev", default-features = false } gotham = { git = "https://github.com/gotham-rs/gotham", version = "0.5.0-dev", default-features = false }
gotham_derive = { git = "https://github.com/gotham-rs/gotham", version = "0.5.0-dev", default-features = false } gotham_derive = { git = "https://github.com/gotham-rs/gotham", version = "0.5.0-dev", default-features = false }
gotham_restful = { version = "0.0.5-dev", features = ["auth", "openapi"] } gotham_restful = { version = "0.0.5-dev", features = ["auth", "openapi"] }
log = "0.4" log = "0.4.8"
log4rs = { version = "0.8", features = ["console_appender"], default-features = false } log4rs = { version = "0.11", features = ["console_appender"], default-features = false }
serde = "1" serde = "1.0.106"
[dev-dependencies]
fake = "2.2"
log = "0.4"
log4rs = { version = "0.8", features = ["console_appender"], default-features = false }

10
gotham_restful/Cargo.toml
View file

@ -16,23 +16,21 @@ gitlab = { repository = "msrd0/gotham-restful", branch = "master" }
[dependencies] [dependencies]
base64 = { version = "0.12.0", optional = true } base64 = { version = "0.12.0", optional = true }
chrono = { version = "0.4.10", optional = true } chrono = { version = "0.4.11", optional = true }
cookie = { version = "0.13.3", optional = true } cookie = { version = "0.13.3", optional = true }
futures = "0.3.4"
futures-core = "0.3.4" futures-core = "0.3.4"
futures-util = "0.3.4" futures-util = "0.3.4"
gotham = { git = "https://github.com/gotham-rs/gotham", version = "0.5.0-dev", default-features = false } gotham = { git = "https://github.com/gotham-rs/gotham", version = "0.5.0-dev", default-features = false }
gotham_derive = { git = "https://github.com/gotham-rs/gotham", version = "0.5.0-dev" } gotham_derive = { git = "https://github.com/gotham-rs/gotham", version = "0.5.0-dev" }
gotham_middleware_diesel = { git = "https://github.com/gotham-rs/gotham", version = "0.1.0", optional = true } gotham_middleware_diesel = { git = "https://github.com/gotham-rs/gotham", version = "0.1.0", optional = true }
gotham_restful_derive = { version = "0.0.4-dev" } gotham_restful_derive = { version = "0.0.4-dev" }
hyper = "0.13.4" indexmap = { version = "1.3.2", optional = true }
indexmap = { version = "1.3.0", optional = true }
jsonwebtoken = { version = "7.1.0", optional = true } jsonwebtoken = { version = "7.1.0", optional = true }
log = { version = "0.4.8", optional = true } log = { version = "0.4.8", optional = true }
mime = "0.3.16" mime = "0.3.16"
openapiv3 = { version = "0.3", optional = true } openapiv3 = { version = "0.3", optional = true }
serde = { version = "1.0.104", features = ["derive"] } serde = { version = "1.0.106", features = ["derive"] }
serde_json = "1.0.45" serde_json = "1.0.51"
uuid = { version = ">= 0.1, < 0.9", optional = true } uuid = { version = ">= 0.1, < 0.9", optional = true }
[dev-dependencies] [dev-dependencies]

2
gotham_restful/src/auth.rs
View file

@ -3,10 +3,10 @@ use cookie::CookieJar;
use futures_util::{future, future::{FutureExt, TryFutureExt}}; use futures_util::{future, future::{FutureExt, TryFutureExt}};
use gotham::{ use gotham::{
handler::HandlerFuture, handler::HandlerFuture,
hyper::header::{AUTHORIZATION, HeaderMap},
middleware::{Middleware, NewMiddleware}, middleware::{Middleware, NewMiddleware},
state::{FromState, State} state::{FromState, State}
}; };
use hyper::header::{AUTHORIZATION, HeaderMap};
use jsonwebtoken::{ use jsonwebtoken::{
errors::ErrorKind, errors::ErrorKind,
DecodingKey DecodingKey

6
gotham_restful/src/openapi/router.rs
View file

@ -188,12 +188,12 @@ impl Handler for OpenapiHandler
match serde_json::to_string(&openapi) { match serde_json::to_string(&openapi) {
Ok(body) => { Ok(body) => {
let res = create_response(&state, hyper::StatusCode::OK, APPLICATION_JSON, body); let res = create_response(&state, crate::StatusCode::OK, APPLICATION_JSON, body);
future::ok((state, res)).boxed() future::ok((state, res)).boxed()
}, },
Err(e) => { Err(e) => {
error!("Unable to handle OpenAPI request due to error: {}", e); error!("Unable to handle OpenAPI request due to error: {}", e);
let res = create_response(&state, hyper::StatusCode::INTERNAL_SERVER_ERROR, TEXT_PLAIN, ""); let res = create_response(&state, crate::StatusCode::INTERNAL_SERVER_ERROR, TEXT_PLAIN, "");
future::ok((state, res)).boxed() future::ok((state, res)).boxed()
} }
} }
@ -303,7 +303,7 @@ impl<'a> OperationParams<'a>
fn new_operation( fn new_operation(
operation_id : Option<String>, operation_id : Option<String>,
default_status : hyper::StatusCode, default_status : crate::StatusCode,
accepted_types : Option<Vec<Mime>>, accepted_types : Option<Vec<Mime>>,
schema : ReferenceOr<Schema>, schema : ReferenceOr<Schema>,
params : OperationParams, params : OperationParams,

2
gotham_restful/src/resource.rs
View file

@ -1,9 +1,9 @@
use crate::{DrawResourceRoutes, RequestBody, ResourceResult, ResourceType}; use crate::{DrawResourceRoutes, RequestBody, ResourceResult, ResourceType};
use gotham::{ use gotham::{
extractor::QueryStringExtractor, extractor::QueryStringExtractor,
hyper::Body,
state::State state::State
}; };
use hyper::Body;
use serde::de::DeserializeOwned; use serde::de::DeserializeOwned;
use std::{ use std::{
future::Future, future::Future,

2
gotham_restful/src/routing.rs
View file

@ -92,7 +92,7 @@ pub trait DrawResourceRoutes
fn delete<Handler : ResourceDelete>(&mut self); fn delete<Handler : ResourceDelete>(&mut self);
} }
fn response_from(res : Response, state : &State) -> hyper::Response<Body> fn response_from(res : Response, state : &State) -> gotham::hyper::Response<Body>
{ {
let mut r = create_empty_response(state, res.status); let mut r = create_empty_response(state, res.status);
if let Some(mime) = res.mime if let Some(mime) = res.mime

6
gotham_restful_derive/Cargo.toml
View file

@ -18,9 +18,9 @@ gitlab = { repository = "msrd0/gotham-restful", branch = "master" }
[dependencies] [dependencies]
heck = "0.3.1" heck = "0.3.1"
proc-macro2 = "1.0.8" proc-macro2 = "1.0.10"
quote = "1.0.2" quote = "1.0.3"
syn = { version = "1.0.14", features = ["extra-traits", "full"] } syn = { version = "1.0.17", features = ["extra-traits", "full"] }
[features] [features]
default = [] default = []