Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ documentation = "https://docs.rs/serde-redis"
edition = "2018"

[dependencies]
redis = "0.22.3"
redis= "0.23.3"
serde = "1.0"

[dev-dependencies]
Expand Down
31 changes: 31 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ pub use crate::decode::Deserializer;
pub use crate::encode::Serializer;
pub use crate::into_cow::IntoCow;

use std::collections::HashMap;

/// Use serde Deserialize to build `T` from a `redis::Value`
pub fn from_redis_value<'a, 'de, T, RV>(rv: RV) -> decode::Result<T>
where
Expand All @@ -19,6 +21,14 @@ where
serde::de::Deserialize::deserialize(Deserializer::new(value))
}

/// Use serde Deserialize to build `T` from a `HashMap<String, redis::Value>`
pub fn from_hashmap_value<'de, T>(rv: &'de HashMap<String, redis::Value>) -> decode::Result<T>
where
T: serde::de::Deserialize<'de>,
{
RedisDeserialize::deserialize(rv)
}

pub trait RedisDeserialize<'de, T>
where
T: serde::de::Deserialize<'de>,
Expand All @@ -35,6 +45,27 @@ where
}
}

impl<'de, T> RedisDeserialize<'de, T> for HashMap<String,redis::Value>
where
T: serde::de::Deserialize<'de>,
{
fn deserialize(&'de self) -> decode::Result<T> {
use redis::Value;

let mut values_vec = vec![];

for (key, value) in self.iter() {
values_vec.push(Value::Data(key.as_bytes().to_vec()));
values_vec.push(value.clone());
}

let value = Value::Bulk(values_vec);


serde::de::Deserialize::deserialize(Deserializer::new(value))
}
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down
25 changes: 25 additions & 0 deletions tests/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -510,3 +510,28 @@ fn deserialize_nested_item() {
let de = Deserializer::new(&value);
let _hellos: Vec<String> = Deserialize::deserialize(de).unwrap();
}

#[test]
fn deserialize_values_wrapped_in_hashmap() {
use serde_redis::RedisDeserialize;

let mut data = HashMap::new();

data.insert("a".to_string(),Value::Data(b"apple".to_vec()));
data.insert("b".to_string(),Value::Data(b"banana".to_vec()));

#[derive(Debug, Deserialize, PartialEq)]
struct Simple {
a: String,
b: String,
}

let actual: Simple = data.deserialize().unwrap();

let expected = Simple {
a: "apple".to_owned(),
b: "banana".to_owned(),
};

assert_eq!(expected, actual);
}