Merge pull request #292 from petejohanson/str_str_dictionary

Add support for mapping JSON objects to Dictionary<string, string> when ...

Author: petejohanson

RestSharp.Tests/JsonTests.cs

@@ -508,6 +508,20 @@ public void Can_Deserialize_To_Dictionary_String_String()
 			Assert.Equal(bd["ThingBlue"], "ThingBlue");
 		}
 
+		[Fact]
+		public void Can_Deserialize_To_Dictionary_String_String_With_Dynamic_Values ()
+		{
+			var doc = CreateDynamicJsonStringDictionary ();
+			var d = new JsonDeserializer ();
+			var response = new RestResponse { Content = doc };
+			var bd = d.Deserialize<Dictionary<string, string>> (response);
+
+			Assert.Equal ("[\"Value1\",\"Value2\"]", bd["Thing1"]);
+			Assert.Equal ("Thing2", bd["Thing2"]);
+			Assert.Equal ("{\"Name\":\"ThingRed\",\"Color\":\"Red\"}", bd["ThingRed"]);
+			Assert.Equal ("{\"Name\":\"ThingBlue\",\"Color\":\"Blue\"}", bd["ThingBlue"]);
+		}
+
 		private string CreateJsonWithUnderscores()
 		{
 			var doc = new JObject();
@@ -678,5 +692,15 @@ public string CreateJsonStringDictionary()
 			doc["ThingBlue"] = "ThingBlue";
 			return doc.ToString();
 		}
+
+		public string CreateDynamicJsonStringDictionary ()
+		{
+			var doc = new JObject ();
+			doc["Thing1"] = new JArray () { "Value1", "Value2" };
+			doc["Thing2"] = "Thing2";
+			doc["ThingRed"] = new JObject (new JProperty ("Name", "ThingRed"), new JProperty ("Color", "Red"));
+			doc["ThingBlue"] = new JObject (new JProperty("Name", "ThingBlue"), new JProperty ("Color", "Blue"));
+			return doc.ToString ();
+		}
 	}
 }

RestSharp/Deserializers/JsonDeserializer.cs

@@ -249,7 +249,7 @@ private object CreateAndMap(Type type, object element)
 			}
 			else if (type == typeof(string))
 			{
-				instance = (string)element;
+				instance = element.ToString();
 			}
 			else
 			{