fix: preventing html escaping + module renaming (#139)

Closes #138
vigenere23 · Jan 19, 2024 · 2988c1e · 2988c1e
1 parent dc2dc39
commit 2988c1e
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/disma-cli/Cargo.toml b/disma-cli/Cargo.toml
@@ -18,7 +18,7 @@ path = "src/main.rs"
 [dependencies]
 disma = { path = "../disma", version = "0.16.2" }
 clap = { version = "4.4.16", features = ["derive"] }
-handlebars = "4.3.3"
+handlebars = "5.1.1"
 serde = { version = "1.0.143", features = ["derive"] }
 serde_json = "1.0.83"
 serde_yaml = "0.9.9"

diff --git a/disma-cli/src/actions.rs b/disma-cli/src/actions.rs
@@ -1,11 +1,11 @@
 use std::sync::Arc;
 
 use super::{
-    injector::{Get, Injector},
-    services::{
+    commands::{
         apply_changes::ApplyChanges, compile_config::CompileConfig, list_guilds::ListGuilds,
         save_guild::SaveExistingGuild,
     },
+    injector::{Get, Injector},
 };
 
 pub fn apply_changes(guild_id: &str, file_path: &str, dry_run: bool, force: bool) {

diff --git a/disma-cli/src/services/apply_changes.rs → disma-cli/src/commands/apply_changes.rs b/disma-cli/src/services/apply_changes.rs → disma-cli/src/commands/apply_changes.rs
diff --git a/disma-cli/src/services/compile_config.rs → disma-cli/src/commands/compile_config.rs b/disma-cli/src/services/compile_config.rs → disma-cli/src/commands/compile_config.rs
@@ -14,25 +14,21 @@ pub struct CompileConfig {
 }
 
 impl CompileConfig {
-    const TEMPLATE_NAME: &'static str = "base";
-
     pub fn new(deserializer: Arc<Deserializer>) -> Self {
         Self { deserializer }
     }
 
     pub fn run(&self, template_file: &str, vars_file: &str, output_file: &str, force: bool) {
         let template = fs::read_to_string(template_file).unwrap();
-        // TODO context should probably be a Hash instead or a serde_yaml::Value
+        // TODO context should probably be a Hash instead of a serde_yaml::Value
         let context: Value = self.deserializer.deserialize(Path::new(vars_file));
 
         println!();
         println!("{}", "➜ ⚙️ Compiling guild config...".bold());
         let mut renderer = Handlebars::new();
-        renderer
-            .register_template_string(Self::TEMPLATE_NAME, &template)
-            .unwrap();
+        renderer.register_escape_fn(|s| s.to_string()); // preventing default HTML escaping
 
-        let rendered = renderer.render(Self::TEMPLATE_NAME, &context).unwrap();
+        let rendered = renderer.render_template(&template, &context).unwrap();
 
         let output_path = Path::new(output_file);
         println!(

diff --git a/disma-cli/src/services/list_guilds.rs → disma-cli/src/commands/list_guilds.rs b/disma-cli/src/services/list_guilds.rs → disma-cli/src/commands/list_guilds.rs
diff --git a/disma-cli/src/services/mod.rs → disma-cli/src/commands/mod.rs b/disma-cli/src/services/mod.rs → disma-cli/src/commands/mod.rs
diff --git a/disma-cli/src/services/save_guild.rs → disma-cli/src/commands/save_guild.rs b/disma-cli/src/services/save_guild.rs → disma-cli/src/commands/save_guild.rs
diff --git a/disma-cli/src/injector.rs b/disma-cli/src/injector.rs
@@ -14,14 +14,14 @@ use disma::{
 };
 
 use crate::{
+    commands::{
+        apply_changes::ApplyChanges, compile_config::CompileConfig, list_guilds::ListGuilds,
+        save_guild::SaveExistingGuild,
+    },
     infra::diff::{
         event::CliChangeEventListener,
         formatter::{DiffFormater, DiffFormaterRef},
     },
-    services::{
-        apply_changes::ApplyChanges, compile_config::CompileConfig, list_guilds::ListGuilds,
-        save_guild::SaveExistingGuild,
-    },
     utils::{
         env::required_env,
         io::{Deserializer, Serializer},

diff --git a/disma-cli/src/main.rs b/disma-cli/src/main.rs
@@ -1,8 +1,8 @@
 mod actions;
 mod args;
+mod commands;
 mod infra;
 mod injector;
-mod services;
 mod utils;
 
 use clap::Parser;