Merge pull request #219 from prasannavl/2019_05_tide_isolate_core

Precursor: Tide core isolation revamp
http-rs · May 15, 2019 · a50668f · a50668f
2 parents 4a53890 + d67ec8f
commit a50668f
Show file tree

Hide file tree

Showing 30 changed files with 125 additions and 91 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,65 +1,8 @@
-[package]
-authors = [
-    "Aaron Turon <aturon@mozilla.com>",
-    "Yoshua Wuyts <yoshuawuyts@gmail.com>",
+[workspace]
+members = [
+    "tide",
+    "examples",
 ]
-description = "WIP modular web framework"
-documentation = "https://docs.rs/tide"
-keywords = ["tide", "http", "web", "framework", "async"]
-categories = [
-  "network-programming",
-  "asynchronous",
-  "web-programming::http-server"
-]
-edition = "2018"
-license = "MIT OR Apache-2.0"
-name = "tide"
-readme = "README.md"
-repository = "https://github.com/rustasync/tide"
-version = "0.2.0"
-
-[dependencies]
-cookie = { version = "0.12", features = ["percent-encode"] }
-futures-preview = "0.3.0-alpha.16"
-fnv = "1.0.6"
-http = "0.1"
-http-service = "0.2.0"
-pin-utils = "0.1.0-alpha.4"
-route-recognizer = "0.1.12"
-serde = "1.0.91"
-serde_derive = "1.0.91"
-serde_json = "1.0.39"
-slog = "2.4.1"
-slog-async = "2.3.0"
-slog-term = "2.4.0"
-typemap = "0.3.3"
-serde_urlencoded = "0.5.5"
-
-[dependencies.http-service-hyper]
-optional = true
-version = "0.2.0"
-
-[dependencies.multipart]
-default-features = false
-features = ["server"]
-version = "0.16.1"
-
-[features]
-default = ["hyper"]
-hyper = ["http-service-hyper"]
-
-[dev-dependencies]
-basic-cookies = "0.1.3"
-bytes = "0.4.12"
-futures-fs = "0.0.5"
-futures-util-preview = { version = "0.3.0-alpha.16", features = ["compat"] }
-http-service-mock = "0.2.0"
-juniper = "0.11.1"
-mime = "0.3.13"
-mime_guess = "2.0.0-alpha.6"
-percent-encoding = "1.0.1"
-serde = { version = "1.0.90", features = ["derive"] }
-structopt = "0.2.15"
 
 [patch.crates-io]
 http-service = { git = "https://github.com/rustasync/http-service", branch = "master" }

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -0,0 +1,46 @@
+[package]
+authors = [
+    "Tide Developers",
+]
+description = "Tide web server examples"
+documentation = "https://docs.rs/tide"
+edition = "2018"
+license = "MIT OR Apache-2.0"
+name = "examples"
+readme = "README.md"
+repository = "https://github.com/rustasync/tide"
+version = "0.1.0"
+publish = false
+
+[dependencies]
+tide = { path = "../tide" }
+cookie = { version = "0.12", features = ["percent-encode"] }
+futures-preview = "0.3.0-alpha.16"
+fnv = "1.0.6"
+http = "0.1"
+http-service = "0.2.0"
+pin-utils = "0.1.0-alpha.4"
+route-recognizer = "0.1.12"
+serde_json = "1.0.39"
+slog = "2.4.1"
+slog-async = "2.3.0"
+slog-term = "2.4.0"
+typemap = "0.3.3"
+serde_urlencoded = "0.5.5"
+basic-cookies = "0.1.3"
+bytes = "0.4.12"
+futures-fs = "0.0.5"
+futures-util-preview = { version = "0.3.0-alpha.16", features = ["compat"] }
+http-service-mock = "0.2.0"
+juniper = "0.11.1"
+mime = "0.3.13"
+mime_guess = "2.0.0-alpha.6"
+percent-encoding = "1.0.1"
+serde = { version = "1.0.91", features = ["derive"] }
+structopt = "0.2.15"
+
+[dependencies.multipart]
+default-features = false
+features = ["server"]
+version = "0.16.1"
+
diff --git a/examples/body_types.rs → examples/src/body_types.rs b/examples/body_types.rs → examples/src/body_types.rs
@@ -1,5 +1,3 @@
-#![feature(async_await)]
-
 use serde::{Deserialize, Serialize};
 use tide::{
     error::ResultExt,
@@ -41,7 +39,7 @@ async fn echo_form(mut cx: Context<()>) -> EndpointResult {
     Ok(forms::form(msg))
 }
 
-fn main() {
+pub fn main() {
     let mut app = App::new();
 
     app.at("/echo/string").post(echo_string);

diff --git a/examples/catch_all.rs → examples/src/catch_all.rs b/examples/catch_all.rs → examples/src/catch_all.rs
@@ -1,13 +1,11 @@
-#![feature(async_await)]
-
 use tide::Context;
 
 async fn echo_path(cx: Context<()>) -> String {
     let path: String = cx.param("path").unwrap();
     format!("Your path is: {}", path)
 }
 
-fn main() {
+pub fn main() {
     let mut app = tide::App::new();
     app.at("/echo_path/*path").get(echo_path);
     app.serve("127.0.0.1:8000").unwrap();

diff --git a/examples/cookies.rs → examples/src/cookies.rs b/examples/cookies.rs → examples/src/cookies.rs
@@ -1,10 +1,7 @@
-#![feature(async_await)]
-
 use cookie::Cookie;
 use tide::{cookies::ContextExt, middleware::CookiesMiddleware, Context};
 
 /// Tide will use the the `Cookies`'s `Extract` implementation to build this parameter.
-///
 async fn retrieve_cookie(mut cx: Context<()>) -> String {
     format!("hello cookies: {:?}", cx.get_cookie("hello").unwrap())
 }
@@ -19,7 +16,7 @@ async fn remove_cookie(mut cx: Context<()>) {
     cx.remove_cookie(Cookie::named("hello")).unwrap();
 }
 
-fn main() {
+pub fn main() {
     let mut app = tide::App::new();
     app.middleware(CookiesMiddleware::new());
 

diff --git a/examples/default_headers.rs → examples/src/default_headers.rs b/examples/default_headers.rs → examples/src/default_headers.rs
@@ -1,8 +1,6 @@
-#![feature(async_await)]
-
 use tide::middleware::DefaultHeaders;
 
-fn main() {
+pub fn main() {
     let mut app = tide::App::new();
 
     app.middleware(

diff --git a/examples/graphql.rs → examples/src/graphql.rs b/examples/graphql.rs → examples/src/graphql.rs
@@ -2,9 +2,6 @@
 // a look at [the Juniper book].
 //
 // [the Juniper book]: https://graphql-rust.github.io/
-
-#![feature(async_await)]
-
 use http::status::StatusCode;
 use juniper::graphql_object;
 use std::sync::{atomic, Arc};
@@ -59,7 +56,7 @@ async fn handle_graphql(mut cx: Context<Data>) -> EndpointResult {
     Ok(resp)
 }
 
-fn main() {
+pub fn main() {
     let mut app = App::with_state(Data::default());
     app.at("/graphql").post(handle_graphql);
     app.serve("127.0.0.1:8000").unwrap();

diff --git a/examples/hello.rs → examples/src/hello.rs b/examples/hello.rs → examples/src/hello.rs
@@ -1,6 +1,4 @@
-#![feature(async_await)]
-
-fn main() {
+pub fn main() {
     let mut app = tide::App::new();
     app.at("/").get(async move |_| "Hello, world!");
     app.serve("127.0.0.1:8000").unwrap();

diff --git a/examples/src/lib.rs b/examples/src/lib.rs
@@ -0,0 +1,13 @@
+#![feature(async_await)]
+#![warn(clippy::all)]
+#![allow(dead_code)]
+
+mod body_types;
+mod catch_all;
+mod cookies;
+mod default_headers;
+mod graphql;
+mod hello;
+mod messages;
+mod multipart_form;
+mod staticfile;
diff --git a/examples/messages.rs → examples/src/messages.rs b/examples/messages.rs → examples/src/messages.rs
@@ -1,5 +1,3 @@
-#![feature(async_await)]
-
 use http::status::StatusCode;
 use serde::{Deserialize, Serialize};
 use std::sync::Mutex;
@@ -66,7 +64,7 @@ async fn get_message(cx: Context<Database>) -> EndpointResult {
     }
 }
 
-fn main() {
+pub 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);

diff --git a/examples/multipart-form/main.rs → examples/src/multipart_form/mod.rs b/examples/multipart-form/main.rs → examples/src/multipart_form/mod.rs
@@ -1,5 +1,3 @@
-#![feature(async_await)]
-
 use serde::{Deserialize, Serialize};
 use std::io::Read;
 use tide::{forms::ExtractForms, response, App, Context, EndpointResult};
@@ -57,7 +55,7 @@ async fn upload_file(mut cx: Context<()>) -> EndpointResult {
     Ok(response::json(message))
 }
 
-fn main() {
+pub fn run() {
     let mut app = App::new();
     app.at("/upload_file").post(upload_file);
     app.serve("127.0.0.1:8000").unwrap();

diff --git a/examples/multipart-form/test.txt → examples/src/multipart_form/test.txt b/examples/multipart-form/test.txt → examples/src/multipart_form/test.txt
diff --git a/examples/staticfile.rs → examples/src/staticfile.rs b/examples/staticfile.rs → examples/src/staticfile.rs
@@ -1,5 +1,3 @@
-#![feature(async_await)]
-
 use bytes::Bytes;
 use futures_fs::FsPool;
 use futures_util::compat::*;
@@ -44,7 +42,7 @@ impl StaticFile {
         // Check if the path exists and handle if it's a directory containing `index.html`
         if meta.is_some() && meta.as_ref().map(|m| !m.is_file()).unwrap_or(false) {
             // Redirect if path is a dir and URL doesn't end with "/"
-            if !actual_path.ends_with("/") {
+            if !actual_path.ends_with('/') {
                 return Ok(response
                     .status(StatusCode::MOVED_PERMANENTLY)
                     .header(header::LOCATION, String::from(actual_path) + "/")
@@ -121,7 +119,7 @@ async fn handle_path(ctx: Context<StaticFile>) -> EndpointResult {
         })
 }
 
-fn main() {
+pub fn main() {
     let mut app = App::with_state(StaticFile::new("./"));
     app.at("/*").get(handle_path);
     app.serve("127.0.0.1:8000").unwrap();

diff --git a/tide/Cargo.toml b/tide/Cargo.toml
@@ -0,0 +1,52 @@
+[package]
+authors = [
+    "Aaron Turon <aturon@mozilla.com>",
+    "Yoshua Wuyts <yoshuawuyts@gmail.com>",
+]
+description = "WIP modular web framework"
+documentation = "https://docs.rs/tide"
+keywords = ["tide", "http", "web", "framework", "async"]
+categories = [
+  "network-programming",
+  "asynchronous",
+  "web-programming::http-server"
+]
+edition = "2018"
+license = "MIT OR Apache-2.0"
+name = "tide"
+readme = "README.md"
+repository = "https://github.com/rustasync/tide"
+version = "0.2.0"
+
+[dependencies]
+cookie = { version = "0.12", features = ["percent-encode"] }
+futures-preview = "0.3.0-alpha.16"
+fnv = "1.0.6"
+http = "0.1"
+http-service = "0.2.0"
+pin-utils = "0.1.0-alpha.4"
+route-recognizer = "0.1.12"
+serde = "1.0.91"
+serde_derive = "1.0.91"
+serde_json = "1.0.39"
+slog = "2.4.1"
+slog-async = "2.3.0"
+slog-term = "2.4.0"
+typemap = "0.3.3"
+serde_urlencoded = "0.5.5"
+
+[dependencies.http-service-hyper]
+optional = true
+version = "0.2.0"
+
+[dependencies.multipart]
+default-features = false
+features = ["server"]
+version = "0.16.1"
+
+[features]
+default = ["hyper"]
+hyper = ["http-service-hyper"]
+
+[dev-dependencies]
+http-service-mock = "0.2.0"
diff --git a/src/app.rs → tide/src/app.rs b/src/app.rs → tide/src/app.rs
diff --git a/src/context.rs → tide/src/context.rs b/src/context.rs → tide/src/context.rs
diff --git a/src/cookies.rs → tide/src/cookies.rs b/src/cookies.rs → tide/src/cookies.rs
diff --git a/src/endpoint.rs → tide/src/endpoint.rs b/src/endpoint.rs → tide/src/endpoint.rs
diff --git a/src/error.rs → tide/src/error.rs b/src/error.rs → tide/src/error.rs
diff --git a/src/forms.rs → tide/src/forms.rs b/src/forms.rs → tide/src/forms.rs
diff --git a/src/lib.rs → tide/src/lib.rs b/src/lib.rs → tide/src/lib.rs
diff --git a/src/middleware/cookies.rs → tide/src/middleware/cookies.rs b/src/middleware/cookies.rs → tide/src/middleware/cookies.rs
diff --git a/src/middleware/default_headers.rs → tide/src/middleware/default_headers.rs b/src/middleware/default_headers.rs → tide/src/middleware/default_headers.rs
diff --git a/src/middleware/logger.rs → tide/src/middleware/logger.rs b/src/middleware/logger.rs → tide/src/middleware/logger.rs
diff --git a/src/middleware/mod.rs → tide/src/middleware/mod.rs b/src/middleware/mod.rs → tide/src/middleware/mod.rs
diff --git a/src/querystring.rs → tide/src/querystring.rs b/src/querystring.rs → tide/src/querystring.rs
diff --git a/src/response.rs → tide/src/response.rs b/src/response.rs → tide/src/response.rs
diff --git a/src/route.rs → tide/src/route.rs b/src/route.rs → tide/src/route.rs
diff --git a/src/router.rs → tide/src/router.rs b/src/router.rs → tide/src/router.rs
diff --git a/tests/wildcard.rs → tide/tests/wildcard.rs b/tests/wildcard.rs → tide/tests/wildcard.rs