Merge pull request #5 from ninegua/master

Proper support for newtype and variants
cfsamson · Feb 3, 2021 · e29e8ab · e29e8ab
2 parents 8f60b3d + 861c924
commit e29e8ab
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 2 deletions.
diff --git a/src/serializer.rs b/src/serializer.rs
@@ -124,7 +124,11 @@ impl<S: Serializer> Serializer for ByteFmtSerializer<S> {
     where
         T: Serialize,
     {
-        S::serialize_newtype_struct(self.inner, name, value)
+        S::serialize_newtype_struct(
+            self.inner,
+            name,
+            &BytesSerialize::new(value, self.encode_kind.clone()),
+        )
     }
 
     fn serialize_newtype_variant<T: ?Sized>(
@@ -137,7 +141,13 @@ impl<S: Serializer> Serializer for ByteFmtSerializer<S> {
     where
         T: Serialize,
     {
-        S::serialize_newtype_variant(self.inner, name, variant_index, variant, value)
+        S::serialize_newtype_variant(
+            self.inner,
+            name,
+            variant_index,
+            variant,
+            &BytesSerialize::new(value, self.encode_kind.clone()),
+        )
     }
 
     fn serialize_seq(self, len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {

diff --git a/tests/serialize.rs b/tests/serialize.rs
@@ -1,6 +1,43 @@
 use serde::{Deserialize, Serialize};
 use serde_bytes_repr::ByteFmtSerializer;
 
+#[test]
+fn serialize_newtype_base64() {
+    #[derive(Serialize, Deserialize)]
+    struct Demo(#[serde(with = "serde_bytes")] Vec<u8>);
+    let bytes = b"testing".to_vec();
+    let demo = Demo(bytes);
+
+    let mut out = vec![];
+    let mut ser = serde_json::Serializer::new(&mut out);
+    let base64_config = base64::Config::new(base64::CharacterSet::UrlSafe, true);
+    let ser = ByteFmtSerializer::base64(&mut ser, base64_config);
+    demo.serialize(ser).unwrap();
+
+    let serialized = String::from_utf8(out).unwrap();
+    assert_eq!(r#""dGVzdGluZw==""#, serialized.as_str());
+}
+
+#[test]
+fn serialize_newtype_variant_base64() {
+    #[derive(Serialize, Deserialize)]
+    enum Demo {
+        #[serde(with = "serde_bytes")]
+        N(Vec<u8>),
+    };
+    let bytes = b"testing".to_vec();
+    let demo = Demo::N(bytes);
+
+    let mut out = vec![];
+    let mut ser = serde_json::Serializer::new(&mut out);
+    let base64_config = base64::Config::new(base64::CharacterSet::UrlSafe, true);
+    let ser = ByteFmtSerializer::base64(&mut ser, base64_config);
+    demo.serialize(ser).unwrap();
+
+    let serialized = String::from_utf8(out).unwrap();
+    assert_eq!(r#"{"N":"dGVzdGluZw=="}"#, serialized.as_str());
+}
+
 #[test]
 fn serialize_struct_base64() {
     #[derive(Serialize, Deserialize)]
@@ -21,6 +58,27 @@ fn serialize_struct_base64() {
     assert_eq!(r#"{"bytes":"dGVzdGluZw=="}"#, serialized.as_str());
 }
 
+#[test]
+fn serialize_struct_variant_base64() {
+    #[derive(Serialize, Deserialize)]
+    enum Demo {
+        A(Vec<u8>),
+        #[serde(with = "serde_bytes")]
+        B(Vec<u8>),
+    }
+    let bytes = b"testing".to_vec();
+    let demo = Demo::B(bytes);
+
+    let mut out = vec![];
+    let mut ser = serde_json::Serializer::new(&mut out);
+    let base64_config = base64::Config::new(base64::CharacterSet::UrlSafe, true);
+    let ser = ByteFmtSerializer::base64(&mut ser, base64_config);
+    demo.serialize(ser).unwrap();
+
+    let serialized = String::from_utf8(out).unwrap();
+    assert_eq!(r#"{"B":"dGVzdGluZw=="}"#, serialized.as_str());
+}
+
 #[test]
 fn serialize_seq_base64() {
     let bytes = b"testing".to_vec();