Merge branch 'darvids0n-master'

Author: Michael Hallett

RestSharp.Tests/JsonTests.cs

@@ -31,6 +31,19 @@ public class JsonTests
 
         private const string GuidString = "AC1FC4BC-087A-4242-B8EE-C53EBE9887A5";
 
+        [Fact]
+        public void Can_Deserialize_Into_Struct()
+        {
+            const string content = "{\"one\":\"oneOneOne\", \"two\":\"twoTwoTwo\", \"three\":3}";
+            var json = new JsonDeserializer();
+            var output = json.Deserialize<SimpleStruct>(new RestResponse { Content = content });
+
+            Assert.NotNull(output);
+            Assert.Equal("oneOneOne", output.One);
+            Assert.Equal("twoTwoTwo", output.Two);
+            Assert.Equal(3, output.Three);
+        }
+
         [Fact]
         public void Can_Deserialize_Select_Tokens()
         {

RestSharp.Tests/RestSharp.Tests.csproj

@@ -84,6 +84,7 @@
     <Compile Include="SampleClasses\EmployeeTracker.cs" />
     <Compile Include="SampleClasses\EnumTest.cs" />
     <Compile Include="SampleClasses\GoogleWeatherWithAttributes.cs" />
+    <Compile Include="SampleClasses\Struct.cs" />
     <Compile Include="XmlAttributeDeserializerTests.cs" />
     <Compile Include="CultureChange.cs" />
     <Compile Include="JsonTests.cs" />

RestSharp.Tests/SampleClasses/EmployeeTracker.cs

@@ -10,6 +10,7 @@ public class EmployeeTracker
         /// Value:  Messages sent to employee.
         /// </summary>
         public Dictionary<String, List<String>> EmployeesMail { get; set; }
+
         /// <summary>
         /// Key:    Employee name.
         /// Value:  Hours worked this each week.

RestSharp.Tests/SampleClasses/Struct.cs

@@ -0,0 +1,12 @@
+
+namespace RestSharp.Tests.SampleClasses
+{
+    public struct SimpleStruct
+    {
+        public string One { get; set; }
+
+        public string Two { get; set; }
+
+        public int Three { get; set; }
+    }
+}

RestSharp.Tests/XmlDeserializerTests.cs

@@ -36,14 +36,26 @@ private string PathFor(string sampleFile)
             return Path.Combine(SampleDataPath, sampleFile);
         }
 
+        [Fact]
+        public void Can_Deserialize_Into_Struct()
+        {
+            const string content = "<root><one>oneOneOne</one><two>twoTwoTwo</two><three>3</three></root>";
+            var xml = new XmlDeserializer();
+            var output = xml.Deserialize<SimpleStruct>(new RestResponse { Content = content });
+
+            Assert.NotNull(output);
+            Assert.Equal("oneOneOne", output.One);
+            Assert.Equal("twoTwoTwo", output.Two);
+            Assert.Equal(3, output.Three);
+        }
         [Fact]
         public void Can_Deserialize_Lists_of_Simple_Types()
         {
             var xmlpath = PathFor("xmllists.xml");
             var doc = XDocument.Load(xmlpath);
 
             var xml = new XmlDeserializer();
-            var output = xml.Deserialize<SimpleTypesListSample>(new RestResponse() { Content = doc.ToString() });
+            var output = xml.Deserialize<SimpleTypesListSample>(new RestResponse { Content = doc.ToString() });
 
             Assert.NotEmpty(output.Names);
             Assert.NotEmpty(output.Numbers);
@@ -216,7 +228,7 @@ public void Can_Deserialize_Elements_to_Nullable_Values()
         {
             var culture = CultureInfo.InvariantCulture;
             var doc = CreateXmlWithoutEmptyValues(culture);
-            var xml = new XmlDeserializer() { Culture = culture };
+            var xml = new XmlDeserializer { Culture = culture };
             var output = xml.Deserialize<NullableValues>(new RestResponse { Content = doc });
 
             Assert.NotNull(output.Id);

RestSharp/Deserializers/JsonDeserializer.cs

@@ -49,7 +49,7 @@ public T Deserialize<T>(IRestResponse response)
             else
             {
                 var root = FindRoot(response.Content);
-                Map(target, (IDictionary<string, object>)root);
+                target = (T)Map(target, (IDictionary<string, object>)root);
             }
 
             return target;
@@ -67,7 +67,7 @@ private object FindRoot(string content)
             return data;
         }
 
-        private void Map(object target, IDictionary<string, object> data)
+        private object Map(object target, IDictionary<string, object> data)
         {
             var objType = target.GetType();
             var props = objType.GetProperties().Where(p => p.CanWrite).ToList();
@@ -108,6 +108,8 @@ private void Map(object target, IDictionary<string, object> data)
                 if (value != null)
                     prop.SetValue(target, ConvertValue(type, value), null);
             }
+
+            return target;
         }
 
         private IDictionary BuildDictionary(Type type, object parent)
@@ -204,23 +206,27 @@ private object ConvertValue(Type type, object value)
             {
                 return value.ChangeType(type, Culture);
             }
-            else if (type.IsEnum)
+
+            if (type.IsEnum)
             {
                 return type.FindEnumValue(stringValue, Culture);
             }
-            else if (type == typeof(Uri))
+
+            if (type == typeof(Uri))
             {
                 return new Uri(stringValue, UriKind.RelativeOrAbsolute);
             }
-            else if (type == typeof(string))
+
+            if (type == typeof(string))
             {
                 return stringValue;
             }
-            else if (type == typeof(DateTime)
+
+            if (type == typeof(DateTime)
 #if !PocketPC
-                    || type == typeof(DateTimeOffset)
+ || type == typeof(DateTimeOffset)
 #endif
-                    )
+)
             {
                 DateTime dt;
 
@@ -241,7 +247,8 @@ private object ConvertValue(Type type, object value)
                 {
                     return dt;
                 }
-                else if (type == typeof(DateTimeOffset))
+
+                if (type == typeof(DateTimeOffset))
                 {
                     return (DateTimeOffset)dt;
                 }
@@ -270,7 +277,8 @@ private object ConvertValue(Type type, object value)
                 {
                     return BuildList(type, value);
                 }
-                else if (genericTypeDef == typeof(Dictionary<,>))
+
+                if (genericTypeDef == typeof(Dictionary<,>))
                 {
                     var keyType = type.GetGenericArguments()[0];
 

RestSharp/Deserializers/XmlDeserializer.cs

@@ -70,7 +70,7 @@ public virtual T Deserialize<T>(IRestResponse response)
             }
             else
             {
-                Map(x, root);
+                x = (T)Map(x, root);
             }
 
             return x;
@@ -100,7 +100,7 @@ private void RemoveNamespace(XDocument xdoc)
             }
         }
 
-        protected virtual void Map(object x, XElement root)
+        protected virtual object Map(object x, XElement root)
         {
             var objType = x.GetType();
             var props = objType.GetProperties();
@@ -281,6 +281,8 @@ protected virtual void Map(object x, XElement root)
                     }
                 }
             }
+
+            return x;
         }
 
         private static bool TryGetFromString(string inputString, out object result, Type type)
@@ -325,9 +327,7 @@ private object HandleListDerivative(object x, XElement root, string propName, Ty
             }
 
             var list = (IList)Activator.CreateInstance(type);
-
             var elements = root.Descendants(t.Name.AsNamespaced(Namespace));
-
             var name = t.Name;
 
             if (!elements.Any())
@@ -441,7 +441,7 @@ protected virtual XElement GetElementByName(XElement root, XName name)
             }
 
             // try looking for element that matches sanitized property name (Order by depth)
-            var element = 
+            var element =
                 root.Descendants()
                     .OrderBy(d => d.Ancestors().Count())
                     .FirstOrDefault(d => d.Name.LocalName.RemoveUnderscoresAndDashes() == name.LocalName) ?? root.Descendants()