Fixed #38, #24

Author: sea5kg

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to wsjcpp-yaml project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v0.1.10] - 2025-12-?? (2025 Dec ??)
+
+- Fixed #38: TODO escaping names
+- Fixed #24: Auto detect quotes on setValue setName
+
 ## [v0.1.9] - 2025-12-18 (2025 Dec 18)
 
 - Migrated unit-tests.wsjcpp to ctest

src/tests/test_auto_quotes.cpp

@@ -0,0 +1,66 @@
+/*
+MIT License
+
+Copyright (c) 2019-2025 wsjcpp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Official Source Code: https://github.com/wsjcpp/wsjcpp-yaml
+*/
+
+#include <iostream>
+#include <wsjcpp_yaml.h>
+
+int main() {
+    // https://github.com/wsjcpp/wsjcpp-yaml/issues/24
+
+    std::string sInput =
+        "# commet1:\n"
+        "val1: 1\n"
+    ;
+
+    WsjcppYaml yaml;
+    std::string sError;
+    if (!yaml.loadFromString("input.yml", sInput, sError)) {
+        std::cerr << sError << std::endl;
+        return -1;
+    }
+
+    yaml["val1"].val("some\nsome");
+    yaml.getRoot()->setElementValue("v\ng", "opa\ndone");
+
+    std::string sOutput = "";
+    if (!yaml.saveToString(sOutput, sError)) {
+        std::cerr << sError << std::endl;
+        return -1;
+    }
+
+    std::string sExpected =
+        "# commet1:\n"
+        "val1: \"some\\nsome\"\n"
+        "\"v\\ng\": \"opa\\ndone\"\n"
+    ;
+
+    if (sOutput != sExpected) {
+        std::cerr << "sOutput != sExpected" << std::endl;
+        std::cerr << "Got: \n----\n" << sOutput << "\n------\nExpected\n-----\n" << sExpected << "\n------\n" << std::endl;
+        return -1;
+    }
+    return 0;
+}

src/wsjcpp_yaml.cpp

@@ -218,6 +218,10 @@ std::string WsjcppYamlNode::getComment() {
 
 void WsjcppYamlNode::setName(const std::string &sName, WsjcppYamlQuotes nNameQuotes) {
     m_sName = sName;
+    if (m_sName.find('\n') != std::string::npos) {
+        // automaticly set quotes double for escaping
+        nNameQuotes = WSJCPP_YAML_QUOTES_DOUBLE;
+    }
     m_nNameQuotes = nNameQuotes;
 }
 
@@ -524,6 +528,10 @@ void WsjcppYamlNode::setValue(const std::string &sValue, WsjcppYamlQuotes nQuote
     if (m_nItemType != WSJCPP_YAML_NODE_VALUE) {
         throw std::runtime_error(TAG + ": setValue, Element must be value for " + this->getForLogFormat());
     }
+    if (sValue.find('\n') != std::string::npos) {
+        // automaticly set quotes double
+        nQuotes = WSJCPP_YAML_QUOTES_DOUBLE;
+    }
     m_nValueQuotes = nQuotes;
     m_sValue = sValue;
 }
@@ -534,9 +542,8 @@ WsjcppYamlQuotes WsjcppYamlNode::getValueQuotes() {
 
 std::string WsjcppYamlNode::getSerializedName() {
     std::string sRet = "";
-    // TODO escape quotes
     if (this->getNameQuotes() == WSJCPP_YAML_QUOTES_DOUBLE) {
-        sRet += "\"" + this->getName() + "\"";
+        sRet += "\"" + escapingString(this->getName()) + "\"";
     } else if (this->getNameQuotes() == WSJCPP_YAML_QUOTES_SINGLE) {
         sRet += "\'" + this->getName() + "\'";
     } else {
@@ -549,7 +556,7 @@ std::string WsjcppYamlNode::toString(std::string sIndent) {
     std::string sRet = "";
     if (this->isValue()) {
         if (m_nValueQuotes == WSJCPP_YAML_QUOTES_DOUBLE) {
-            sRet = "\"" + m_sValue + "\"";
+            sRet = "\"" + escapingString(m_sValue) + "\"";
         } else if (m_nValueQuotes == WSJCPP_YAML_QUOTES_SINGLE) {
             sRet = "\'" + m_sValue + "\'";
         } else {
@@ -722,6 +729,19 @@ void WsjcppYamlNode::removeLastCharNewLine(std::string &sLine) {
     }
 }
 
+std::string WsjcppYamlNode::escapingString(const std::string &sVal) {
+    size_t nLen = sVal.length();
+    std::string res;
+    for (int i = 0; i < nLen; i++) {
+        if (sVal[i] == '\n') {
+            res += "\\n";
+        } else {
+            res += sVal[i];
+        }
+    }
+    return res;
+}
+
 bool WsjcppYamlNode::hasContent(const std::string &sVal) {
     std::string sVal_ = sVal;
     sVal_ = WsjcppYaml::trim(sVal_);

src/wsjcpp_yaml.h

@@ -169,6 +169,7 @@ class WsjcppYamlNode {
     private:
         void throw_error(const std::string &sError);
         void removeLastCharNewLine(std::string &sLine);
+        std::string escapingString(const std::string &sVal);
         bool hasContent(const std::string &sVal);
         bool hasObjects();
         std::string TAG;