slumber-python 5.0.0__tar.gz → 5.1.0__tar.gz

{slumber_python-5.0.0 → slumber_python-5.1.0}/Cargo.lock

@@ -809,7 +809,7 @@ dependencies = [
 
 [[package]]
 name = "doc_utils"
-version = "5.0.0"
+version = "5.1.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -3280,7 +3280,7 @@ checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "slumber"
-version = "5.0.0"
+version = "5.1.0"
 dependencies = [
  "anyhow",
  "console-subscriber",
@@ -3294,7 +3294,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_cli"
-version = "5.0.0"
+version = "5.1.0"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -3329,7 +3329,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_config"
-version = "5.0.0"
+version = "5.1.0"
 dependencies = [
  "derive_more",
  "dirs",
@@ -3354,7 +3354,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_core"
-version = "5.0.0"
+version = "5.1.0"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3402,7 +3402,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_import"
-version = "5.0.0"
+version = "5.1.0"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -3434,7 +3434,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_macros"
-version = "5.0.0"
+version = "5.1.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3443,7 +3443,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_python"
-version = "5.0.0"
+version = "5.1.0"
 dependencies = [
  "async-trait",
  "dialoguer",
@@ -3457,7 +3457,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_template"
-version = "5.0.0"
+version = "5.1.0"
 dependencies = [
  "bytes",
  "derive_more",
@@ -3484,7 +3484,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_tui"
-version = "5.0.0"
+version = "5.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3525,7 +3525,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_util"
-version = "5.0.0"
+version = "5.1.0"
 dependencies = [
  "derive_more",
  "dirs",

{slumber_python-5.0.0 → slumber_python-5.1.0}/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.0.0"
+version = "5.1.0"
 # Keep in sync w/ rust-toolchain.toml
-rust-version = "1.88.0"
+rust-version = "1.90.0"
 
 # Dependencies used in multiple crates get de-duplicated here
 [workspace.dependencies]
@@ -43,14 +43,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 = "5.0.0" }
-slumber_config = {path = "./crates/config", version = "5.0.0", default-features = false }
-slumber_core = {path = "./crates/core", version = "5.0.0" }
-slumber_import = {path = "./crates/import", version = "5.0.0" }
-slumber_macros = {path = "./crates/macros", version = "5.0.0" }
-slumber_template = {path = "./crates/template", version = "5.0.0" }
-slumber_tui = {path = "./crates/tui", version = "5.0.0" }
-slumber_util = {path = "./crates/util", version = "5.0.0" }
+slumber_cli = {path = "./crates/cli", version = "5.1.0" }
+slumber_config = {path = "./crates/config", version = "5.1.0", default-features = false }
+slumber_core = {path = "./crates/core", version = "5.1.0" }
+slumber_import = {path = "./crates/import", version = "5.1.0" }
+slumber_macros = {path = "./crates/macros", version = "5.1.0" }
+slumber_template = {path = "./crates/template", version = "5.1.0" }
+slumber_tui = {path = "./crates/tui", version = "5.1.0" }
+slumber_util = {path = "./crates/util", version = "5.1.0" }
 strum = {version = "0.27.0", default-features = false}
 syn = "2.0.101"
 terminput = "0.5.3"

{slumber_python-5.0.0 → slumber_python-5.1.0}/PKG-INFO

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

slumber_python-5.1.0/crates/config/src/cereal.rs

@@ -0,0 +1,75 @@
+//! Deserialization for config types. Unfortunately these have to be handwritten
+//! to enable the use of saphyr
+//!
+//! We can delete this if
+//! [saphyr-serde](https://docs.rs/saphyr-serde/latest/saphyr_serde/) gets
+//! built.
+
+use crate::{Config, HttpEngineConfig};
+use slumber_util::yaml::{
+    self, DeserializeYaml, Expected, Field, SourceMap, SourcedYaml,
+    StructDeserializer,
+};
+
+impl DeserializeYaml for Config {
+    fn expected() -> Expected {
+        Expected::Mapping
+    }
+
+    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, source_map)?,
+            #[cfg(feature = "tui")]
+            tui: crate::tui::deserialize_tui_config(
+                &mut deserializer,
+                source_map,
+            )?,
+        };
+
+        // If we're not running in TUI mode, we know there's still TUI fields
+        // in the YAML, so we don't want to fail for those. If all fields are
+        // enabled though, extraneous fields should error.
+        #[cfg(feature = "tui")]
+        {
+            deserializer.done()?;
+        }
+
+        Ok(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,
+        )?,
+    })
+}

{slumber_python-5.0.0 → slumber_python-5.1.0}/crates/config/src/lib.rs

@@ -48,9 +48,9 @@ const DEFAULT_OLD: &str = include_str!("default_old.yml");
 /// picked up until the app restarts.
 #[derive(Debug, Default, Serialize)]
 #[cfg_attr(test, derive(PartialEq))]
-#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[cfg_attr(
     feature = "schema",
+    derive(schemars::JsonSchema),
     schemars(
         default,
         // Allow any top-level property beginning with .
@@ -58,7 +58,7 @@ const DEFAULT_OLD: &str = include_str!("default_old.yml");
             "^\\.": { "description": "Ignore any property beginning with `.`" }
         }),
         example = Config::default(),
-    )
+    ),
 )]
 pub struct Config {
     /// Command to use for in-app editing. If provided, overrides
@@ -235,8 +235,7 @@ impl Config {
 /// Configuration for the engine that handles HTTP requests
 #[derive(Debug, Serialize)]
 #[cfg_attr(test, derive(PartialEq))]
-#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
-#[cfg_attr(feature = "schema", schemars(default))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema), schemars(default))]
 pub struct HttpEngineConfig {
     /// TLS cert errors on these hostnames are ignored. Be careful!
     pub ignore_certificate_hosts: Vec<String>,

slumber_python-5.1.0/crates/config/src/tui/cereal.rs

@@ -0,0 +1,201 @@
+//! TUI-specific config deserialization
+
+use crate::tui::{Color, CommandsConfig, Syntax, Theme, TuiConfig};
+use serde::de::{self, value::StringDeserializer};
+use slumber_util::yaml::{
+    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 {
+        mime_overrides: deserializer.get(
+            Field::new("mime_overrides").or(default.mime_overrides),
+            source_map,
+        )?,
+        commands: deserializer
+            .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,
+        )?,
+        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), source_map)?,
+    })
+}
+
+impl DeserializeYaml for CommandsConfig {
+    fn expected() -> Expected {
+        Expected::Mapping
+    }
+
+    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), source_map)?,
+            default_query: deserializer.get(
+                Field::new("default_query").or(default.default_query),
+                source_map,
+            )?,
+        };
+        deserializer.done()?;
+        Ok(config)
+    }
+}
+
+impl DeserializeYaml for Theme {
+    fn expected() -> Expected {
+        Expected::Mapping
+    }
+
+    fn deserialize(
+        yaml: SourcedYaml,
+        source_map: &SourceMap,
+    ) -> yaml::Result<Self> {
+        let default = Self::default();
+        let mut deserializer = StructDeserializer::new(yaml)?;
+        let config = Self {
+            primary_color: deserializer.get(
+                Field::new("primary_color").or(default.primary_color),
+                source_map,
+            )?,
+            primary_text_color: deserializer.get(
+                Field::new("primary_text_color").or(default.primary_text_color),
+                source_map,
+            )?,
+            secondary_color: deserializer.get(
+                Field::new("secondary_color").or(default.secondary_color),
+                source_map,
+            )?,
+            success_color: deserializer.get(
+                Field::new("success_color").or(default.success_color),
+                source_map,
+            )?,
+            error_color: deserializer.get(
+                Field::new("error_color").or(default.error_color),
+                source_map,
+            )?,
+            text_color: deserializer.get(
+                Field::new("text_color").or(default.text_color),
+                source_map,
+            )?,
+            background_color: deserializer.get(
+                Field::new("background_color").or(default.background_color),
+                source_map,
+            )?,
+            border_color: deserializer.get(
+                Field::new("border_color").or(default.border_color),
+                source_map,
+            )?,
+            disabled_color: deserializer.get(
+                Field::new("disabled_color").or(default.disabled_color),
+                source_map,
+            )?,
+            hint_text_color: deserializer.get(
+                Field::new("hint_text_color").or(default.hint_text_color),
+                source_map,
+            )?,
+            text_box_background_color: deserializer.get(
+                Field::new("text_box_background_color")
+                    .or(default.text_box_background_color),
+                source_map,
+            )?,
+            alternate_row_background_color: deserializer.get(
+                Field::new("alternate_row_background_color")
+                    .or(default.alternate_row_background_color),
+                source_map,
+            )?,
+            alternate_row_text_color: deserializer.get(
+                Field::new("alternate_row_text_color")
+                    .or(default.alternate_row_text_color),
+                source_map,
+            )?,
+            syntax: deserializer
+                .get(Field::new("syntax").or(default.syntax), source_map)?,
+        };
+        deserializer.done()?;
+        Ok(config)
+    }
+}
+
+impl DeserializeYaml for Syntax {
+    fn expected() -> Expected {
+        Expected::Mapping
+    }
+
+    fn deserialize(
+        yaml: SourcedYaml,
+        source_map: &SourceMap,
+    ) -> yaml::Result<Self> {
+        let default = Self::default();
+        let mut deserializer = StructDeserializer::new(yaml)?;
+        let config = Self {
+            comment_color: deserializer.get(
+                Field::new("comment_color").or(default.comment_color),
+                source_map,
+            )?,
+            builtin_color: deserializer.get(
+                Field::new("builtin_color").or(default.builtin_color),
+                source_map,
+            )?,
+            escape_color: deserializer.get(
+                Field::new("escape_color").or(default.escape_color),
+                source_map,
+            )?,
+            number_color: deserializer.get(
+                Field::new("number_color").or(default.number_color),
+                source_map,
+            )?,
+            string_color: deserializer.get(
+                Field::new("string_color").or(default.string_color),
+                source_map,
+            )?,
+            special_color: deserializer.get(
+                Field::new("special_color").or(default.special_color),
+                source_map,
+            )?,
+        };
+        deserializer.done()?;
+        Ok(config)
+    }
+}
+
+impl DeserializeYaml for Color {
+    fn expected() -> Expected {
+        Expected::String
+    }
+
+    fn deserialize(
+        yaml: SourcedYaml,
+        _source_map: &SourceMap,
+    ) -> yaml::Result<Self> {
+        let location = yaml.location;
+        let s = yaml.try_into_string()?;
+        // Use ratatui's serde implementation
+        <ratatui_core::style::Color as de::Deserialize>::deserialize(
+            StringDeserializer::new(s),
+        )
+        .map(Color::from)
+        .map_err(|error: de::value::Error| LocatedError::other(error, location))
+    }
+}