Synchronize with the Rocket v0.5-rc branch

Cargo.toml

@@ -3,6 +3,7 @@ members = [
     "okapi",
     "rocket-okapi",
     "rocket-okapi-codegen",
+    "rocket-okapi-ui",
     "examples/json-web-api",
     "examples/secure_request_guard"
 ]

README.md

@@ -6,7 +6,7 @@ only change your usage in Cargo toml to something like this by adding the "packa
 ```toml
 okapi = { version = "0.x.x", features = ["derive_json_schema"], package = "okapi_fork" }
 rocket_okapi = { version = "0.x.x", package = "rocket_okapi_fork" }
-
+rocket_okapi_ui = "0.x.x"
 ```
 
 Work in progress!
@@ -18,9 +18,11 @@ Work in progress!
 extern crate rocket;
 #[macro_use]
 extern crate rocket_okapi;
+#[macro_use]
+extern crate rocket_okapi_ui;
 
 use rocket_contrib::json::Json;
-use rocket_okapi::swagger_ui::make_swagger_ui;
+use rocket_okapi_ui::*;
 use serde::{Deserialize, Serialize};
 use schemars::JsonSchema;
 
@@ -59,20 +61,26 @@ fn hidden() -> Json<&'static str> {
     Json("Hidden from swagger!")
 }
 
-pub fn make_rocket() -> rocket::Rocket {
+#[launch]
+fn rocket() -> _ {
+    // You can optionally host Swagger UI
+    // To do this, create a config to attach it later
+    let swagger_config = SwaggerUIConfig {
+        url: "../openapi.json".to_owned(),
+        ..Default::default()
+    };
+
     rocket::build()
         // routes_with_openapi![...] will host the openapi document at openapi.json
         .mount(
             "/",
             routes_with_openapi![get_user, hidden],
         )
-        // You can optionally host swagger-ui too
+        // Attach the Swagger UI config and mount the routes
+        .attach(swagger_config.fairing())
         .mount(
             "/swagger-ui/",
-            make_swagger_ui(&SwaggerUIConfig {
-                url: "../openapi.json".to_owned(),
-                ..Default::default()
-            }),
+            swagger_ui_routes![],
         )
 }
 ```

examples/json-web-api/Cargo.toml

@@ -5,8 +5,15 @@ authors = ["Graham Esau <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-rocket = { version = "0.5.0-rc.1", default-features = false, features = ["json"] }
 schemars = { version = "0.8" } #, features = ["preserve_order"] }
-okapi = { version = "0.6.0-alpha-1", path = "../../okapi", package = "okapi_fork" }
-rocket_okapi = { version = "0.7.0-alpha-1", path = "../../rocket-okapi", package = "rocket_okapi_fork" }
+okapi = { version = "0.6.1", path = "../../okapi", package = "okapi_fork" }
+rocket_okapi = { version = "0.8.0-rc.1", path = "../../rocket-okapi", package = "rocket_okapi_fork" }
+rocket_okapi_ui = { version = "0.1.0-rc.1", path = "../../rocket-okapi-ui" }
 serde = "1.0"
+
+[dependencies.rocket]
+git              = "https://github.com/SergioBenitez/Rocket"
+branch           = "v0.5-rc"
+version          = "0.5.0-rc.1"
+default-features = false
+features         = ["json"]

examples/json-web-api/src/main.rs

@@ -2,10 +2,12 @@
 extern crate rocket;
 #[macro_use]
 extern crate rocket_okapi;
+#[macro_use]
+extern crate rocket_okapi_ui;
 
 use rocket::form::FromForm;
 use rocket::serde::json::Json;
-use rocket_okapi::swagger_ui::*;
+use rocket_okapi_ui::*;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
@@ -93,9 +95,15 @@ fn create_post_by_query(post: Post) -> Option<Json<Post>> {
     Some(Json(post))
 }
 
-#[rocket::main]
-async fn main() {
-    let result = rocket::build()
+#[rocket::launch]
+fn rocket() -> _ {
+    let swagger_ui_config = SwaggerUIConfig {
+        url: "../openapi.json".to_owned(),
+        ..Default::default()
+    };
+
+    rocket::build()
+        .attach(swagger_ui_config.fairing())
         .mount(
             "/",
             routes_with_openapi![
@@ -109,12 +117,6 @@ async fn main() {
         )
         .mount(
             "/swagger-ui/",
-            make_swagger_ui(&SwaggerUIConfig {
-                url: "../openapi.json".to_owned(),
-                ..SwaggerUIConfig::default()
-            }),
+            swagger_ui_routes![],
         )
-        .launch()
-        .await;
-    assert!(result.is_ok());
 }

examples/secure_request_guard/Cargo.toml

@@ -5,9 +5,14 @@ authors = ["Kristoffer Ödmark <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-rocket = { version = "0.5.0-rc.1", default-features = false, features = ["json"] }
 schemars = { version = "0.8"}
-okapi= { version = "0.6.0-alpha-1", path = "../../okapi" , package = "okapi_fork"}
-rocket_okapi= { version = "0.7.0-alpha-1", path = "../../rocket-okapi", package = "rocket_okapi_fork"}
-serde = "1.0"
-tokio = "1.6"
+okapi = { version = "0.6.1", path = "../../okapi", package = "okapi_fork"}
+rocket_okapi = { version = "0.8.0-rc.1", path = "../../rocket-okapi", package = "rocket_okapi_fork"}
+rocket_okapi_ui = { version = "0.1.0-rc.1", path = "../../rocket-okapi-ui" }
+
+[dependencies.rocket]
+git              = "https://github.com/SergioBenitez/Rocket"
+branch           = "v0.5-rc"
+version          = "0.5.0-rc.1"
+default-features = false
+features         = ["json"]

examples/secure_request_guard/src/main.rs

@@ -12,8 +12,8 @@ use rocket_okapi::{
     request::{OpenApiFromRequest, RequestHeaderInput},
     response::OpenApiResponder,
     routes_with_openapi,
-    swagger_ui::{make_swagger_ui, SwaggerUIConfig},
 };
+use rocket_okapi_ui::{SwaggerUIConfig, swagger_ui_routes};
 
 pub struct KeyAuthorize;
 
@@ -106,19 +106,19 @@ pub fn restricted(_key: KeyAuthorize) -> Json<String> {
     Json("You got access here, hurray".into())
 }
 
-#[tokio::main]
-async fn main() {
+#[rocket::launch]
+fn rocket() -> _ {
     let rocket_config = Config::debug_default();
+    let swagger_config = SwaggerUIConfig {
+        url: "/openapi.json".to_string(),
+        ..Default::default()
+    };
 
-    let e = rocket::custom(rocket_config)
+    rocket::custom(rocket_config)
+        .attach(swagger_config.fairing())
         .mount("/", routes_with_openapi![restricted])
         .mount(
             "/api/",
-            make_swagger_ui(&SwaggerUIConfig {
-                url: "/openapi.json".to_string(),
-                ..Default::default()
-            }),
+            swagger_ui_routes![],
         )
-        .launch()
-        .await;
 }

release.sh

@@ -4,4 +4,5 @@ sleep 20
 cargo release --manifest-path rocket-okapi-codegen/Cargo.toml --skip-tag --skip-push $@
 sleep 20
 cargo release --manifest-path rocket-okapi/Cargo.toml --skip-tag --skip-push $@
-
+sleep 20
+cargo release --manifest-path rocket-okapi-ui/Cargo.toml --skip-tag --skip-push $@

rocket-okapi-ui/.gitignore

@@ -0,0 +1,4 @@
+/target
+**/*.rs.bk
+Cargo.lock
+/.idea

rocket-okapi-ui/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "rocket_okapi_ui"
+description = "Crate for embedding Swagger Web UI into Rocket applications"
+version = "0.1.0-rc.1"
+repository = "https://github.com/TotalKrill/okapi"
+authors = [
+    "Graham Esau <[email protected]>",
+    "Kristoffer Ödmark <[email protected]>",
+    "Petr Tsymbarovich <[email protected]>"
+]
+edition = "2018"
+license = "MIT"
+keywords = ["rust", "openapi", "swagger", "rocket"]
+
+[dependencies]
+serde = "1.0"
+
+[dependencies.rocket]
+git              = "https://github.com/SergioBenitez/Rocket"
+branch           = "v0.5-rc"
+version          = "0.5.0-rc.1"
+default-features = false
+features         = ["json"]