Added DotNetSettigns.Clone() to allow cloning settings before changin…

…g them
loudenvier · Nov 25, 2023 · ed58e75 · ed58e75
1 parent e11c50b
commit ed58e75
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/NetDot/DotNotationExtensions.cs b/NetDot/DotNotationExtensions.cs
@@ -3,7 +3,7 @@
     public static class DotNotationExtensions {
 
         public static string AsQueryString(this object o, DotNotationSettings? settings = null) {
-            settings ??= new();
+            settings ??= DotNotationSettings.Default.Clone();
             settings.UrlEncode = true;
             settings.EntrySeparator = "&";
             return DotNotation.Serialize(o, settings: settings);

diff --git a/NetDot/DotNotationSettings.cs b/NetDot/DotNotationSettings.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Specialized;
 using System.Globalization;
 
 namespace NetDot
@@ -62,5 +61,27 @@ public class DotNotationSettings {
         /// Controls serialization formats/rules for numbers and dates. Defaults to <see cref="CultureInfo.InvariantCulture"/>.
         /// </summary>
         public CultureInfo Culture { get;set; } = CultureInfo.InvariantCulture;
+
+        /// <summary>
+        /// Clones this instance copying all properties
+        /// </summary>
+        /// <returns>a new <see cref="DotNotationSettings"/> with the source properties copied</returns>
+        public DotNotationSettings Clone() => new() {
+            DotConnector = DotConnector,
+            KeyValueSeparator = KeyValueSeparator,
+            QuoteChar = QuoteChar,
+            SpacingAfterKey = SpacingAfterKey,
+            SpacingBeforeValue = SpacingBeforeValue,
+            EntrySeparator = EntrySeparator,
+            QuoteStrings = QuoteStrings,
+            QuoteValues = QuoteValues,
+            TrimValues = TrimValues,
+            TrimChars = TrimChars,
+            SurroundingTexts = SurroundingTexts,
+            UrlEncode = UrlEncode,
+            DateFormatString = DateFormatString,
+            Culture = Culture,
+        };
+
     }
 }
diff --git a/NetDot/NetDot.csproj b/NetDot/NetDot.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
-        <VersionPrefix>1.3.0</VersionPrefix>
+        <VersionPrefix>1.3.1</VersionPrefix>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
         <Title>NetDot</Title>
         <Authors>felipemachado</Authors>

diff --git a/NetDotTests/DotNotationExtensionsTests.cs b/NetDotTests/DotNotationExtensionsTests.cs
@@ -13,5 +13,13 @@ public void AsQueryStringWorks() {
             }.AsQueryString();
             Assert.Equal("page=10&pageSize=50&user.id=1&token=my%20token%2F123", queryString);
         }
+        [Fact]
+        public void AsQueryStringDoesNotOverrideDefaultSettings() {
+            var obj = new { id = "abc/123" };
+            var qs = obj.AsQueryString();
+            Assert.Equal("id=abc%2F123", qs);
+            var text = DotNotation.Serialize(obj);
+            Assert.Equal("id=abc/123", text);
+        }
     }
 }