GH-185 Support colon in keys & release 1.14.7 (Fix #185)

Author: dzikoysk

.github/README.md

@@ -34,9 +34,9 @@ repositories {
 
 dependencies {
     // Default
-    implementation 'net.dzikoysk:cdn:1.14.6'
+    implementation 'net.dzikoysk:cdn:1.14.7'
     // Kotlin wrapper
-    implementation 'net.dzikoysk:cdn-kt:1.14.6'
+    implementation 'net.dzikoysk:cdn-kt:1.14.7'
 }
 ```
 

build.gradle.kts

@@ -17,7 +17,7 @@ allprojects {
     apply(plugin = "maven-publish")
 
     group = "net.dzikoysk"
-    version = "1.14.6"
+    version = "1.14.7"
 
     repositories {
         maven("https://maven.reposilite.com/maven-central")

cdn-tests/src/test/kotlin/net/dzikoysk/cdn/CdnReaderTest.kt

@@ -82,6 +82,42 @@ class CdnReaderTest : CdnSpec() {
         assertEquals(" value ", result.getString(" key ", "value"))
     }
 
+    @Test
+    fun `should read quoted key and value with tricky values`() {
+        val result = assertOk(standard.load(Source.of("""
+        "key:": " value "
+        """)))
+
+        assertEquals(" value ", result.getString("key:").get())
+    }
+
+    @Test
+    fun `GH-185 should read weird keys`() {
+        val result = assertOk(standard.load(Source.of("""
+          ':lenny:': ( ͡° ͜ʖ ͡°)
+          ':tableflip:': (╯°□°）╯︵ ┻━┻
+          '<3': ❤
+          ':swag:': (⌐■_■)
+          ':yes:': ✔
+          ':dog:': 7V●ᴥ●V
+          ':shrug:': ¯\_(ツ)_/¯
+          ':angry:': (ノಠ益ಠ)ノ
+          ':no:': ❌
+          'o/': ( ﾟ◡ﾟ)/
+        """)))
+
+        assertEquals("( ͡° ͜ʖ ͡°)", result.getString(":lenny:").get())
+        assertEquals("(╯°□°）╯︵ ┻━┻", result.getString(":tableflip:").get())
+        assertEquals("❤", result.getString("<3").get())
+        assertEquals("(⌐■_■)", result.getString(":swag:").get())
+        assertEquals("✔", result.getString(":yes:").get())
+        assertEquals("7V●ᴥ●V", result.getString(":dog:").get())
+        assertEquals("¯\\_(ツ)_/¯", result.getString(":shrug:").get())
+        assertEquals("(ノಠ益ಠ)ノ", result.getString(":angry:").get())
+        assertEquals("❌", result.getString(":no:").get())
+        assertEquals("( ﾟ◡ﾟ)/", result.getString("o/").get())
+    }
+
     @Test
     fun `should remove semicolons`() {
         val result = assertOk(standard.load(Source.of("""

cdn-tests/src/test/kotlin/net/dzikoysk/cdn/module/standard/StandardSerializerTest.kt

@@ -37,7 +37,7 @@ class StandardSerializerTest : CdnSpec() {
           # List description
           list [
             record
-            record : with : semicolons
+            "record : with : semicolons"
           ]
           # Custom object
           custom {

cdn-tests/src/test/kotlin/net/dzikoysk/cdn/serdes/composers/ListComposerTest.kt

@@ -48,8 +48,8 @@ class ListComposerTest : CdnSpec() {
 
         val expectedSource = cfg("""
         list [
-          a:1
-          b:2
+          "a:1"
+          "b:2"
         ]
         """)
 

cdn-tests/src/test/kotlin/net/dzikoysk/cdn/serdes/composers/SimpleComposerTest.kt

@@ -30,6 +30,8 @@ class SimpleComposerTest : CdnSpec() {
         var separator = ", "
         var singleQuote = "\""
         var quotes = "\"\""
+        var singleQuotes = "'"
+        var backticks = "`"
         var empty = ""
     }
 

cdn/src/main/java/net/dzikoysk/cdn/CdnUtils.java

@@ -212,7 +212,7 @@ public static boolean isKotlinDataClass(Class<?> clazz) {
 
     private static final List<Predicate<String>> LITERAL_FILTERS = asList(
             (value) -> ObjectUtils.equalsOneOf(value, "true", "false"),
-            (value) -> Result.attempt(() -> Double.parseDouble(value)).isOk()
+            (value) -> Result.supplyThrowing(() -> Double.parseDouble(value)).isOk()
     );
 
     public static String destringify(String raw) {
@@ -232,25 +232,30 @@ public static String destringify(String raw) {
     }
 
     public static boolean isStringified(String value) {
-        return value.startsWith("\"") && value.endsWith("\"");
+        for (String operator : StandardOperators.STRING_OPERATORS) {
+            if (value.startsWith(operator) && value.endsWith(operator)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static String stringify(boolean enforce, String value) {
+        return enforce ? forceStringify(value) : value;
     }
 
     public static String stringify(String value) {
         String raw = value.replace(StandardOperators.LINE_SEPARATOR, StandardOperators.RAW_LINE_SEPARATOR);
 
         if (!isStringified(raw)) {
-            if (raw.isEmpty() || raw.trim().length() != raw.length() || raw.endsWith(",") || raw.endsWith("{") || raw.endsWith(":")) {
-                return "\"" + raw + "\"";
+            if (raw.isEmpty() || raw.trim().length() != raw.length() || raw.contains(",") || raw.contains("{") || raw.contains(":")) {
+                return stringifyValue(raw);
             }
         }
 
         return raw;
     }
 
-    public static String stringify(boolean enforce, String value) {
-        return enforce ? forceStringify(value) : value;
-    }
-
     public static String forceStringify(String value) {
         for (Predicate<String> literalFilter : LITERAL_FILTERS) {
             if (literalFilter.test(value)) {
@@ -259,12 +264,25 @@ public static String forceStringify(String value) {
         }
 
         if (!isStringified(value)) {
-            return "\"" + value + "\"";
+            return stringifyValue(value);
         }
 
         return value;
     }
 
+    private static String stringifyValue(String raw) {
+        if (raw.contains("\"")) {
+            if (raw.contains("'")) {
+                if (raw.contains("`")) {
+                    throw new IllegalArgumentException("Cannot stringify value: " + raw);
+                }
+                return "`" + raw + "`";
+            }
+            return "'" + raw + "'";
+        }
+        return "\"" + raw + "\"";
+    }
+
     public static <K, V, E extends Exception> Map<K, V> streamOfResultPairToMap(PandaStream<Result<Pair<K, V>, E>> stream) {
         return stream
                 .filter(Result::isOk)

cdn/src/main/java/net/dzikoysk/cdn/model/Entry.java

@@ -16,7 +16,6 @@
 
 package net.dzikoysk.cdn.model;
 
-import net.dzikoysk.cdn.CdnUtils;
 import net.dzikoysk.cdn.module.standard.StandardOperators;
 
 import java.util.List;

cdn/src/main/java/net/dzikoysk/cdn/model/Piece.java

@@ -18,22 +18,46 @@
 
 import net.dzikoysk.cdn.module.standard.StandardOperators;
 import panda.utilities.StringUtils;
-import java.util.Collections;
-import java.util.List;
+
+import java.util.*;
 
 /**
  * Represents the smallest piece of information in configuration
  */
 public final class Piece implements Element<String> {
 
+    private static final Set<String> STRING_OPERATORS = new HashSet<>(Arrays.asList(StandardOperators.STRING_OPERATORS));
+
     private final String value;
 
     public Piece(String value) {
-        this.value = value;
+        this.value = value.trim();
     }
 
     public Entry toEntry(List<? extends String> description) {
-        String[] elements = StringUtils.splitFirst(value, StandardOperators.OPERATOR);
+        String openingSymbol = Character.toString(value.charAt(0));
+        String[] elements;
+
+        if (isStringOperator(openingSymbol)) {
+            StringBuilder entryKey = new StringBuilder(openingSymbol);
+            int readIndex = 1;
+
+            for (; readIndex < value.length(); readIndex++) {
+                String currentChar = Character.toString(value.charAt(readIndex));
+                entryKey.append(currentChar);
+
+                if (currentChar.equals(openingSymbol)) {
+                    break;
+                }
+            }
+
+            elements = new String[] {
+                entryKey.toString(),
+                StringUtils.split(value.substring(readIndex + 1), StandardOperators.OPERATOR)[1].trim()
+            };
+        } else {
+            elements = StringUtils.splitFirst(value, StandardOperators.OPERATOR);
+        }
 
         String entryKey = elements.length > 0
                 ? elements[0].trim()
@@ -50,6 +74,15 @@ public Entry toEntry(List<? extends String> description) {
         return new Entry(description, value, entryKey, entryValue);
     }
 
+    private boolean isStringOperator(String operator) {
+        for (String stringOperator : StandardOperators.STRING_OPERATORS) {
+            if (stringOperator.equals(operator)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Override
     public String toString() {
         return "Unit { " + value + " }";

cdn/src/main/java/net/dzikoysk/cdn/model/Section.java

@@ -98,11 +98,13 @@ public Option<Element<?>> get(String key) {
             return Option.none();
         }
 
+        String stringifiedKey = CdnUtils.stringify(key);
+
         for (Element<?> element : getValue()) {
             if (element instanceof NamedElement) {
                 NamedElement<?> namedElement = (NamedElement<?>) element;
 
-                if (key.equals(namedElement.getName())) {
+                if (key.equals(CdnUtils.destringify(namedElement.getName()))) {
                     return Option.of(element);
                 }
             }