From df715a7f3c7f936c602cb7adc2e3d7efc00a6ea6 Mon Sep 17 00:00:00 2001
From: lovasoa <contact@ophir.dev>
Date: Tue, 23 Jul 2024 22:49:35 +0200
Subject: [PATCH] handlebars-rs v6

---
 CHANGELOG.md     |  1 +
 Cargo.lock       |  4 ++--
 Cargo.toml       |  2 +-
 src/templates.rs | 18 ++++++++----------
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd638c47..bb0fad2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
  - allow customizing the [Content-Security-Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy) in the configuration.
  - update to [sqlparser v0.49.0](https://github.com/sqlparser-rs/sqlparser-rs/blob/main/CHANGELOG.md#0490-2024-07-23)
    - support [`WITH ORDINALITY`](https://www.postgresql.org/docs/current/queries-table-expressions.html#QUERIES-TABLEFUNCTIONS) in postgres `FROM` clauses
+ - update to [handlebars-rs v6](https://github.com/sunng87/handlebars-rust/blob/master/CHANGELOG.md#600---2024-07-20)
 
 ## 0.25.0 (2024-07-13)
 
diff --git a/Cargo.lock b/Cargo.lock
index 0a6c5cf0..7bc7ad05 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1494,9 +1494,9 @@ dependencies = [
 
 [[package]]
 name = "handlebars"
-version = "5.1.2"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b"
+checksum = "5226a0e122dc74917f3a701484482bed3ee86d016c7356836abbaa033133a157"
 dependencies = [
  "log",
  "pest",
diff --git a/Cargo.toml b/Cargo.toml
index 6b4b380e..131f7175 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,7 +31,7 @@ sqlx = { package = "sqlx-oldapi", version = "0.6.23", features = [
 chrono = "0.4.23"
 actix-web = { version = "4", features = ["rustls-0_22", "cookies"] }
 percent-encoding = "2.2.0"
-handlebars = "5.1.2"
+handlebars = "6.0.0"
 log = "0.4.17"
 env_logger = "0.11.1"
 mime_guess = "2.0.4"
diff --git a/src/templates.rs b/src/templates.rs
index cdb393ce..3fa7177b 100644
--- a/src/templates.rs
+++ b/src/templates.rs
@@ -34,21 +34,19 @@ pub fn split_template(mut original: Template) -> SplitTemplate {
             items_template = tpl.template;
         }
     }
+    let mut before_list = original.clone();
     let mut list_content = items_template.unwrap_or_default();
+    let mut after_list = Template::new();
     let original_name = original.name.unwrap_or_default();
+    before_list.name = Some(format!("{original_name} before each block"));
     list_content.name = Some(format!("{original_name} each block"));
+    after_list.name = Some(format!("{original_name} after each block"));
+    after_list.elements = elements_after;
+    after_list.mapping = mapping_after;
     SplitTemplate {
-        before_list: Template {
-            name: Some(format!("{original_name} before each block")),
-            elements: original.elements,
-            mapping: original.mapping,
-        },
+        before_list,
         list_content,
-        after_list: Template {
-            name: Some(format!("{original_name} after each block")),
-            elements: elements_after,
-            mapping: mapping_after,
-        },
+        after_list,
     }
 }