Merge git://github.com/ntziolis/RestSharp

Conflicts:
	RestSharp/Deserializers/JsonDeserializer.cs

Author: ayoung

RestSharp.Tests/JsonTests.cs

@@ -313,6 +313,24 @@ public void Ignore_ReadOnly_Property_That_Exists_In_Data()
 			Assert.Null(p.ReadOnlyProxy);
 		}
 
+		[Fact]
+        public void Can_Deserialize_TimeSpan()
+        {
+            var doc = File.ReadAllText(Path.Combine("SampleData", "timespans.txt"));
+            var d = new JsonDeserializer();
+            var response = new RestResponse { Content = doc };
+            var payload = d.Deserialize<TimeSpanTestStructure>(response);
+
+            Assert.Equal(new TimeSpan(468006), payload.Tick);
+            Assert.Equal(new TimeSpan(0, 0, 0, 0, 125), payload.Millisecond);
+            Assert.Equal(new TimeSpan(0, 0, 8), payload.Second);
+            Assert.Equal(new TimeSpan(0, 55, 2), payload.Minute);
+            Assert.Equal(new TimeSpan(21, 30, 7), payload.Hour);
+            Assert.Null(payload.NullableWithoutValue);
+            Assert.NotNull(payload.NullableWithValue);
+            Assert.Equal(new TimeSpan(21, 30, 7), payload.NullableWithValue.Value);
+        }
+
 		[Fact]
 		public void Can_Deserialize_Iso_Json_Dates()
 		{

RestSharp.Tests/RestSharp.Tests.csproj

@@ -151,6 +151,9 @@
     <Content Include="SampleData\Lastfm.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="SampleData\timespans.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="SampleData\xmllists.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

RestSharp.Tests/SampleClasses/misc.cs

@@ -154,6 +154,17 @@ public class DateTimeTestStructure
 		public DateTimeOffset? NullableDateTimeOffsetWithValue { get; set; }
 	}
 
+    public class TimeSpanTestStructure
+    {
+        public TimeSpan Tick { get; set; }
+        public TimeSpan Millisecond { get; set; }
+        public TimeSpan Second { get; set; }
+        public TimeSpan Minute { get; set; }
+        public TimeSpan Hour { get; set; }
+        public TimeSpan? NullableWithoutValue { get; set; }
+        public TimeSpan? NullableWithValue { get; set; }
+    }
+
 	public class JsonEnumsTestStructure
 	{
 		public Disposition Upper { get; set; }

RestSharp.Tests/SampleData/timespans.txt

@@ -0,0 +1,9 @@
+{
+    "Tick": "00:00:00.0468006",
+	"Millisecond": "00:00:00.1250000",
+    "Second": "00:00:08.0000000",
+    "Minute": "00:55:02.0000000",
+    "Hour": "21:30:07.0000000",
+    "NullableWithoutValue": null,
+    "NullableWithValue": "21:30:07.0000000",
+}

RestSharp.Tests/XmlTests.cs

@@ -254,6 +254,48 @@ public void Can_Deserialize_Elements_to_Nullable_Values()
 			Assert.Equal(new Guid(GuidString), output.UniqueId);
 		}
 
+        [Fact]
+        public void Can_Deserialize_TimeSpan()
+        {
+            var culture = CultureInfo.InvariantCulture;
+            var doc = new XDocument(culture);
+
+            TimeSpan? nullTimespan = null;
+            TimeSpan? nullValueTimeSpan = new TimeSpan(21, 30, 7);
+
+            var root = new XElement("Person");
+            root.Add(new XElement("Tick", new TimeSpan(468006)));
+            root.Add(new XElement("Millisecond", new TimeSpan(0, 0, 0, 0, 125)));
+            root.Add(new XElement("Second", new TimeSpan(0, 0, 8)));
+            root.Add(new XElement("Minute", new TimeSpan(0, 55, 2)));
+            root.Add(new XElement("Hour", new TimeSpan(21, 30, 7)));
+            root.Add(new XElement("NullableWithoutValue", nullTimespan));
+            root.Add(new XElement("NullableWithValue", nullValueTimeSpan));
+
+            doc.Add(root);
+
+            var xml = new XmlDeserializer
+            {
+                Culture = culture,
+            };
+
+            var response = new RestResponse { Content = doc.ToString() };
+
+            var d = new XmlDeserializer()
+            {
+                Culture = culture,
+            };
+            var payload = d.Deserialize<TimeSpanTestStructure>(response);
+            Assert.Equal(new TimeSpan(468006), payload.Tick);
+            Assert.Equal(new TimeSpan(0, 0, 0, 0, 125), payload.Millisecond);
+            Assert.Equal(new TimeSpan(0, 0, 8), payload.Second);
+            Assert.Equal(new TimeSpan(0, 55, 2), payload.Minute);
+            Assert.Equal(new TimeSpan(21, 30, 7), payload.Hour);
+            Assert.Null(payload.NullableWithoutValue);
+            Assert.NotNull(payload.NullableWithValue);
+            Assert.Equal(new TimeSpan(21, 30, 7), payload.NullableWithValue.Value);
+        }
+
 		[Fact]
 		public void Can_Deserialize_Custom_Formatted_Date()
 		{

RestSharp/Deserializers/JsonDeserializer.cs

@@ -140,7 +140,12 @@ private void Map(object target, IDictionary<string, object> data)
 					string raw = value.ToString();
 					var guid = string.IsNullOrEmpty(raw) ? Guid.Empty : new Guid(raw);
 					prop.SetValue(target, guid, null);
-				}
+                }
+                else if (type == typeof(TimeSpan))
+                {
+                    var timeSpan = TimeSpan.Parse(value.ToString());
+                    prop.SetValue(target, timeSpan, null);
+                }
 				else if (type.IsGenericType)
 				{
 					var genericTypeDef = type.GetGenericTypeDefinition();

RestSharp/Deserializers/XmlDeserializer.cs

@@ -179,7 +179,12 @@ private void Map(object x, XElement root)
 					var raw = value.ToString();
 					value = string.IsNullOrEmpty(raw) ? Guid.Empty : new Guid(value.ToString());
 					prop.SetValue(x, value, null);
-				}
+                }
+                else if (type == typeof(TimeSpan))
+                {
+                    var timeSpan = XmlConvert.ToTimeSpan(value.ToString());
+                    prop.SetValue(x, timeSpan, null);
+                }
 				else if (type.IsGenericType)
 				{
 					var t = type.GetGenericArguments()[0];