Merge pull request #458 from allthedrones/master

Correct deserialization for Enums with underscores in their actual named values.

Author: mythz

src/ServiceStack.Text/Common/ParseUtils.cs

@@ -64,7 +64,11 @@ public static Type ParseType(string assemblyQualifiedName)
         public static object TryParseEnum(Type enumType, string str)
         {
             if (JsConfig.EmitLowercaseUnderscoreNames)
-                str = str.Replace("_", "");
+            {
+                string[] names = Enum.GetNames(enumType);
+                if (Array.IndexOf(names, str) == -1)    // case sensitive ... could use Linq Contains() extension with StringComparer.InvariantCultureIgnoreCase instead for a slight penalty
+                    str = str.Replace("_", "");
+            }
 
             return Enum.Parse(enumType, str, ignoreCase: true);
         }

tests/ServiceStack.Text.Tests/EnumTests.cs

@@ -149,10 +149,12 @@ public void Can_serialize_different_enum_styles()
         {
             Assert.That("Word".FromJson<EnumStyles>(), Is.EqualTo(EnumStyles.Word));
             Assert.That("DoubleWord".FromJson<EnumStyles>(), Is.EqualTo(EnumStyles.DoubleWord));
+            Assert.That("Underscore_Words".FromJson<EnumStyles>(), Is.EqualTo(EnumStyles.Underscore_Words));
 
             using (JsConfig.With(emitLowercaseUnderscoreNames: true))
             {
                 Assert.That("Double_Word".FromJson<EnumStyles>(), Is.EqualTo(EnumStyles.DoubleWord));
+                Assert.That("Underscore_Words".FromJson<EnumStyles>(), Is.EqualTo(EnumStyles.Underscore_Words));
             }
         }
     }