slumber-python 5.3.0__tar.gz → 5.4.2__tar.gz

{slumber_python-5.3.0 → slumber_python-5.4.2}/Cargo.lock

@@ -26,6 +26,21 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "alloc-no-stdlib"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
+
+[[package]]
+name = "alloc-stdlib"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e76a019e91224d279006ff972f1e984179a6e9feb050adba6ce8274aef23195"
+dependencies = [
+ "alloc-no-stdlib",
+]
+
 [[package]]
 name = "allocator-api2"
 version = "0.2.21"
@@ -131,15 +146,27 @@ dependencies = [
  "wait-timeout",
 ]
 
+[[package]]
+name = "async-compression"
+version = "0.4.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68650b7df54f0293fd061972a0fb05aaf4fc0879d3b3d21a638a182c5c543b9f"
+dependencies = [
+ "compression-codecs",
+ "compression-core",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "async-trait"
-version = "0.1.89"
+version = "0.1.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -309,6 +336,27 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "brotli"
+version = "8.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
+[[package]]
+name = "brotli-decompressor"
+version = "5.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a32acac15fe1967bc3986b2a6347dffc965602354ea6f450ad07e8bfd253583"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+]
+
 [[package]]
 name = "bstr"
 version = "1.12.1"
@@ -492,6 +540,26 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "compression-codecs"
+version = "0.4.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00828ba6fd27b45a448e57dbfe84f1029d4c9f26b368157e9a448a5f49a2ec2a"
+dependencies = [
+ "brotli",
+ "compression-core",
+ "flate2",
+ "memchr",
+ "zstd",
+ "zstd-safe",
+]
+
+[[package]]
+name = "compression-core"
+version = "0.4.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d"
+
 [[package]]
 name = "console"
 version = "0.16.2"
@@ -809,7 +877,7 @@ dependencies = [
 
 [[package]]
 name = "doc_utils"
-version = "5.3.0"
+version = "5.4.2"
 dependencies = [
  "anyhow",
  "clap",
@@ -3280,7 +3348,7 @@ checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "slumber"
-version = "5.3.0"
+version = "5.4.2"
 dependencies = [
  "anyhow",
  "slumber_cli",
@@ -3292,7 +3360,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_cli"
-version = "5.3.0"
+version = "5.4.2"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -3327,7 +3395,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_config"
-version = "5.3.0"
+version = "5.4.2"
 dependencies = [
  "derive_more",
  "dirs",
@@ -3352,7 +3420,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_console"
-version = "5.3.0"
+version = "5.4.2"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3366,7 +3434,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_core"
-version = "5.3.0"
+version = "5.4.2"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3414,7 +3482,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_import"
-version = "5.3.0"
+version = "5.4.2"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -3446,7 +3514,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_macros"
-version = "5.3.0"
+version = "5.4.2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3455,7 +3523,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_python"
-version = "5.3.0"
+version = "5.4.2"
 dependencies = [
  "async-trait",
  "indexmap",
@@ -3469,7 +3537,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_template"
-version = "5.3.0"
+version = "5.4.2"
 dependencies = [
  "bytes",
  "derive_more",
@@ -3496,7 +3564,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_tui"
-version = "5.3.0"
+version = "5.4.2"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3538,7 +3606,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_util"
-version = "5.3.0"
+version = "5.4.2"
 dependencies = [
  "console-subscriber",
  "derive_more",
@@ -3660,6 +3728,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "syn"
+version = "3.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "sync_wrapper"
 version = "1.0.2"
@@ -4048,13 +4127,18 @@ version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
 dependencies = [
+ "async-compression",
  "bitflags 2.10.0",
  "bytes",
+ "futures-core",
  "futures-util",
  "http",
  "http-body",
+ "http-body-util",
  "iri-string",
  "pin-project-lite",
+ "tokio",
+ "tokio-util",
  "tower",
  "tower-layer",
  "tower-service",
@@ -5004,3 +5088,31 @@ name = "zmij"
 version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd8f3f50b848df28f887acb68e41201b5aea6bc8a8dacc00fb40635ff9a72fea"
+
+[[package]]
+name = "zstd"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "7.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
+dependencies = [
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.16+zstd.1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
+dependencies = [
+ "cc",
+ "pkg-config",
+]

{slumber_python-5.3.0 → slumber_python-5.4.2}/Cargo.toml

@@ -9,9 +9,9 @@ homepage = "https://slumber.lucaspickering.me"
 keywords = ["rest", "http", "terminal", "tui"]
 license = "MIT"
 repository = "https://github.com/LucasPickering/slumber"
-version = "5.3.0"
+version = "5.4.2"
 # Keep in sync w/ rust-toolchain.toml
-rust-version = "1.90.0"
+rust-version = "1.99.0"
 
 # Dependencies used in multiple crates get de-duplicated here
 [workspace.dependencies]
@@ -43,15 +43,15 @@ serde_json = {version = "1.0.120", default-features = false, features = ["preser
 serde_json_path = "0.7.1"
 serde_test = "1.0.176"
 serde_yaml = {version = "0.9.0", default-features = false}
-slumber_cli = {path = "./crates/cli", version = "5.3.0" }
-slumber_config = {path = "./crates/config", version = "5.3.0", default-features = false}
-slumber_console = {path = "./crates/console", version = "5.3.0" }
-slumber_core = {path = "./crates/core", version = "5.3.0" }
-slumber_import = {path = "./crates/import", version = "5.3.0" }
-slumber_macros = {path = "./crates/macros", version = "5.3.0" }
-slumber_template = {path = "./crates/template", version = "5.3.0" }
-slumber_tui = {path = "./crates/tui", version = "5.3.0" }
-slumber_util = {path = "./crates/util", version = "5.3.0" }
+slumber_cli = {path = "./crates/cli", version = "5.4.2" }
+slumber_config = {path = "./crates/config", version = "5.4.2", default-features = false}
+slumber_console = {path = "./crates/console", version = "5.4.2" }
+slumber_core = {path = "./crates/core", version = "5.4.2" }
+slumber_import = {path = "./crates/import", version = "5.4.2" }
+slumber_macros = {path = "./crates/macros", version = "5.4.2" }
+slumber_template = {path = "./crates/template", version = "5.4.2" }
+slumber_tui = {path = "./crates/tui", version = "5.4.2" }
+slumber_util = {path = "./crates/util", version = "5.4.2" }
 strum = {version = "0.27.0", default-features = false}
 syn = "2.0.101"
 terminput = "0.5.3"
@@ -92,6 +92,7 @@ needless_pass_by_value = "allow"
 similar_names = "allow"
 single_match = "allow"
 too_many_lines = "allow"
+unused_async_trait_impl = "allow"
 unused_self = "allow"
 used_underscore_binding = "allow"
 

{slumber_python-5.3.0 → slumber_python-5.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slumber-python
-Version: 5.3.0
+Version: 5.4.2
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{slumber_python-5.3.0 → slumber_python-5.4.2}/crates/core/Cargo.toml

@@ -25,7 +25,7 @@ jaq-json = {version = "1.1.3", default-features = false, features = ["serde_json
 jaq-std = "2.1.2"
 mime = {workspace = true}
 regex = {workspace = true}
-reqwest = {workspace = true, features = ["json", "form", "multipart", "query", "rustls", "stream"]}
+reqwest = {workspace = true, features = ["brotli", "deflate", "form", "gzip", "json", "multipart", "query", "rustls", "stream", "zstd"]}
 rstest = {workspace = true, optional = true}
 rusqlite = {version = "0.38.0", default-features = false, features = ["bundled", "chrono", "uuid"]}
 rusqlite_migration = "2.4.0"

{slumber_python-5.3.0 → slumber_python-5.4.2}/crates/core/src/database/convert.rs

@@ -353,7 +353,7 @@ impl FromSql for SqlWrap<Bytes> {
 impl FromSql for SqlWrap<StatusCode> {
     fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> {
         let code: u16 = value.as_i64()?.try_into().map_err(error_other)?;
-        let code = StatusCode::from_u16(code as u16).map_err(error_other)?;
+        let code = StatusCode::from_u16(code).map_err(error_other)?;
         Ok(Self(code))
     }
 }

{slumber_python-5.3.0 → slumber_python-5.4.2}/crates/core/src/database/tests.rs

@@ -293,7 +293,7 @@ fn test_request_body(#[case] body: RequestBody) {
     });
 
     database.insert_exchange(&exchange).unwrap();
-    let actual = database.get_request(exchange.id).unwrap().unwrap();
+    let actual = database.get_exchange(exchange.id).unwrap().unwrap();
 
     // What goes in is what comes out
     assert_eq!(actual.request.body, body);

{slumber_python-5.3.0 → slumber_python-5.4.2}/crates/core/src/database.rs

@@ -392,8 +392,8 @@ impl CollectionDatabase {
             .traced();
     }
 
-    /// Get a request by ID, or `None` if it does not exist in history.
-    pub fn get_request(
+    /// Get an exchange by ID, or `None` if not in the database
+    pub fn get_exchange(
         &self,
         request_id: RequestId,
     ) -> Result<Option<Exchange>, DatabaseError> {

{slumber_python-5.3.0 → slumber_python-5.4.2}/crates/core/src/http/tests.rs

@@ -1082,7 +1082,7 @@ async fn test_send_request(http_engine: HttpEngine) {
     );
 
     // Ensure it was persisted
-    assert_eq!(database.get_request(exchange.id).unwrap(), Some(exchange));
+    assert_eq!(database.get_exchange(exchange.id).unwrap(), Some(exchange));
 }
 
 /// Leading/trailing newlines should be stripped from rendered header

{slumber_python-5.3.0 → slumber_python-5.4.2}/crates/core/src/render/tests.rs

@@ -923,7 +923,7 @@ async fn test_response_header(
             ..ResponseRecord::factory(id)
         }
         .into(),
-        end_time: Utc::now() - Duration::from_secs(60 * 60),
+        end_time: Utc::now() - Duration::from_hours(1),
         ..Exchange::factory((id, None, recipe.id.clone()))
     };
     database.insert_exchange(&exchange).unwrap();

{slumber_python-5.3.0 → slumber_python-5.4.2}/crates/core/src/render.rs

@@ -212,6 +212,7 @@ impl TemplateContext {
     }
 }
 
+/// Template context when producing eager values (where streams aren't allowed)
 impl Context<Value> for TemplateContext {
     async fn get_field(
         &self,
@@ -241,11 +242,14 @@ impl Context<Value> for TemplateContext {
     }
 }
 
+/// Template context when producing lazy values (where streams are allowed)
 impl Context<ValueStream> for TemplateContext {
     async fn get_field(
         &self,
         field: &Identifier,
     ) -> Result<ValueStream, RenderError> {
+        // Streams can't be cached because they can only be resolved once. If
+        // the value is cached, it must be eager.
         let guard = match self.get_field_cache_guard(field).await {
             FieldCacheOutcome::Hit(value) => return Ok(value.into()),
             FieldCacheOutcome::Miss(guard) => guard,

{slumber_python-5.3.0 → slumber_python-5.4.2}/crates/util/src/lib.rs

@@ -143,11 +143,11 @@ where
 /// use slumber_util::doc_link;
 /// assert_eq!(
 ///     doc_link("api/chain"),
-///     "https://slumber.lucaspickering.me/api/chain.html",
+///     "https://slmbr.dev/api/chain.html",
 /// );
 /// ```
 pub fn doc_link(path: &str) -> String {
-    const ROOT: &str = "https://slumber.lucaspickering.me/";
+    const ROOT: &str = "https://slmbr.dev/";
     if path.is_empty() {
         ROOT.into()
     } else {
@@ -414,7 +414,7 @@ mod tests {
     #[case::seconds_longer("100s", Duration::from_secs(100))]
     #[case::minutes("3m", Duration::from_secs(180))]
     #[case::hours("3h", Duration::from_secs(10_800))]
-    #[case::days("2d", Duration::from_secs(172_800))]
+    #[case::days("2d", Duration::from_hours(48))]
     #[case::composite("2d3h10m17s", Duration::from_secs(
         2 * 86400 + 3 * 3600 + 10 * 60 + 17
     ))]