Adding support for deserializing enums from integer representations

Author: dontjee

RestSharp.Tests/JsonTests.cs

@@ -245,13 +245,23 @@ public void Can_Deserialize_Various_Enum_Values ()
 			var json = new JsonDeserializer ();
 			var output = json.Deserialize<JsonEnumsTestStructure>(response);
 
-			Assert.Equal (output.Upper, Disposition.Friendly);
-			Assert.Equal (output.Lower, Disposition.Friendly);
-			Assert.Equal (output.CamelCased, Disposition.SoSo);
-			Assert.Equal (output.Underscores, Disposition.SoSo);
-			Assert.Equal (output.LowerUnderscores, Disposition.SoSo);
-			Assert.Equal (output.Dashes, Disposition.SoSo);
-			Assert.Equal (output.LowerDashes, Disposition.SoSo);
+			Assert.Equal(Disposition.Friendly,output.Upper);
+			Assert.Equal(Disposition.Friendly,output.Lower);
+			Assert.Equal(Disposition.SoSo,output.CamelCased);
+			Assert.Equal(Disposition.SoSo,output.Underscores);
+			Assert.Equal(Disposition.SoSo,output.LowerUnderscores);
+			Assert.Equal(Disposition.SoSo,output.Dashes);
+			Assert.Equal(Disposition.SoSo,output.LowerDashes);
+			Assert.Equal(Disposition.SoSo,output.Integer);
+		}
+
+		[Fact]
+		public void Deserialization_Of_Undefined_Int_Value_Still_Throws_InvalidOperationException()
+		{
+			const string data = @"{ ""Integer"" : 1024 }";
+			var response = new RestResponse { Content = data };
+			var json = new JsonDeserializer ();
+			Assert.Throws<InvalidOperationException>(() => json.Deserialize<JsonEnumsTestStructure>(response));
 		}
 
 		[Fact]

RestSharp.Tests/SampleClasses/misc.cs

@@ -192,5 +192,6 @@ public class JsonEnumsTestStructure
 		public Disposition LowerUnderscores { get; set; }
 		public Disposition Dashes { get; set; }
 		public Disposition LowerDashes { get; set; }
+		public Disposition Integer { get; set; }
 	}
 }

RestSharp.Tests/SampleData/jsonenums.txt

@@ -6,4 +6,5 @@
   "lower_underscores": "so_so",
   "dashes": "So-So",
   "lower_dashes": "so_so",
+  "integer" : 1
 }

RestSharp.Tests/SerializerTests.cs

@@ -68,6 +68,25 @@ public void Can_serialize_simple_POCO() {
 			Assert.Equal(expected.ToString(), doc.ToString());
 		}
 
+		[Fact]
+		public void Can_serialize_Enum()
+		{
+			var enumClass = new ClassWithEnum
+			{
+				Color = Color.Red
+			};
+
+			var xml = new XmlSerializer();
+			var doc = xml.Serialize(enumClass);
+
+			var expected = new XDocument();
+			var root = new XElement("ClassWithEnum");
+			root.Add( new XElement("Color", "Red") );
+			expected.Add(root);
+
+			Assert.Equal( expected.ToString(), doc.ToString() );
+      }
+
 		[Fact]
 		public void Can_serialize_simple_POCO_With_DateFormat_Specified() {
 			var poco = new Person {
@@ -194,6 +213,18 @@ private class Item
 			public int Value { get; set; }
 		}
 
+		private enum Color
+		{
+			Red,
+			Blue,
+			Green
+		}
+
+		private class ClassWithEnum
+		{
+			public Color Color { get; set; }
+		}
+
 		[SerializeAs(Name = "Person")]
 		private class WackyPerson
 		{

RestSharp/Extensions/ReflectionExtensions.cs

@@ -92,9 +92,22 @@ public static object ChangeType(this object source, Type newType, CultureInfo cu
 		public static object FindEnumValue(this Type type, string value, CultureInfo culture)
 		{
 #if FRAMEWORK
-			return Enum.GetValues(type)
-				.Cast<Enum>()
+			var enumValues = Enum.GetValues( type ).Cast<Enum>().ToList();
+			try
+			{
+				return enumValues
 				.First(v => v.ToString().GetNameVariants(culture).Contains(value, StringComparer.Create(culture, true)));
+			}
+			catch (InvalidOperationException)
+			{
+				int enumValueAsInt;
+				if(int.TryParse( value, out enumValueAsInt ) && Enum.IsDefined(type, enumValueAsInt))
+				{
+					return enumValues
+					.First(v => Convert.ToInt32(v) == enumValueAsInt);
+				}
+				throw;
+			}
 #else
 			return Enum.Parse(type, value, true);
 #endif