Merge pull request restsharp#410 from restsharp/object-with-primitive-value-fix

Object with primitive value fix

Author: haacked

RestSharp.Tests/JsonTests.cs

@@ -130,7 +130,7 @@ public void Can_Deserialize_List_of_Guid()
 		{
 			Guid ID1 = new Guid("b0e5c11f-e944-478c-aadd-753b956d0c8c");
 			Guid ID2 = new Guid("809399fa-21c4-4dca-8dcd-34cb697fbca0");
-            var data = new JsonObject();
+			var data = new JsonObject();
 			data["Ids"] = new JsonArray() {ID1, ID2};
 
 			var d = new JsonDeserializer();
@@ -632,6 +632,8 @@ public void Can_Deserialize_To_Dictionary_String_String_With_Dynamic_Values ()
 			Assert.Equal ("{\"Name\":\"ThingBlue\",\"Color\":\"Blue\"}", bd["ThingBlue"]);
 		}
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 		[Fact]
 		public void Can_Deserialize_Decimal_With_Four_Zeros_After_Floating_Point()
 		{
@@ -643,6 +645,14 @@ public void Can_Deserialize_Decimal_With_Four_Zeros_After_Floating_Point()
 			Assert.Equal(result.Value, .00005557m);
 		}
 
+		[Fact]
+		public void Can_Deserialize_Object_Type_Property_With_Primitive_Vale()
+		{
+			var payload = GetPayLoad<ObjectProperties>("objectproperty.txt");
+
+			Assert.Equal(42L, payload.ObjectProperty);
+		}
+
 		private string CreateJsonWithUnderscores()
 		{
 			var doc = new JsonObject();
@@ -657,11 +667,11 @@ private string CreateJsonWithUnderscores()
 			doc["url"] = "http://example.com";
 			doc["url_path"] = "/foo/bar";
 
-            
+			
 			doc["best_friend"] = new JsonObject { 
-                                    {"name", "The Fonz"},
+									{"name", "The Fonz"},
 									{"since", 1952}
-                                };
+								};
 
 			var friendsArray = new JsonArray();
 			for (int i = 0; i < 10; i++)
@@ -677,7 +687,7 @@ private string CreateJsonWithUnderscores()
 			var foesArray = new JsonObject{
 								{"dict1", new JsonObject{{"nickname", "Foe 1"}}},
 								{"dict2", new JsonObject{{"nickname", "Foe 2"}}}
-                            };
+							};
 
 			doc["foes"] = foesArray;
 

RestSharp.Tests/RestSharp.Tests.csproj

@@ -117,6 +117,9 @@
     <Content Include="SampleData\iso8601datetimes.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="SampleData\objectproperty.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="SampleData\underscore_prefix.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

RestSharp.Tests/SampleClasses/misc.cs

@@ -129,6 +129,11 @@ public class OrderedProperties
 		public DateTime StartDate { get; set; }
 	}
 
+	public class ObjectProperties
+	{
+		public object ObjectProperty { get; set; }
+	}
+
 	public class DatabaseCollection : List<Database>
 	{
 	}

RestSharp.Tests/SampleData/objectproperty.txt

@@ -0,0 +1,3 @@
+{
+    "ObjectProperty": 42
+}

RestSharp/Deserializers/JsonDeserializer.cs

@@ -165,6 +165,11 @@ private object ConvertValue(Type type, object value)
 				type = type.GetGenericArguments()[0];
 			}
 
+			if (type == typeof(System.Object) && value != null)
+			{
+				type = value.GetType();
+			}
+
 			if (type.IsPrimitive)
 			{
 				// no primitives can contain quotes so we can safely remove them