Merge pull request #131 from jcrossley3/single-crate

Refactor runtime crates into feature-guarded modules

Author: slinkydeveloper

.github/workflows/rust_tests.yml

@@ -60,14 +60,14 @@ jobs:
       with:
         command: build
         toolchain: ${{ matrix.toolchain }}
-        args: --target ${{ matrix.target }} --workspace
+        args: --target ${{ matrix.target }} --workspace --all-features
     - uses: actions-rs/cargo@v1
       name: "Test"
       if: matrix.target == 'x86_64-unknown-linux-gnu'
       with:
         command: test
         toolchain: ${{ matrix.toolchain }}
-        args: --target ${{ matrix.target }} --workspace
+        args: --target ${{ matrix.target }} --workspace --all-features
 
     # If musl, compile and test all
     - uses: actions-rs/cargo@v1
@@ -76,7 +76,7 @@ jobs:
       with:
         command: build
         toolchain: ${{ matrix.toolchain }}
-        args: --target ${{ matrix.target }} --workspace
+        args: --target ${{ matrix.target }} --workspace --all-features
       env:
         CC: musl-gcc
         CXX: g++
@@ -86,19 +86,18 @@ jobs:
       with:
         command: test
         toolchain: ${{ matrix.toolchain }}
-        args: --target ${{ matrix.target }} --workspace
+        args: --target ${{ matrix.target }} --workspace --all-features
       env:
         CC: musl-gcc
         CXX: g++
 
-    # If wasm, then we test only the main module and cloudevents-sdk-reqwest
     - uses: actions-rs/cargo@v1
       name: "Build"
       if: matrix.target == 'wasm32-unknown-unknown'
       with:
         command: build
         toolchain: ${{ matrix.toolchain }}
-        args: --target wasm32-unknown-unknown --package cloudevents-sdk --package cloudevents-sdk-reqwest
+        args: --target wasm32-unknown-unknown --features cloudevents-reqwest
 
     # Build examples
     - uses: actions-rs/cargo@v1

Cargo.toml

@@ -16,6 +16,12 @@ categories = ["web-programming", "encoding", "data-structures"]
 [lib]
 name = "cloudevents"
 
+[features]
+cloudevents-actix = ["actix-web", "async-trait", "lazy_static", "bytes", "futures"]
+cloudevents-reqwest = ["reqwest", "async-trait", "lazy_static", "bytes"]
+cloudevents-rdkafka = ["rdkafka", "lazy_static", "bytes"]
+cloudevents-warp = ["warp", "lazy_static", "bytes", "http", "hyper"]
+
 [dependencies]
 serde = { version = "^1.0", features = ["derive"] }
 serde_json = "^1.0"
@@ -26,6 +32,18 @@ url = { version = "^2.1", features = ["serde"] }
 snafu = "^0.6"
 bitflags = "^1.2"
 
+# runtime optional deps
+actix-web = { version = "^3", default-features = false, optional = true }
+reqwest = { version = "^0.11", default-features = false, features = ["rustls-tls"], optional = true }
+rdkafka = { version = "^0.25", features = ["cmake-build"], optional = true }
+warp = { version = "^0.3", optional = true }
+async-trait = { version = "^0.1.33", optional = true }
+lazy_static = { version = "1.4.0", optional = true }
+bytes = { version = "^1.0", optional = true }
+futures = { version = "^0.3", optional = true }
+http = { version = "0.2", optional = true }
+hyper = { version = "^0.14", optional = true }
+
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies]
 hostname = "^0.3"
 uuid = { version = "^0.8", features = ["v4"] }
@@ -40,13 +58,22 @@ claim = "0.3.1"
 version-sync = "^0.9"
 serde_yaml = "0.8"
 
+# runtime dev-deps
+actix-rt = { version = "^1" }
+url = { version = "^2.1", features = ["serde"] }
+serde_json = { version = "^1.0" }
+chrono = { version = "^0.4", features = ["serde"] }
+mockito = "0.25.1"
+tokio = { version = "^1.0", features = ["full"] }
+mime = "0.3"
+
 [workspace]
 members = [
   ".",
   "cloudevents-sdk-actix-web",
   "cloudevents-sdk-reqwest",
   "cloudevents-sdk-rdkafka",
-  "cloudevents-sdk-warp"
+  "cloudevents-sdk-warp",
 ]
 exclude = [
   "example-projects/actix-web-example",

cloudevents-sdk-actix-web/Cargo.toml

@@ -17,7 +17,7 @@ cloudevents-sdk = { version = "0.3.0", path = ".." }
 actix-web = { version = "^3", default-features = false }
 async-trait = "^0.1.33"
 lazy_static = "1.4.0"
-bytes = "^0.5"
+bytes = "^1.0"
 futures = "^0.3"
 
 [dev-dependencies]

cloudevents-sdk-rdkafka/Cargo.toml

@@ -22,5 +22,5 @@ rdkafka = { version = "^0.25", features = ["cmake-build"] }
 url = { version = "^2.1" }
 serde_json = "^1.0"
 chrono = { version = "^0.4", features = ["serde"] }
-futures = "0.3.5"
+futures = "^0.3"
 version-sync = "^0.9"

example-projects/actix-web-example/Cargo.toml

@@ -5,8 +5,7 @@ authors = ["Francesco Guardiani <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-cloudevents-sdk = { path = "../.." }
-cloudevents-sdk-actix-web = { path = "../../cloudevents-sdk-actix-web" }
+cloudevents-sdk = { path = "../..", features = ["cloudevents-actix"] }
 actix-web = "^3"
 actix-cors = "^0.5"
 lazy_static = "1.4.0"

example-projects/actix-web-example/src/main.rs

@@ -1,6 +1,6 @@
 use actix_web::{get, post, web, App, HttpRequest, HttpResponse, HttpServer};
+use cloudevents::actix::{HttpRequestExt, HttpResponseBuilderExt};
 use cloudevents::{EventBuilder, EventBuilderV10};
-use cloudevents_sdk_actix_web::{HttpResponseBuilderExt, HttpRequestExt};
 use serde_json::json;
 
 #[post("/")]

example-projects/rdkafka-example/Cargo.toml

@@ -8,8 +8,7 @@ edition = "2018"
 
 [dependencies]
 async-trait = "^0.1.33"
-cloudevents-sdk = { path = "../.." }
-cloudevents-sdk-rdkafka = { path = "../../cloudevents-sdk-rdkafka" }
+cloudevents-sdk = { path = "../..", features = ["cloudevents-rdkafka"] }
 lazy_static = "1.4.0"
 bytes = "^1.0"
 url = { version = "^2.1", features = ["serde"] }

example-projects/rdkafka-example/src/main.rs

@@ -3,7 +3,7 @@ use futures::StreamExt;
 use serde_json::json;
 
 use cloudevents::{EventBuilder, EventBuilderV10};
-use cloudevents_sdk_rdkafka::{FutureRecordExt, MessageExt, MessageRecord};
+use cloudevents::rdkafka::{FutureRecordExt, MessageExt, MessageRecord};
 
 use rdkafka::config::{ClientConfig, RDKafkaLogLevel};
 use rdkafka::consumer::stream_consumer::StreamConsumer;

example-projects/reqwest-wasm-example/Cargo.toml

@@ -11,8 +11,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 reqwest = "^0.11"
-cloudevents-sdk = { path = "../.." }
-cloudevents-sdk-reqwest = { path = "../../cloudevents-sdk-reqwest" }
+cloudevents-sdk = { path = "../..", features = ["cloudevents-reqwest"] }
 url = { version = "^2.1" }
 web-sys = { version = "0.3.39", features = ["Window", "Location"] }
 wasm-bindgen-futures = "0.4.12"

example-projects/reqwest-wasm-example/src/lib.rs

@@ -1,5 +1,5 @@
+use cloudevents::reqwest::RequestBuilderExt;
 use cloudevents::{EventBuilder, EventBuilderV10};
-use cloudevents_sdk_reqwest::RequestBuilderExt;
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]