split cookie store and memory store into workspace crates

Author: jbr

Cargo.toml

@@ -1,43 +1,3 @@
-[package]
-name = "async-session"
-version = "3.0.0"
-license = "MIT OR Apache-2.0"
-repository = "https://github.com/http-rs/async-session"
-documentation = "https://docs.rs/async-session"
-description = "Async session support with pluggable stores"
-readme = "README.md"
-edition = "2021"
-keywords = []
-categories = []
-authors = [
-  "Yoshua Wuyts <yoshuawuyts@gmail.com>",
-  "Jacob Rothstein <hi@jbr.me>"
-]
-
-[features]
-default = ["memory-store", "cookie-store"]
-memory-store = ["dashmap", "thiserror", "log"]
-cookie-store = ["bincode-json", "thiserror"]
-
-[dependencies]
-async-trait = "0.1.64"
-rand = "0.8.5"
-base64 = "0.21.0"
-serde_json = "1.0.93"
-blake3 = "1.3.3"
-log = { version = "0.4.17", optional = true }
-dashmap = { version = "5.4.0", optional = true }
-bincode-json = { version = "0.1.5", features = ["json"], optional = true }
-thiserror = { version = "1.0.38", optional = true }
-
-[dependencies.serde]
-version = "1.0.152"
-features = ["derive"]
-
-[dependencies.time]
-version = "0.3.18"
-features = ["serde"]
-
-[dev-dependencies.async-std]
-version = "1.12.0"
-features = ["attributes"]
+[workspace]
+resolver = "2"
+members = ["async-session", "memory-store", "cookie-store"]

async-session/Cargo.toml

@@ -0,0 +1,37 @@
+[package]
+name = "async-session"
+version = "3.0.0"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/http-rs/async-session"
+documentation = "https://docs.rs/async-session"
+description = "Async session support with pluggable stores"
+readme = "README.md"
+edition = "2021"
+keywords = []
+categories = []
+authors = [
+  "Yoshua Wuyts <yoshuawuyts@gmail.com>",
+  "Jacob Rothstein <hi@jbr.me>"
+]
+
+[dependencies]
+async-trait = "0.1.64"
+rand = "0.8.5"
+base64 = "0.21.0"
+serde_json = "1.0.93"
+blake3 = "1.3.3"
+
+[dependencies.serde]
+version = "1.0.152"
+features = ["derive"]
+
+[dependencies.time]
+version = "0.3.18"
+features = ["serde"]
+
+[dev-dependencies.async-std]
+version = "1.12.0"
+features = ["attributes"]
+
+[dev-dependencies]
+async-session-memory-store = {path = "../memory-store"}

src/lib.rs renamed to async-session/src/lib.rs

@@ -8,7 +8,8 @@
 //! # Example
 //!
 //! ```
-//! use async_session::{Session, SessionStore, MemoryStore};
+//! use async_session::{Session, SessionStore};
+//! use async_session_memory_store::MemoryStore;
 //!
 //! # fn main() -> Result<(), Box<dyn std::error::Error>> {
 //! # async_std::task::block_on(async {
@@ -46,17 +47,9 @@
     unused_qualifications
 )]
 
-#[cfg(feature = "cookie-store")]
-mod cookie_store;
-#[cfg(feature = "memory-store")]
-mod memory_store;
 mod session;
 mod session_store;
 
-#[cfg(feature = "cookie-store")]
-pub use cookie_store::{CookieStore, CookieStoreError};
-#[cfg(feature = "memory-store")]
-pub use memory_store::{MemoryStore, MemoryStoreError};
 pub use session::Session;
 pub use session_store::SessionStore;
 

src/session.rs renamed to async-session/src/session.rs

@@ -0,0 +1,14 @@
+[package]
+name = "async-session-cookie-store"
+version = "0.0.0"
+edition = "2021"
+
+[dependencies]
+async-session = { path = "../async-session", version = "3.0.0" }
+base64 = "0.21.0"
+bincode-json = { version = "0.1.5", features = ["json"] }
+serde_json = "1.0.95"
+thiserror = "1.0.38"
+
+[dev-dependencies]
+async-std = { version = "1.12.0", features = ["attributes"] }

src/session_store.rs renamed to async-session/src/session_store.rs

@@ -1,4 +1,4 @@
-use crate::{async_trait, Session, SessionStore};
+use async_session::{async_trait, Session, SessionStore};
 use base64::{engine::general_purpose::STANDARD as BASE64, Engine};
 
 /// A session store that serializes the entire session into a Cookie.

tests/test.rs renamed to async-session/tests/test.rs

@@ -0,0 +1,17 @@
+[package]
+name = "async-session-memory-store"
+version = "0.0.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+async-session = { path = "../async-session", version = "3.0.0" }
+log = "0.4.17"
+dashmap = "5.4.0"
+thiserror = "1.0.40"
+base64 = "0.21.0"
+serde_json = "1.0.95"
+
+[dev-dependencies]
+async-std = { version = "1.12.0", features = ["attributes"] }

cookie-store/Cargo.toml

@@ -1,4 +1,4 @@
-use crate::{async_trait, Session, SessionStore};
+use async_session::{async_trait, Session, SessionStore};
 use dashmap::{mapref::entry::Entry::Occupied, DashMap};
 use std::sync::Arc;
 
@@ -92,7 +92,8 @@ impl MemoryStore {
     /// returns the number of elements in the memory store
     /// # Example
     /// ```rust
-    /// # use async_session::{MemoryStore, Session, SessionStore};
+    /// # use async_session::{Session, SessionStore};
+    /// # use async_session_memory_store::MemoryStore;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> { async_std::task::block_on(async {
     /// let mut store = MemoryStore::new();
     /// assert_eq!(store.count(), 0);