Merge pull request #291 from petejohanson/single_list_item_support

Allow deserializing a single item into a List<T> field, for JSON that on...

Author: petejohanson

RestSharp.Tests/JsonTests.cs

@@ -19,6 +19,7 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
@@ -70,6 +71,28 @@ public void Can_Deserialize_Simple_Generic_List_of_Simple_Types()
 			Assert.NotEmpty(output);
 		}
 
+		[Fact]
+		public void Can_Deserialize_Simple_Generic_List_Given_Item_Without_Array ()
+		{
+			const string content = "{\"users\":\"johnsheehan\"}";
+			var json = new JsonDeserializer { RootElement = "users" };
+
+			var output = json.Deserialize<List<string>> (new RestResponse { Content = content });
+
+			Assert.True (output.SequenceEqual (new[] { "johnsheehan" }));
+		}
+
+		[Fact]
+		public void Can_Deserialize_Simple_Generic_List_Given_Toplevel_Item_Without_Array ()
+		{
+			const string content = "\"johnsheehan\"";
+			var json = new JsonDeserializer ();
+
+			var output = json.Deserialize<List<string>> (new RestResponse { Content = content });
+
+			Assert.True (output.SequenceEqual (new[] { "johnsheehan" }));
+		}
+
 		[Fact]
 		public void Can_Deserialize_From_Root_Element()
 		{

RestSharp/Deserializers/JsonDeserializer.cs

@@ -200,22 +200,25 @@ private IList BuildList(Type type, object parent)
 			var list = (IList)Activator.CreateInstance(type);
 			var itemType = type.GetGenericArguments()[0];
 
-			foreach (var element in (IList)parent)
-			{
-				if (itemType.IsPrimitive)
-				{
-					var value = element.ToString();
-					list.Add(value.ChangeType(itemType, Culture));
-				}
-				else if (itemType == typeof(string))
-				{
-					list.Add(element.ToString());
-				}
-				else
-				{
-					var item = CreateAndMap(itemType, element);
-					list.Add(item);
+			if (parent is IList) {
+				foreach (var element in (IList)parent) {
+					if (itemType.IsPrimitive)
+					{
+						var value = element.ToString ();
+						list.Add (value.ChangeType (itemType, Culture));
+					}
+					else if (itemType == typeof (string))
+					{
+						list.Add (element.ToString ());
+					}
+					else
+					{
+						var item = CreateAndMap (itemType, element);
+						list.Add (item);
+					}
 				}
+			} else {
+			    list.Add (CreateAndMap (itemType, parent));
 			}
 			return list;
 		}