Change Csv Serializer to use CsvConfig

Author: mythz

src/ServiceStack.Text/CsvWriter.cs

@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Runtime.Serialization;
-using System.Reflection;
 using ServiceStack.Text.Common;
 using ServiceStack.Text.Reflection;
 
@@ -28,11 +26,11 @@ public static void WriteObjectRow(TextWriter writer, IEnumerable<object> row)
             var ranOnce = false;
             foreach (var field in row)
             {
-                JsWriter.WriteItemSeperatorIfRanOnce(writer, ref ranOnce);
+                CsvWriter.WriteItemSeperatorIfRanOnce(writer, ref ranOnce);
 
                 writer.Write(field.ToCsvField());
             }
-            writer.WriteLine();
+            writer.Write(CsvConfig.RowSeparatorString);
         }
 
         public static void Write(TextWriter writer, IEnumerable<Dictionary<string, object>> records)
@@ -298,7 +296,7 @@ public static void WriteRow(TextWriter writer, IEnumerable<string> row)
 
                 writer.Write(field.ToCsvField());
             }
-            writer.WriteLine();
+            writer.Write(CsvConfig.RowSeparatorString);
         }
 
         public static void Write(TextWriter writer, IEnumerable<List<string>> rows)

src/ServiceStack.Text/TextExtensions.cs

@@ -33,13 +33,13 @@ public static string ToCsvField(this string text)
 
         public static object ToCsvField(this object text)
         {
-            return text == null || !JsWriter.HasAnyEscapeChars(text.ToString())
+            return text == null || !CsvWriter.HasAnyEscapeChars(text.ToString())
                        ? text
                        : string.Concat
                              (
-                                 JsWriter.QuoteString,
-                                 text.ToString().Replace(JsWriter.QuoteString, TypeSerializer.DoubleQuoteString),
-                                 JsWriter.QuoteString
+                                 CsvConfig.ItemDelimiterString,
+                                 text.ToString().Replace(CsvConfig.ItemDelimiterString, CsvConfig.EscapedItemDelimiterString),
+                                 CsvConfig.ItemDelimiterString
                              );
         }
 

tests/ServiceStack.Text.Tests/CsvSerializerConfigTests.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using NUnit.Framework;
+using ServiceStack.Common.Tests.Models;
+using ServiceStack.Text.Common;
+
+namespace ServiceStack.Text.Tests
+{
+    [TestFixture]
+    public class CsvSerializerConfigTests
+    {
+        [Test]
+        public void Does_use_CsvConfig()
+        {
+            CsvConfig.ItemSeperatorString = "|";
+            CsvConfig.ItemDelimiterString = "`";
+            CsvConfig.RowSeparatorString = "\n\n";
+
+            var dtos = new[] {
+                new ModelWithIdAndName { Id = 1, Name = "Value" },
+                new ModelWithIdAndName { Id = 2, Name = "Value|Escaped" },
+            };
+
+            var csv = dtos.ToCsv();
+            csv.Print();
+            Assert.That(csv, Is.EqualTo("Id|Name\n\n1|Value\n\n2|`Value|Escaped`\n\n"));
+
+            var maps = new List<Dictionary<string, object>>()
+            {
+                new Dictionary<string,object> { {"Id", "1"}, {"Name", "Value"} },
+                new Dictionary<string,object> { {"Id", "2"}, {"Name", "Value|Escaped"} },
+            };
+
+            csv = maps.ToCsv();
+            csv.Print();
+            Assert.That(csv, Is.EqualTo("Id|Name\n\n1|Value\n\n2|`Value|Escaped`\n\n"));
+
+            CsvConfig.ItemSeperatorString = JsWriter.ItemSeperatorString;
+            CsvConfig.ItemDelimiterString = JsWriter.QuoteString;
+            CsvConfig.RowSeparatorString = Environment.NewLine;
+        }
+
+        [Test]
+        public void Does_use_CsvConfig_for_Dictionary_object()
+        {
+            CsvConfig.ItemSeperatorString = "|";
+            CsvConfig.ItemDelimiterString = "`";
+            CsvConfig.RowSeparatorString = "\n\n";
+
+        }
+    }
+}

tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj

@@ -183,6 +183,7 @@
     <Compile Include="AutoMappingTests.cs" />
     <Compile Include="BasicStringSerializerTests.cs" />
     <Compile Include="BclStructTests.cs" />
+    <Compile Include="CsvSerializerConfigTests.cs" />
     <Compile Include="CsvTests\DictionaryTests.cs" />
     <Compile Include="CyclicalDependencyTests.cs" />
     <Compile Include="DateTimeExtensionsTests.cs" />
@@ -352,4 +353,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>