slumber-python 0.0.3__tar.gz → 4.2.0__tar.gz

{slumber_python-0.0.3 → slumber_python-4.2.0}/Cargo.lock

@@ -856,6 +856,7 @@ dependencies = [
  "clap",
  "itertools 0.13.0",
  "mdbook",
+ "quote",
  "serde_json",
  "syn 2.0.101",
 ]
@@ -877,9 +878,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
 [[package]]
 name = "editor-command"
-version = "1.0.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee98e369cc618396b828ba0231d5bc39857ee1d8e9dcb1c1adef49a21bb5c427"
+checksum = "233f7e1e39795915a24f5eac451b7f4e73b090ca60dd5d2bc7a06cc929e021b1"
 dependencies = [
  "shell-words",
 ]
@@ -1690,6 +1691,46 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
+[[package]]
+name = "jaq-core"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77526a72eb79412c29fd141767a6549bbfcb1cb40e00556fe16532d5e878e098"
+dependencies = [
+ "dyn-clone",
+ "once_cell",
+ "typed-arena",
+]
+
+[[package]]
+name = "jaq-json"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01dbdbd07b076e8403abac68ce7744d93e2ecd953bbc44bf77bf00e1e81172bc"
+dependencies = [
+ "foldhash",
+ "indexmap 2.9.0",
+ "jaq-core",
+ "jaq-std",
+ "serde_json",
+]
+
+[[package]]
+name = "jaq-std"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c264fe397c981705976c71f1bfe020382b9eda52ae950e57fe885e147bdd67d"
+dependencies = [
+ "aho-corasick",
+ "base64 0.22.1",
+ "chrono",
+ "jaq-core",
+ "libm",
+ "log",
+ "regex-lite",
+ "urlencoding",
+]
+
 [[package]]
 name = "jiff"
 version = "0.2.15"
@@ -1772,6 +1813,12 @@ version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
+[[package]]
+name = "libm"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+
 [[package]]
 name = "libredox"
 version = "0.1.3"
@@ -2555,7 +2602,6 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383"
 dependencies = [
- "anyhow",
  "indexmap 2.9.0",
  "indoc",
  "libc",
@@ -2893,6 +2939,12 @@ dependencies = [
  "regex-syntax",
 ]
 
+[[package]]
+name = "regex-lite"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da"
+
 [[package]]
 name = "regex-syntax"
 version = "0.8.5"
@@ -3453,7 +3505,7 @@ dependencies = [
 
 [[package]]
 name = "slumber"
-version = "4.1.0"
+version = "4.2.0"
 dependencies = [
  "anyhow",
  "console-subscriber",
@@ -3467,7 +3519,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_cli"
-version = "4.1.0"
+version = "4.2.0"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -3500,9 +3552,8 @@ dependencies = [
 
 [[package]]
 name = "slumber_config"
-version = "4.1.0"
+version = "4.2.0"
 dependencies = [
- "anyhow",
  "derive_more 1.0.0",
  "dirs",
  "editor-command",
@@ -3520,14 +3571,14 @@ dependencies = [
  "serde_yaml",
  "slumber_util",
  "terminput",
+ "thiserror 2.0.12",
  "tracing",
 ]
 
 [[package]]
 name = "slumber_core"
-version = "4.1.0"
+version = "4.2.0"
 dependencies = [
- "anyhow",
  "async-trait",
  "base64 0.22.1",
  "bytes",
@@ -3538,6 +3589,9 @@ dependencies = [
  "futures",
  "indexmap 2.9.0",
  "itertools 0.13.0",
+ "jaq-core",
+ "jaq-json",
+ "jaq-std",
  "mime",
  "pretty_assertions",
  "proptest",
@@ -3570,7 +3624,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_import"
-version = "4.1.0"
+version = "4.2.0"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -3602,7 +3656,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_macros"
-version = "4.1.0"
+version = "4.2.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3611,9 +3665,8 @@ dependencies = [
 
 [[package]]
 name = "slumber_python"
-version = "0.0.3"
+version = "4.2.0"
 dependencies = [
- "anyhow",
  "async-trait",
  "dialoguer",
  "indexmap 2.9.0",
@@ -3625,9 +3678,8 @@ dependencies = [
 
 [[package]]
 name = "slumber_template"
-version = "4.1.0"
+version = "4.2.0"
 dependencies = [
- "anyhow",
  "bytes",
  "derive_more 1.0.0",
  "futures",
@@ -3653,7 +3705,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_tui"
-version = "4.1.0"
+version = "4.2.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3669,6 +3721,7 @@ dependencies = [
  "notify-debouncer-full",
  "persisted",
  "pretty_assertions",
+ "proptest",
  "ratatui",
  "reqwest",
  "rstest",
@@ -3694,9 +3747,8 @@ dependencies = [
 
 [[package]]
 name = "slumber_util"
-version = "4.1.0"
+version = "4.2.0"
 dependencies = [
- "anyhow",
  "derive_more 1.0.0",
  "dirs",
  "env-lock",
@@ -4325,6 +4377,12 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
+[[package]]
+name = "typed-arena"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
+
 [[package]]
 name = "typenum"
 version = "1.18.0"
@@ -4420,6 +4478,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"

{slumber_python-0.0.3 → slumber_python-4.2.0}/Cargo.toml

@@ -20,7 +20,7 @@ homepage = "https://slumber.lucaspickering.me"
 keywords = ["rest", "http", "terminal", "tui"]
 license = "MIT"
 repository = "https://github.com/LucasPickering/slumber"
-version = "4.1.0"
+version = "4.2.0"
 # Keep in sync w/ rust-toolchain.toml
 rust-version = "1.88.0"
 
@@ -41,6 +41,9 @@ indexmap = {version = "2.0.0", default-features = false}
 itertools = "0.13.0"
 mime = "0.3.17"
 pretty_assertions = "1.4.0"
+proptest = "1.5.0"
+proptest-derive = "0.5.0"
+quote = "1.0.40"
 regex = {version = "1.10.5", default-features = false}
 reqwest = {version = "0.12.23", default-features = false}
 rstest = {version = "0.24.0", default-features = false}
@@ -51,14 +54,14 @@ 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 = "4.1.0" }
-slumber_config = {path = "./crates/config", version = "4.1.0" }
-slumber_core = {path = "./crates/core", version = "4.1.0" }
-slumber_import = {path = "./crates/import", version = "4.1.0" }
-slumber_macros = {path = "./crates/macros", version = "4.1.0" }
-slumber_template = {path = "./crates/template", version = "4.1.0" }
-slumber_tui = {path = "./crates/tui", version = "4.1.0" }
-slumber_util = {path = "./crates/util", version = "4.1.0" }
+slumber_cli = {path = "./crates/cli", version = "4.2.0" }
+slumber_config = {path = "./crates/config", version = "4.2.0" }
+slumber_core = {path = "./crates/core", version = "4.2.0" }
+slumber_import = {path = "./crates/import", version = "4.2.0" }
+slumber_macros = {path = "./crates/macros", version = "4.2.0" }
+slumber_template = {path = "./crates/template", version = "4.2.0" }
+slumber_tui = {path = "./crates/tui", version = "4.2.0" }
+slumber_util = {path = "./crates/util", version = "4.2.0" }
 strum = {version = "0.26.3", default-features = false}
 syn = "2.0.101"
 terminput = "0.5.3"
@@ -162,3 +165,5 @@ pr-run-mode = "plan"
 install-updater = false
 # Path that installers should place binaries in
 install-path = "CARGO_HOME"
+# Don't build non-distributed crates
+precise-builds = true

{slumber_python-0.0.3 → slumber_python-4.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slumber-python
-Version: 0.0.3
+Version: 4.2.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -30,14 +30,20 @@ pip install slumber-python
 
 ## Usage
 
+First, [create a Slumber collection](https://slumber.lucaspickering.me/getting_started.html).
+
 ```py
 
 from slumber import Collection
 
 collection = Collection()
-response = collection.request('get_current_user')
+response = collection.request('example_get')
 print(response.text)
 ```
 
 For more usage examples, [see the docs](https://slumber.lucaspickering.me/integration/python.html).
 
+## Versioning
+
+For simplicity, the version of this package is synched to the main Slumber version and follows the same [releases](https://github.com/LucasPickering/slumber/releases). That means there may be releases of this package that don't actually change anything, or version bumps that are higher than necessary (e.g. minor versions with only patch changes). The versioning **is still semver compliant**.
+

{slumber_python-0.0.3/crates/python → slumber_python-4.2.0}/README.md

@@ -18,13 +18,19 @@ pip install slumber-python
 
 ## Usage
 
+First, [create a Slumber collection](https://slumber.lucaspickering.me/getting_started.html).
+
 ```py
 
 from slumber import Collection
 
 collection = Collection()
-response = collection.request('get_current_user')
+response = collection.request('example_get')
 print(response.text)
 ```
 
 For more usage examples, [see the docs](https://slumber.lucaspickering.me/integration/python.html).
+
+## Versioning
+
+For simplicity, the version of this package is synched to the main Slumber version and follows the same [releases](https://github.com/LucasPickering/slumber/releases). That means there may be releases of this package that don't actually change anything, or version bumps that are higher than necessary (e.g. minor versions with only patch changes). The versioning **is still semver compliant**.

{slumber_python-0.0.3 → slumber_python-4.2.0}/crates/config/Cargo.toml

@@ -11,9 +11,8 @@ rust-version = {workspace = true}
 version = {workspace = true}
 
 [dependencies]
-anyhow = {workspace = true}
 derive_more = {workspace = true, features = ["deref", "display"]}
-editor-command = {version = "1.0.0", optional = true}
+editor-command = "2.0.0"
 glob = {version = "0.3.2", optional = true}
 indexmap = {workspace = true, features = ["serde"]}
 itertools = {workspace = true}
@@ -24,6 +23,7 @@ serde = {workspace = true, features = ["derive"]}
 serde_yaml = {workspace = true}
 slumber_util = {workspace = true}
 terminput = {workspace = true, optional = true}
+thiserror = {workspace = true}
 tracing = {workspace = true}
 
 [dev-dependencies]
@@ -37,7 +37,7 @@ slumber_util = {workspace = true, features = ["test"]}
 [features]
 schema = ["dep:schemars"]
 # TUI-specific config fields and dependencies are gated behind this flag
-tui = ["dep:editor-command", "dep:glob", "dep:mime", "dep:ratatui-core", "dep:terminput"]
+tui = ["dep:glob", "dep:mime", "dep:ratatui-core", "dep:terminput"]
 
 [lints]
 workspace = true

{slumber_python-0.0.3 → slumber_python-4.2.0}/crates/config/src/cereal.rs

@@ -7,7 +7,8 @@
 
 use crate::{Config, HttpEngineConfig};
 use slumber_util::yaml::{
-    self, DeserializeYaml, Expected, Field, SourcedYaml, StructDeserializer,
+    self, DeserializeYaml, Expected, Field, SourceMap, SourcedYaml,
+    StructDeserializer,
 };
 
 impl DeserializeYaml for Config {
@@ -15,18 +16,24 @@ impl DeserializeYaml for Config {
         Expected::Mapping
     }
 
-    fn deserialize(mut yaml: SourcedYaml) -> yaml::Result<Self> {
+    fn deserialize(
+        mut yaml: SourcedYaml,
+        source_map: &SourceMap,
+    ) -> yaml::Result<Self> {
         // Drop all fields starting with `.`
         yaml.drop_dot_fields();
 
+        let default = Self::default();
         let mut deserializer = StructDeserializer::new(yaml)?;
 
         let config = Self {
+            editor: deserializer
+                .get(Field::new("editor").or(default.editor), source_map)?,
             // Both these configs get flattened to the top, so they share the
             // same deserializer
-            http: deserialize_http_config(&mut deserializer)?,
+            http: deserialize_http_config(&mut deserializer, source_map)?,
             #[cfg(feature = "tui")]
-            tui: tui::deserialize_tui_config(&mut deserializer)?,
+            tui: tui::deserialize_tui_config(&mut deserializer, source_map)?,
         };
 
         // If we're not running in TUI mode, we know there's still TUI fields
@@ -44,17 +51,23 @@ impl DeserializeYaml for Config {
 /// Deserialize HTTP-specific config fields from an existing deserializer
 fn deserialize_http_config(
     deserializer: &mut StructDeserializer,
+    source_map: &SourceMap,
 ) -> yaml::Result<HttpEngineConfig> {
     let default = HttpEngineConfig::default();
     Ok(HttpEngineConfig {
         ignore_certificate_hosts: deserializer.get(
             Field::new("ignore_certificate_hosts")
                 .or(default.ignore_certificate_hosts),
+            source_map,
+        )?,
+        large_body_size: deserializer.get(
+            Field::new("large_body_size").or(default.large_body_size),
+            source_map,
+        )?,
+        follow_redirects: deserializer.get(
+            Field::new("follow_redirects").or(default.follow_redirects),
+            source_map,
         )?,
-        large_body_size: deserializer
-            .get(Field::new("large_body_size").or(default.large_body_size))?,
-        follow_redirects: deserializer
-            .get(Field::new("follow_redirects").or(default.follow_redirects))?,
     })
 }
 
@@ -65,30 +78,35 @@ mod tui {
     use ratatui_core::style::Color;
     use serde::de::{self, value::StringDeserializer};
     use slumber_util::yaml::{
-        self, DeserializeYaml, Expected, Field, LocatedError, SourcedYaml,
-        StructDeserializer,
+        self, DeserializeYaml, Expected, Field, LocatedError, SourceMap,
+        SourcedYaml, StructDeserializer,
     };
 
     /// Deserialize TUI-specific config fields from an existing deserializer
     pub fn deserialize_tui_config(
         deserializer: &mut StructDeserializer,
+        source_map: &SourceMap,
     ) -> yaml::Result<TuiConfig> {
         let default = TuiConfig::default();
         Ok(TuiConfig {
             commands: deserializer
-                .get(Field::new("commands").or(default.commands))?,
-            editor: deserializer
-                .get(Field::new("editor").or(default.editor))?,
-            pager: deserializer.get(Field::new("pager").or(default.pager))?,
+                .get(Field::new("commands").or(default.commands), source_map)?,
+            pager: deserializer
+                .get(Field::new("pager").or(default.pager), source_map)?,
             preview_templates: deserializer.get(
                 Field::new("preview_templates").or(default.preview_templates),
+                source_map,
+            )?,
+            input_bindings: deserializer.get(
+                Field::new("input_bindings").or(default.input_bindings),
+                source_map,
             )?,
-            input_bindings: deserializer
-                .get(Field::new("input_bindings").or(default.input_bindings))?,
-            theme: deserializer.get(Field::new("theme").or(default.theme))?,
-            debug: deserializer.get(Field::new("debug").or(default.debug))?,
+            theme: deserializer
+                .get(Field::new("theme").or(default.theme), source_map)?,
+            debug: deserializer
+                .get(Field::new("debug").or(default.debug), source_map)?,
             persist: deserializer
-                .get(Field::new("persist").or(default.persist))?,
+                .get(Field::new("persist").or(default.persist), source_map)?,
         })
     }
 
@@ -97,14 +115,18 @@ mod tui {
             Expected::Mapping
         }
 
-        fn deserialize(yaml: SourcedYaml) -> yaml::Result<Self> {
+        fn deserialize(
+            yaml: SourcedYaml,
+            source_map: &SourceMap,
+        ) -> yaml::Result<Self> {
             let default = Self::default();
             let mut deserializer = StructDeserializer::new(yaml)?;
             let config = Self {
                 shell: deserializer
-                    .get(Field::new("shell").or(default.shell))?,
+                    .get(Field::new("shell").or(default.shell), source_map)?,
                 default_query: deserializer.get(
                     Field::new("default_query").or(default.default_query),
+                    source_map,
                 )?,
             };
             deserializer.done()?;
@@ -117,7 +139,10 @@ mod tui {
             Expected::Mapping
         }
 
-        fn deserialize(yaml: SourcedYaml) -> yaml::Result<Self> {
+        fn deserialize(
+            yaml: SourcedYaml,
+            source_map: &SourceMap,
+        ) -> yaml::Result<Self> {
             let default = Self::default();
             let mut deserializer = StructDeserializer::new(yaml)?;
             let config = Self {
@@ -125,30 +150,35 @@ mod tui {
                     .get::<Adopt<_>>(
                         Field::new("primary_color")
                             .or(Adopt(default.primary_color)),
+                        source_map,
                     )?
                     .0,
                 primary_text_color: deserializer
                     .get::<Adopt<_>>(
                         Field::new("primary_text_color")
                             .or(Adopt(default.primary_text_color)),
+                        source_map,
                     )?
                     .0,
                 secondary_color: deserializer
                     .get::<Adopt<_>>(
                         Field::new("secondary_color")
                             .or(Adopt(default.secondary_color)),
+                        source_map,
                     )?
                     .0,
                 success_color: deserializer
                     .get::<Adopt<_>>(
                         Field::new("success_color")
                             .or(Adopt(default.success_color)),
+                        source_map,
                     )?
                     .0,
                 error_color: deserializer
                     .get::<Adopt<_>>(
                         Field::new("error_color")
                             .or(Adopt(default.error_color)),
+                        source_map,
                     )?
                     .0,
             };
@@ -166,7 +196,10 @@ mod tui {
             Expected::String
         }
 
-        fn deserialize(yaml: SourcedYaml) -> yaml::Result<Self> {
+        fn deserialize(
+            yaml: SourcedYaml,
+            _source_map: &SourceMap,
+        ) -> yaml::Result<Self> {
             let location = yaml.location;
             let s = yaml.try_into_string()?;
             // Use the serde implementation for backward compatibility