Merge master into alpha

Author: codejudas

src/Twilio/Converters/Serializers.cs

@@ -0,0 +1,21 @@
+using Newtonsoft.Json;
+
+namespace Twilio.Converters
+{
+    /// <summary>
+    /// Serialization methods for various datatypes before making requests to the API
+    /// </summary>
+    public class Serializers
+    {
+
+        /// <summary>
+        /// Produce a json string from input if possible
+        /// </summary>
+        /// <param name="input">Object to serialize to json</param>
+        /// <returns>A json string</returns>
+        public static string JsonObject(object input)
+        {
+            return (input is string) ? (string) input : JsonConvert.SerializeObject(input);
+        }
+    }
+}

test/Twilio.Test/Converters/SerializersTest.cs

@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+using NUnit.Framework;
+using Twilio.Converters;
+
+namespace Twilio.Tests.Converters
+{
+    [TestFixture]
+    public class SerializersTest : TwilioTest {
+
+        [Test]
+        public void TestJsonObjectSerializesDictionary()
+        {
+            var inputDict = new Dictionary<string, string> {{"twilio", "rocks"}};
+            var result = Serializers.JsonObject(inputDict);
+            Assert.AreEqual("{\"twilio\":\"rocks\"}", result);
+        }
+
+        [Test]
+        public void TestJsonObjectSerializesList()
+        {
+            var inputDict = new List<object>{
+                "twilio",
+                new Dictionary<string, string> {{"join", "us"}}
+            };
+            var result = Serializers.JsonObject(inputDict);
+            Assert.AreEqual("[\"twilio\",{\"join\":\"us\"}]", result);
+        }
+
+        [Test]
+        public void TestJsonObjectSerializesArray()
+        {
+            string[] inputDict = new string[2] {"twilio", "rocks"};
+            var result = Serializers.JsonObject(inputDict);
+            Assert.AreEqual("[\"twilio\",\"rocks\"]", result);
+        }
+
+        [Test]
+        public void TestJsonObjectPassesThroughString()
+        {
+            var input = "{\"twilio\":\"is dope\"}";
+            var result = Serializers.JsonObject(input);
+            Assert.AreEqual(input, result);
+        }
+    }
+}