Merge pull request #344 from http-rs/page2

Rewind page 2

Author: yoshuawuyts

Cargo.toml

@@ -32,6 +32,8 @@ serde_json = "1.0.41"
 typemap = "0.3.3"
 serde_urlencoded = "0.6.1"
 log = "0.4.8"
+accept-encoding = "0.2.0-alpha.2"
+async-compression = "0.1.0-alpha.7"
 
 [dependencies.http-service-hyper]
 optional = true

README.md

@@ -54,7 +54,7 @@ and **not ready for production use yet**.
 fn main() -> Result<(), std::io::Error> {
     let mut app = tide::App::new();
     app.at("/").get(|_| async move { "Hello, world!" });
-    Ok(app.serve("127.0.0.1:8000")?)
+    Ok(app.run("127.0.0.1:8000")?)
 }
 ```
 

examples/body_types.rs

@@ -43,5 +43,5 @@ fn main() {
     app.at("/echo/json").post(echo_json);
     app.at("/echo/form").post(echo_form);
 
-    app.serve("127.0.0.1:8000").unwrap();
+    app.run("127.0.0.1:8000").unwrap();
 }

examples/catch_all.rs

@@ -8,5 +8,5 @@ async fn echo_path(cx: Context<()>) -> String {
 fn main() {
     let mut app = tide::App::new();
     app.at("/echo_path/*path").get(echo_path);
-    app.serve("127.0.0.1:8000").unwrap();
+    app.run("127.0.0.1:8000").unwrap();
 }

examples/cookies.rs

@@ -22,5 +22,5 @@ fn main() {
     app.at("/").get(retrieve_cookie);
     app.at("/set").get(set_cookie);
     app.at("/remove").get(remove_cookie);
-    app.serve("127.0.0.1:8000").unwrap();
+    app.run("127.0.0.1:8000").unwrap();
 }

examples/default_headers.rs

@@ -11,5 +11,5 @@ fn main() {
 
     app.at("/").get(|_| async move { "Hello, world!" });
 
-    app.serve("127.0.0.1:8000").unwrap();
+    app.run("127.0.0.1:8000").unwrap();
 }

examples/graphql.rs

@@ -8,19 +8,19 @@ use juniper::graphql_object;
 use std::sync::{atomic, Arc};
 use tide::{error::ResultExt, response, App, Context, EndpointResult};
 
-// First, we define `Data` that holds accumulator state. This is accessible as App data in
+// First, we define `State` that holds accumulator state. This is accessible as App data in
 // Tide, and as executor context in Juniper.
 #[derive(Clone, Default)]
-struct Data(Arc<atomic::AtomicIsize>);
+struct State(Arc<atomic::AtomicIsize>);
 
-impl juniper::Context for Data {}
+impl juniper::Context for State {}
 
 // We define `Query` unit struct here. GraphQL queries will refer to this struct. The struct itself
 // doesn't have any associated data (and there's no need to do so), but instead it exposes the
 // accumulator state from the context.
 struct Query;
 
-graphql_object!(Query: Data |&self| {
+graphql_object!(Query: State |&self| {
     // GraphQL integers are signed and 32 bits long.
     field accumulator(&executor) -> i32 as "Current value of the accumulator" {
         executor.context().0.load(atomic::Ordering::Relaxed) as i32
@@ -31,7 +31,7 @@ graphql_object!(Query: Data |&self| {
 // `Query`, but it provides the way to "mutate" the accumulator state.
 struct Mutation;
 
-graphql_object!(Mutation: Data |&self| {
+graphql_object!(Mutation: State |&self| {
     field add(&executor, by: i32) -> i32 as "Add given value to the accumulator." {
         executor.context().0.fetch_add(by as isize, atomic::Ordering::Relaxed) as i32 + by
     }
@@ -43,7 +43,7 @@ type Schema = juniper::RootNode<'static, Query, Mutation>;
 
 // Finally, we'll bridge between Tide and Juniper. `GraphQLRequest` from Juniper implements
 // `Deserialize`, so we use `Json` extractor to deserialize the request body.
-async fn handle_graphql(mut cx: Context<Data>) -> EndpointResult {
+async fn handle_graphql(mut cx: Context<State>) -> EndpointResult {
     let query: juniper::http::GraphQLRequest = cx.body_json().await.client_err()?;
     let schema = Schema::new(Query, Mutation);
     let response = query.execute(&schema, cx.state());
@@ -58,7 +58,7 @@ async fn handle_graphql(mut cx: Context<Data>) -> EndpointResult {
 }
 
 fn main() {
-    let mut app = App::with_state(Data::default());
+    let mut app = App::with_state(State::default());
     app.at("/graphql").post(handle_graphql);
-    app.serve("127.0.0.1:8000").unwrap();
+    app.run("127.0.0.1:8000").unwrap();
 }

examples/hello.rs

@@ -1,5 +1,5 @@
 fn main() {
     let mut app = tide::App::new();
     app.at("/").get(|_| async move { "Hello, world!" });
-    app.serve("127.0.0.1:8000").unwrap();
+    app.run("127.0.0.1:8000").unwrap();
 }

examples/messages.rs

@@ -66,5 +66,5 @@ fn main() {
     let mut app = App::with_state(Database::default());
     app.at("/message").post(new_message);
     app.at("/message/:id").get(get_message).post(set_message);
-    app.serve("127.0.0.1:8000").unwrap();
+    app.run("127.0.0.1:8000").unwrap();
 }

examples/multipart-form/main.rs

@@ -57,7 +57,7 @@ async fn upload_file(mut cx: Context<()>) -> EndpointResult {
 fn main() {
     let mut app = App::new();
     app.at("/upload_file").post(upload_file);
-    app.serve("127.0.0.1:8000").unwrap();
+    app.run("127.0.0.1:8000").unwrap();
 }
 
 // Test with: