merge workspace and main crate

.gitlab-ci.yml

@@ -27,7 +27,7 @@ test-all:
   script:
     - cargo test --workspace --all-features --doc
     - cargo test trybuild_ui -- --ignored
-    - cargo tarpaulin --target-dir target/tarpaulin --all --all-features --exclude-files 'cargo/*' --exclude-files 'gotham_restful_derive/*' --exclude-files 'example/*' --ignore-panics --ignore-tests --out Html -v
+    - cargo tarpaulin --target-dir target/tarpaulin --all --all-features --exclude-files 'cargo/*' --exclude-files 'derive/*' --exclude-files 'example/*' --ignore-panics --ignore-tests --out Html -v
   artifacts:
     paths:
       - tarpaulin-report.html
@@ -40,7 +40,7 @@ readme:
   stage: test
   image: msrd0/cargo-readme
   script:
-    - cargo readme -r gotham_restful -t ../README.tpl >README.md.new
+    - cargo readme -t README.tpl >README.md.new
     - diff README.md README.md.new
 
 publish:

Cargo.toml

@@ -1,13 +1,60 @@
 # -*- eval: (cargo-minor-mode 1) -*-
 
 [workspace]
-members = [
+members = ["derive", "example"]
-	"gotham_restful",
+
-	"gotham_restful_derive",
+[package]
-	"example"
+name = "gotham_restful"
-]
+version = "0.1.0-dev"
+authors = ["Dominic Meiser <git@msrd0.de>"]
+edition = "2018"
+description = "RESTful additions for the gotham web framework"
+keywords = ["gotham", "rest", "restful", "web", "http"]
+license = "EPL-2.0 OR Apache-2.0"
+readme = "README.md"
+repository = "https://gitlab.com/msrd0/gotham-restful"
+
+[badges]
+gitlab = { repository = "msrd0/gotham-restful", branch = "master" }
+
+[dependencies]
+base64 = { version = "0.12.0", optional = true }
+chrono = { version = "0.4.11", optional = true }
+cookie = { version = "0.13.3", optional = true }
+futures-core = "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_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_restful_derive = { version = "0.1.0-dev" }
+indexmap = { version = "1.3.2", optional = true }
+itertools = "0.9.0"
+jsonwebtoken = { version = "7.1.0", optional = true }
+log = "0.4.8"
+mime = "0.3.16"
+openapiv3 = { version = "0.3", optional = true }
+serde = { version = "1.0.106", features = ["derive"] }
+serde_json = "1.0.52"
+thiserror = "1.0.16"
+uuid = { version = "0.8.1", optional = true }
+
+[dev-dependencies]
+diesel = { version = "1.4.4", features = ["postgres"] }
+futures-executor = "0.3.4"
+paste = "0.1.12"
+trybuild = "1.0.26"
+
+[features]
+default = ["errorlog"]
+auth = ["gotham_restful_derive/auth", "base64", "cookie", "jsonwebtoken"]
+errorlog = []
+database = ["gotham_restful_derive/database", "gotham_middleware_diesel"]
+openapi = ["gotham_restful_derive/openapi", "indexmap", "openapiv3"]
+
+[package.metadata.docs.rs]
+all-features = true
 
 [patch.crates-io]
-gotham_restful = { path = "./gotham_restful" }
+gotham_restful = { path = "." }
-gotham_restful_derive = { path = "./gotham_restful_derive" }
+gotham_restful_derive = { path = "./derive" }
 openapiv3 = { git = "https://github.com/glademiller/openapiv3", rev = "4c3bd95c966a3f9d59bb494c3d8e30c5c3068bdb" }

derive/Cargo.toml

@@ -5,8 +5,8 @@ name = "gotham_restful_derive"
 version = "0.1.0-dev"
 authors = ["Dominic Meiser <git@msrd0.de>"]
 edition = "2018"
-description = "RESTful additions for Gotham - Derive"
+description = "RESTful additions for the gotham web framework - Derive"
-keywords = ["gotham", "rest", "restful", "derive"]
+keywords = ["gotham", "rest", "restful", "web", "http", "derive"]
 license = "EPL-2.0 OR Apache-2.0"
 repository = "https://gitlab.com/msrd0/gotham-restful"
 

gotham_restful/Cargo.toml

@@ -1,52 +0,0 @@
-# -*- eval: (cargo-minor-mode 1) -*-
-
-[package]
-name = "gotham_restful"
-version = "0.1.0-dev"
-authors = ["Dominic Meiser <git@msrd0.de>"]
-edition = "2018"
-description = "RESTful additions for Gotham"
-keywords = ["gotham", "rest", "restful"]
-license = "EPL-2.0 OR Apache-2.0"
-readme = "README.md"
-repository = "https://gitlab.com/msrd0/gotham-restful"
-
-[badges]
-gitlab = { repository = "msrd0/gotham-restful", branch = "master" }
-
-[dependencies]
-base64 = { version = "0.12.0", optional = true }
-chrono = { version = "0.4.11", optional = true }
-cookie = { version = "0.13.3", optional = true }
-futures-core = "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_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_restful_derive = { version = "0.1.0-dev" }
-indexmap = { version = "1.3.2", optional = true }
-itertools = "0.9.0"
-jsonwebtoken = { version = "7.1.0", optional = true }
-log = "0.4.8"
-mime = "0.3.16"
-openapiv3 = { version = "0.3", optional = true }
-serde = { version = "1.0.106", features = ["derive"] }
-serde_json = "1.0.52"
-thiserror = "1.0.16"
-uuid = { version = "0.8.1", optional = true }
-
-[dev-dependencies]
-diesel = { version = "1.4.4", features = ["postgres"] }
-futures-executor = "0.3.4"
-paste = "0.1.12"
-trybuild = "1.0.26"
-
-[features]
-default = ["errorlog"]
-auth = ["gotham_restful_derive/auth", "base64", "cookie", "jsonwebtoken"]
-errorlog = []
-database = ["gotham_restful_derive/database", "gotham_middleware_diesel"]
-openapi = ["gotham_restful_derive/openapi", "indexmap", "openapiv3"]
-
-[package.metadata.docs.rs]
-all-features = true

gotham_restful/README.md

@@ -1 +0,0 @@
-../README.md

gotham_restful_derive/LICENSE-Apache

@@ -1 +0,0 @@
-../LICENSE-Apache

gotham_restful_derive/LICENSE-EPL

@@ -1 +0,0 @@
-../LICENSE-EPL

gotham_restful_derive/LICENSE.md

@@ -1 +0,0 @@
-../LICENSE.md