Merge pull request #582 from tomgallard/master

Fixed bug where XmlDeserializer would not deserialize public nested type

Author: hallem

RestSharp.Tests/NamespacedXmlTests.cs

@@ -253,7 +253,11 @@ private static string CreateElementsXml() {
 								new XElement(ns + "Since", DateTime.Now.Year - i)
 							));
 			}
-			root.Add(friends);
+            root.Add(friends);
+
+            root.Add(new XElement(ns + "FavoriteBand",
+                        new XElement(ns + "Name", "Goldfinger")
+                    ));
 
 			doc.Add(root);
 			return doc.ToString();

RestSharp.Tests/SampleClasses/misc.cs

@@ -48,6 +48,11 @@ public class PersonForXml
 		public Order Order { get; set; }
 
 		public Disposition Disposition { get; set; }
+        public Band FavoriteBand { get; set; }
+        public class Band
+        {
+            public string Name { get; set; }
+        }
 
 	}
 

RestSharp.Tests/XmlAttributeDeserializerTests.cs

@@ -290,7 +290,18 @@ public void Can_Deserialize_Custom_Formatted_Date()
 
 			Assert.Equal(date, output.StartDate);
 		}
+        [Fact]
+        public void Can_Deserialize_Nested_Class()
+        {
+            var doc = CreateElementsXml();
+            var response = new RestResponse { Content = doc };
+
+            var d = new XmlAttributeDeserializer();
+            var p = d.Deserialize<PersonForXml>(response);
 
+            Assert.NotNull(p.FavoriteBand);
+            Assert.Equal("Goldfinger",p.FavoriteBand.Name);
+        }
 		[Fact]
 		public void Can_Deserialize_Elements_On_Default_Root()
 		{
@@ -839,6 +850,10 @@ private static string CreateElementsXml()
 			}
 			root.Add(friends);
 
+            root.Add(new XElement("FavoriteBand",
+                 new XElement("Name", "Goldfinger")
+             ));
+
 			doc.Add(root);
 			return doc.ToString();
 		}

RestSharp/Deserializers/XmlDeserializer.cs

@@ -96,8 +96,8 @@ protected virtual void Map(object x, XElement root)
 			foreach (var prop in props)
 			{
 				var type = prop.PropertyType;
-
-				if (!type.IsPublic || !prop.CanWrite)
+                var typeIsPublic = type.IsPublic || type.IsNestedPublic;
+				if (!typeIsPublic || !prop.CanWrite)
 					continue;
 
 				var name = prop.Name.AsNamespaced(Namespace);