Add support for serializing dynamic generic IDictionary's to CSV

ServiceStack · Aug 28, 2015 · 18cab8b · 18cab8b
1 parent 7a75f6b
commit 18cab8b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/src/ServiceStack.Text/CsvWriter.cs b/src/ServiceStack.Text/CsvWriter.cs
@@ -33,7 +33,7 @@ public static void WriteObjectRow(TextWriter writer, IEnumerable<object> row)
             writer.Write(CsvConfig.RowSeparatorString);
         }
 
-        public static void Write(TextWriter writer, IEnumerable<Dictionary<string, object>> records)
+        public static void Write(TextWriter writer, IEnumerable<IDictionary<string, object>> records)
         {
             if (records == null) return; //AOT
 
@@ -49,7 +49,7 @@ public static void Write(TextWriter writer, IEnumerable<Dictionary<string, objec
             }
         }
 
-        public static void Write(TextWriter writer, IEnumerable<Dictionary<string, string>> records)
+        public static void Write(TextWriter writer, IEnumerable<IDictionary<string, string>> records)
         {
             if (records == null) return; //AOT
 
@@ -221,9 +221,15 @@ public static void Write(TextWriter writer, IEnumerable<T> records)
         {
             if (writer == null) return; //AOT
 
-            if (typeof(T) == typeof(Dictionary<string, string>))
+            if (typeof(T) == typeof(Dictionary<string, string>) || typeof(T) == typeof(IDictionary<string, string>))
             {
-                CsvDictionaryWriter.Write(writer, (IEnumerable<Dictionary<string, string>>)records);
+                CsvDictionaryWriter.Write(writer, (IEnumerable<IDictionary<string, string>>)records);
+                return;
+            }
+
+            if (typeof(T) == typeof(Dictionary<string, object>) || typeof(T) == typeof(IDictionary<string, object>))
+            {
+                CsvDictionaryWriter.Write(writer, (IEnumerable<IDictionary<string, object>>)records);
                 return;
             }
 

diff --git a/src/ServiceStack.Text/ReflectionExtensions.cs b/src/ServiceStack.Text/ReflectionExtensions.cs
@@ -1852,6 +1852,10 @@ public void SetValue(object instance, object value)
             if (alreadyDict != null)
                 return alreadyDict;
 
+            var interfaceDict = obj as IDictionary<string, object>;
+            if (interfaceDict != null)
+                return new Dictionary<string, object>(interfaceDict);
+
             var type = obj.GetType();
 
             ObjectDictionaryDefinition def;

diff --git a/src/ServiceStack.Text/StringExtensions.cs b/src/ServiceStack.Text/StringExtensions.cs
@@ -998,6 +998,13 @@ public static int CountOccurrencesOf(this string text, char needle)
             return count;
         }
 
+        public static string NormalizeNewLines(this string text)
+        {
+            return text != null
+                ? text.Replace("\r\n", "\n")
+                : null;
+        }
+
 #if !LITE
         public static string HexEscape(this string text, params char[] anyCharOf)
         {

diff --git a/tests/ServiceStack.Text.Tests/DynamicJsonTests.cs b/tests/ServiceStack.Text.Tests/DynamicJsonTests.cs
@@ -6,24 +6,30 @@ namespace ServiceStack.Text.Tests
     public class DynamicJsonTests
     {
         [Test]
-        public void Can_serialize_dynamic_instance()
+        public void Can_Serialize_dynamic_collection()
         {
-            var dog = new { Name = "Spot" };
-            var json = DynamicJson.Serialize(dog);
+            dynamic rows = new[] { new { Name = "Foo" }, new { Name = "Bar" } };
+
+            string json = JsonSerializer.SerializeToString(rows);
 
-            Assert.IsNotNull(json);
-            json.Print();
+            Assert.That(json, Is.EqualTo("[{\"Name\":\"Foo\"},{\"Name\":\"Bar\"}]"));
+
+            string csv = CsvSerializer.SerializeToString(rows);
+            Assert.That(csv.NormalizeNewLines(), Is.EqualTo("Name\nFoo\nBar\n"));
         }
 
         [Test]
         public void Can_deserialize_dynamic_instance()
         {
             var dog = new { Name = "Spot" };
             var json = DynamicJson.Serialize(dog);
+
+            Assert.That(json, Is.EqualTo("{\"Name\":\"Spot\"}"));
+
             var deserialized = DynamicJson.Deserialize(json);
 
             Assert.IsNotNull(deserialized);
-            Assert.AreEqual(dog.Name, deserialized.Name);
+            Assert.That(deserialized.Name, Is.EqualTo(dog.Name));
         }
     }
 }