fix: 🐛 unnecessary extra array wrapper in theme serialization (#98)

* fix: 🐛 unnecessary extra array wrapper in theme serialization * fix: 🐛 tests
LottieFiles · Mar 12, 2024 · b3bb518 · b3bb518
1 parent ccaeae0
commit b3bb518
Showing 3 changed files with 102 additions and 72 deletions.
diff --git a/dotlottie-fms/src/manifest.rs b/dotlottie-fms/src/manifest.rs
@@ -54,10 +54,11 @@ impl Manifest {
             json["description"] = self.description.clone().into();
         }
         if let Some(themes) = &self.themes {
-            json["themes"] = array!(themes
+            json["themes"] = themes
                 .iter()
                 .map(|t| t.to_json())
-                .collect::<Vec<json::JsonValue>>());
+                .collect::<Vec<json::JsonValue>>()
+                .into();
         }
         if let Some(states) = &self.states {
             json["states"] = array!(states

diff --git a/dotlottie-fms/src/manifest_themes.rs b/dotlottie-fms/src/manifest_themes.rs
@@ -2,13 +2,17 @@ use json::{self, object};
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub struct ManifestTheme {
     pub id: String,
     pub animations: Vec<String>,
 }
 
 impl ManifestTheme {
+    pub fn new(id: String, animations: Vec<String>) -> Self {
+        Self { id, animations }
+    }
+
     pub fn to_json(&self) -> json::JsonValue {
         object! {
             "id" => self.id.clone(),

diff --git a/dotlottie-fms/src/tests/manifest/mod.rs b/dotlottie-fms/src/tests/manifest/mod.rs
@@ -1,22 +1,22 @@
 #[cfg(test)]
-use crate::{Manifest, ManifestAnimation};
+use crate::{Manifest, ManifestAnimation, ManifestTheme};
 
 #[test]
 fn manifest_has_correct_default_values() {
     let manifest = Manifest::new();
 
     // Test your code here
     assert_eq!(manifest.author, Some("LottieFiles".to_string()));
-    assert_eq!(manifest.generator, Some("dotLottie-utils".to_string()));
+    assert_eq!(manifest.generator, Some("dotLottie-fms".to_string()));
     assert_eq!(manifest.keywords, Some("dotLottie".to_string()));
     assert_eq!(manifest.revision, Some(1));
     assert_eq!(manifest.version, Some("1.0.0".to_string()));
+    assert_eq!(manifest.themes, None);
 }
 
 #[test]
 fn display() {
     use json::object;
-    use std::sync::RwLock;
 
     let mut animations: Vec<ManifestAnimation> = Vec::new();
     let mut multi_animations: Vec<ManifestAnimation> = Vec::new();
@@ -35,33 +35,35 @@ fn display() {
         None,
     );
 
-    let animation_02 = ManifestAnimation::new(
-        Some(false),
-        Some("red_theme".to_string()),
-        Some(-1),
-        None,
-        "animation_02".to_string(),
-        None,
-        Some(false),
-        Some(12),
-        Some("bounce".to_string()),
-        Some(2),
-        None,
-    );
-
-    let animation_03 = ManifestAnimation::new(
-        Some(true),
-        Some("orange_theme".to_string()),
-        Some(1),
-        None,
-        "animation_02".to_string(),
-        None,
-        Some(true),
-        Some(12),
-        None,
-        None,
-        None,
-    );
+    let animation_02 =
+        ManifestAnimation::new(
+            Some(false),
+            Some("red_theme".to_string()),
+            Some(-1),
+            None,
+            "animation_02".to_string(),
+            None,
+            Some(false),
+            Some(12),
+            Some("bounce".to_string()),
+            Some(2),
+            None,
+        );
+
+    let animation_03 =
+        ManifestAnimation::new(
+            Some(true),
+            Some("orange_theme".to_string()),
+            Some(1),
+            None,
+            "animation_02".to_string(),
+            None,
+            Some(true),
+            Some(12),
+            None,
+            None,
+            None,
+        );
 
     animations.push(animation_01);
 
@@ -70,6 +72,14 @@ fn display() {
     manifest.author = Some("test_author".to_string());
     manifest.animations = animations;
 
+    let themes = vec![
+        ManifestTheme::new("dark_theme".to_string(), vec!["animation_01".to_string()]),
+        ManifestTheme::new("bright_theme".to_string(), vec!["animation_02".to_string()]),
+        ManifestTheme::new("global_theme".to_string(), vec![]),
+    ];
+
+    manifest.themes = Some(themes);
+
     let dis = manifest.to_json();
 
     let dis_expected = object! {
@@ -90,7 +100,21 @@ fn display() {
             }
           ],
           "author": "test_author",
-          "generator": "dotLottie-utils",
+          "themes": [
+            {
+              "id": "dark_theme",
+              "animations": ["animation_01"]
+            },
+            {
+              "id": "bright_theme",
+              "animations": ["animation_02"]
+            },
+            {
+              "id": "global_theme",
+              "animations": []
+            }
+          ],
+          "generator": "dotLottie-fms",
           "keywords": "dotLottie",
           "revision": 1,
           "version": "1.0.0",
@@ -105,48 +129,49 @@ fn display() {
     manifest_with_two_animations.animations = multi_animations;
     manifest_with_two_animations.author = Some("test_author".to_string());
     manifest_with_two_animations.description = Some("Multi animation".to_string());
-    manifest_with_two_animations.generator = Some("dotLottie-utils".to_string());
+    manifest_with_two_animations.generator = Some("dotLottie-fms".to_string());
     manifest_with_two_animations.revision = Some(2);
 
     let dis_02 = manifest_with_two_animations.to_json();
 
-    let dis_02_expected = object! {
-      "activeAnimationId": "default_animation_id",
-      "animations": [
-        {
-          "autoplay": false,
-          "defaultTheme": "red_theme",
-          "direction": -1,
-          "hover": false,
-          "id": "animation_02",
-          "intermission": 0,
-          "loop": false,
-          "loopCount": 12,
-          "playMode": "bounce",
-          "speed": 2,
-          "themeColor": ""
-        },
-        {
-          "autoplay": true,
-          "defaultTheme": "orange_theme",
-          "direction": 1,
-          "hover": false,
-          "id": "animation_02",
-          "intermission": 0,
-          "loop": true,
-          "loopCount": 12,
-          "playMode": "Normal",
-          "speed": 1,
-          "themeColor": ""
-        }
-      ],
-      "author": "test_author",
-      "description": "Multi animation",
-      "generator": "dotLottie-utils",
-      "keywords": "dotLottie",
-      "revision": 2,
-      "version": "1.0.0"
-    };
+    let dis_02_expected =
+        object! {
+          "activeAnimationId": "default_animation_id",
+          "animations": [
+            {
+              "autoplay": false,
+              "defaultTheme": "red_theme",
+              "direction": -1,
+              "hover": false,
+              "id": "animation_02",
+              "intermission": 0,
+              "loop": false,
+              "loopCount": 12,
+              "playMode": "bounce",
+              "speed": 2,
+              "themeColor": ""
+            },
+            {
+              "autoplay": true,
+              "defaultTheme": "orange_theme",
+              "direction": 1,
+              "hover": false,
+              "id": "animation_02",
+              "intermission": 0,
+              "loop": true,
+              "loopCount": 12,
+              "playMode": "Normal",
+              "speed": 1,
+              "themeColor": ""
+            }
+          ],
+          "author": "test_author",
+          "description": "Multi animation",
+          "generator": "dotLottie-fms",
+          "keywords": "dotLottie",
+          "revision": 2,
+          "version": "1.0.0"
+        };
 
     assert_eq!(dis_02.dump(), dis_02_expected.dump());
 }