m-lamonaca/json-to-env
1
0
Fork 0
mirror of https://github.com/m-lamonaca/json-to-env.git synced 2025-04-05 10:26:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

convert env var to tuple struct

Browse source
This commit is contained in:
Marcello 2024-03-03 21:45:07 +01:00
parent dfe64bc1da
commit c42a606930
Signed by: m-lamonaca
SSH key fingerprint: SHA256:8db8uii6Gweq7TbKixFBioW2T8CbgtyFETyYL3cr3zk
1 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/main.rs
View file

@ -91,7 +91,7 @@ impl JsonParser {
Self::parse(lines, &key, value, separator) Self::parse(lines, &key, value, separator)
} }
} }
_ => lines.push(EnvVar::new(key.trim().to_owned(), value.clone())), _ => lines.push(EnvVar(key.trim().to_owned(), value.clone())),
} }
} }
@ -103,28 +103,19 @@ impl JsonParser {
} }
} }
#[derive(Debug, PartialEq, Eq)] struct EnvVar(String, Value);
struct EnvVar {
name: String,
value: Value,
}
impl EnvVar {
fn new(name: String, value: Value) -> Self {
Self { name, value }
}
}
impl Display for EnvVar { impl Display for EnvVar {
fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self.value { match self.1 {
Value::Null => write!(fmt, "{key}=null", key = self.name), Value::Null => write!(fmt, "{key}=null", key = self.0),
Value::Bool(bool) => write!(fmt, "{key}={bool}", key = self.name), Value::Bool(bool) => write!(fmt, "{key}={bool}", key = self.0),
Value::Number(ref number) => write!(fmt, "{key}={number}", key = self.name), Value::Number(ref number) => write!(fmt, "{key}={number}", key = self.0),
Value::String(ref string) => write!( Value::String(ref string) => write!(
fmt, fmt,
r#"{key}="{value}""#, r#"{key}="{value}""#,
key = self.name, key = self.0,
value = string.replace('"', r#"\""#) value = string.replace('"', r#"\""#)
), ),
_ => write!(fmt, ""), _ => write!(fmt, ""),
@ -171,7 +162,7 @@ mod tests {
#[test] #[test]
fn bool_env_var_should_be_formatted_correctly() { fn bool_env_var_should_be_formatted_correctly() {
// ARRANGE // ARRANGE
let input = EnvVar::new(KEY.to_owned(), json!(true)); let input = EnvVar(KEY.to_owned(), json!(true));
// ACT // ACT
let result = input.to_string(); let result = input.to_string();
@ -183,7 +174,7 @@ mod tests {
#[test] #[test]
fn numeric_env_var_should_be_formatted_correctly() { fn numeric_env_var_should_be_formatted_correctly() {
// ARRANGE // ARRANGE
let input = EnvVar::new(KEY.to_owned(), json!(1.0)); let input = EnvVar(KEY.to_owned(), json!(1.0));
// ACT // ACT
let result = input.to_string(); let result = input.to_string();
@ -195,7 +186,7 @@ mod tests {
#[test] #[test]
fn string_env_var_should_be_formatted_correctly() { fn string_env_var_should_be_formatted_correctly() {
// ARRANGE // ARRANGE
let input = EnvVar::new(KEY.to_owned(), json!("hello")); let input = EnvVar(KEY.to_owned(), json!("hello"));
// ACT // ACT
let result = input.to_string(); let result = input.to_string();
@ -207,7 +198,7 @@ mod tests {
#[test] #[test]
fn array_env_var_should_be_formatted_correctly() { fn array_env_var_should_be_formatted_correctly() {
// ARRANGE // ARRANGE
let input = EnvVar::new(KEY.to_owned(), json!([1, 2])); let input = EnvVar(KEY.to_owned(), json!([1, 2]));
// ACT // ACT
let result = input.to_string(); let result = input.to_string();
@ -219,7 +210,7 @@ mod tests {
#[test] #[test]
fn object_env_var_should_be_formatted_correctly() { fn object_env_var_should_be_formatted_correctly() {
// ARRANGE // ARRANGE
let input = EnvVar::new(KEY.to_owned(), json!({ "key": "value" })); let input = EnvVar(KEY.to_owned(), json!({ "key": "value" }));
// ACT // ACT
let result = input.to_string(); let result = input.to_string();