Add support for deserializing tuples

Author: mythz

src/ServiceStack.Text/Common/DeserializeCustomGenericType.cs

@@ -0,0 +1,47 @@
+using System;
+using ServiceStack.Text.Json;
+
+namespace ServiceStack.Text.Common
+{
+    internal static class DeserializeCustomGenericType<TSerializer>
+        where TSerializer : ITypeSerializer
+    {
+        private static readonly ITypeSerializer Serializer = JsWriter.GetTypeSerializer<TSerializer>();
+
+        public static ParseStringDelegate GetParseMethod(Type type)
+        {
+            if (type.Name.IndexOf("Tuple`", StringComparison.Ordinal) >= 0)
+                return x => ParseTuple(type, x);
+
+            return null;
+        }
+
+        public static object ParseTuple(Type tupleType, string value)
+        {
+            var index = 0;
+            Serializer.EatMapStartChar(value, ref index);
+            if (JsonTypeSerializer.IsEmptyMap(value, index)) 
+                return tupleType.CreateInstance();
+
+            var genericArgs = tupleType.GetGenericArguments();
+            var argValues = new object[genericArgs.Length];
+            var valueLength = value.Length;
+            while (index < valueLength)
+            {
+                var keyValue = Serializer.EatMapKey(value, ref index);
+                Serializer.EatMapKeySeperator(value, ref index);
+                var elementValue = Serializer.EatValue(value, ref index);
+                if (keyValue == null) continue;
+
+                var keyIndex = keyValue.Substring("Item".Length).ToInt() - 1;
+                var parseFn = Serializer.GetParseFn(genericArgs[keyIndex]);
+                argValues[keyIndex] = parseFn(elementValue);
+
+                Serializer.EatItemSeperatorOrMapEndChar(value, ref index);
+            }
+
+            var ctor = tupleType.GetConstructor(genericArgs);
+            return ctor.Invoke(argValues);
+        }
+    }
+}

src/ServiceStack.Text/Common/JsReader.cs

@@ -75,6 +75,10 @@ private ParseStringDelegate GetCoreParseFn<T>()
 
                 if (type.IsOrHasGenericInterfaceTypeOf(typeof(IEnumerable<>)))
                     return DeserializeEnumerable<T, TSerializer>.Parse;
+
+                var customFn = DeserializeCustomGenericType<TSerializer>.GetParseMethod(type);
+                if (customFn != null)
+                    return customFn;
             }
 
 			var pclParseFn = PclExport.Instance.GetJsReaderParseMethod<TSerializer>(typeof(T));

src/ServiceStack.Text/ServiceStack.Text.PCL.csproj

@@ -42,6 +42,7 @@
     <Compile Include="AutoMappingUtils.cs" />
     <Compile Include="Build.Silverlight.cs" />
     <Compile Include="CollectionExtensions.cs" />
+    <Compile Include="Common\DeserializeCustomGenericType.cs" />
     <Compile Include="Common\DeserializeKeyValuePair.cs" />
     <Compile Include="IStringSerializer.cs" />
     <Compile Include="Pcl.Dynamic.cs" />

src/ServiceStack.Text/ServiceStack.Text.SL5.csproj

@@ -65,6 +65,7 @@
     <Compile Include="AutoMappingUtils.cs" />
     <Compile Include="Build.Silverlight.cs" />
     <Compile Include="CollectionExtensions.cs" />
+    <Compile Include="Common\DeserializeCustomGenericType.cs" />
     <Compile Include="Common\DeserializeKeyValuePair.cs" />
     <Compile Include="IStringSerializer.cs" />
     <Compile Include="Pcl.Dynamic.cs" />

src/ServiceStack.Text/ServiceStack.Text.Signed.csproj

@@ -97,6 +97,7 @@
     <Compile Include="AutoMappingUtils.cs" />
     <Compile Include="Build.Silverlight.cs" />
     <Compile Include="CollectionExtensions.cs" />
+    <Compile Include="Common\DeserializeCustomGenericType.cs" />
     <Compile Include="Common\DeserializeKeyValuePair.cs" />
     <Compile Include="IStringSerializer.cs" />
     <Compile Include="Pcl.Dynamic.cs" />

src/ServiceStack.Text/ServiceStack.Text.csproj

@@ -91,6 +91,7 @@
     <Compile Include="AutoMappingUtils.cs" />
     <Compile Include="Build.Silverlight.cs" />
     <Compile Include="CollectionExtensions.cs" />
+    <Compile Include="Common\DeserializeCustomGenericType.cs" />
     <Compile Include="Common\DeserializeKeyValuePair.cs" />
     <Compile Include="IStringSerializer.cs" />
     <Compile Include="Pcl.Dynamic.cs" />

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

@@ -277,6 +277,7 @@
     <Compile Include="Support\BenchmarkTests.cs" />
     <Compile Include="Support\MovieDtos.cs" />
     <Compile Include="SystemTimeTests.cs" />
+    <Compile Include="TupleTests.cs" />
     <Compile Include="UseCases\CentroidTests.cs" />
     <Compile Include="UseCases\GitHubRestTests.cs" />
     <Compile Include="UseCases\GithubV3ApiTests.cs" />

tests/ServiceStack.Text.Tests/TupleTests.cs

@@ -0,0 +1,64 @@
+using System;
+using NUnit.Framework;
+
+namespace ServiceStack.Text.Tests
+{
+    [TestFixture]
+    public class TupleTests
+    {
+        [Test]
+        public void can_get_single_tuple()
+        {
+            var tuple = Tuple.Create(true);
+            var tstr = JsonSerializer.SerializeToString(tuple);
+            Assert.True(tstr.Contains(":true"));
+
+            var deser = JsonSerializer.DeserializeFromString<Tuple<bool>>(tstr);
+            Assert.True(deser.Item1); //fails
+        }
+
+        [Test]
+        public void can_get_double_tuple()
+        {
+            var tuple = Tuple.Create<bool, bool>(true, true);
+            var tstr = JsonSerializer.SerializeToString(tuple);
+            Assert.True(tstr.Contains(":true"));
+
+            var deser = JsonSerializer.DeserializeFromString<Tuple<bool, bool>>(tstr);
+            Assert.True(deser.Item1); //fails
+            Assert.True(deser.Item2);
+        }
+
+        private class OtherType
+        {
+            public bool Item1 { get; set; }
+        }
+
+        [Test]
+        public void can_get_othertype()
+        {
+            var item = new OtherType() { Item1 = true };
+            var tstr = JsonSerializer.SerializeToString(item);
+            Assert.True(tstr.Contains(":true"));
+
+            var deser = JsonSerializer.DeserializeFromString<OtherType>(tstr);
+            Assert.True(deser.Item1); //works
+        }
+
+        private class OtherType<T>
+        {
+            public T Item1 { get; set; }
+        }
+
+        [Test]
+        public void can_get_othertype_typed()
+        {
+            var item = new OtherType<bool>() { Item1 = true };
+            var tstr = JsonSerializer.SerializeToString(item);
+            Assert.True(tstr.Contains(":true"));
+
+            var deser = JsonSerializer.DeserializeFromString<OtherType<bool>>(tstr);
+            Assert.True(deser.Item1); //works
+        }
+    }
+}