strip leading and trailing " to preserve expected behavior

pantor · Jul 19, 2023 · a7972bb · a7972bb
1 parent 0d15c31
commit a7972bb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/include/inja/renderer.hpp b/include/inja/renderer.hpp
@@ -54,8 +54,17 @@ class Renderer : public NodeVisitor {
   }
 
   void print_data(const std::shared_ptr<json> value) {
-    if (value->is_string() && !config.escape_strings) {
-      *output_stream << value->get_ref<const json::string_t&>();
+    if (value->is_string()) {
+      std::string val;
+      if (config.escape_strings) {
+        val = value->dump();
+        val = val.substr(0,1) == "\"" && val.substr(val.length()-1,1) == "\""
+            ? val.substr(1, val.length()-2)
+            : val;
+      } else {
+        val = value->get_ref<const json::string_t&>();
+      }
+      *output_stream << val;
     } else if (value->is_number_integer()) {
       *output_stream << value->get<const json::number_integer_t>();
     } else if (value->is_null()) {

diff --git a/single_include/inja/inja.hpp b/single_include/inja/inja.hpp
@@ -2124,8 +2124,17 @@ class Renderer : public NodeVisitor {
   }
 
   void print_data(const std::shared_ptr<json> value) {
-    if (value->is_string() && !config.escape_strings) {
-      *output_stream << value->get_ref<const json::string_t&>();
+    if (value->is_string()) {
+      std::string val;
+      if (config.escape_strings) {
+        val = value->dump();
+        val = val.substr(0,1) == "\"" && val.substr(val.length()-1,1) == "\""
+            ? val.substr(1, val.length()-2)
+            : val;
+      } else {
+        val = value->get_ref<const json::string_t&>();
+      }
+      *output_stream << val;
     } else if (value->is_number_integer()) {
       *output_stream << value->get<const json::number_integer_t>();
     } else if (value->is_null()) {

diff --git a/test/test-renderer.cpp b/test/test-renderer.cpp
@@ -42,7 +42,7 @@ TEST_CASE("types") {
 
     CHECK(env.render(R"EOF({"Value":"{{ quoted }}"})EOF", data) == R"EOF({"Value":""quoted value""})EOF");
     env.set_escape_strings(true);
-    CHECK(env.render(R"EOF({"Value":{{ quoted }}})EOF", data) == R"EOF({"Value":"\"quoted value\""})EOF");
+    CHECK(env.render(R"EOF({"Value":"{{ quoted }}"})EOF", data) == R"EOF({"Value":"\"quoted value\""})EOF");
     env.set_escape_strings(false);
 
     CHECK_THROWS_WITH(env.render("{{unknown}}", data), "[inja.exception.render_error] (at 1:3) variable 'unknown' not found");