Merge pull request #93 from MehdiK/DehumanizeTo

added non-generic DehumanizeTo - addresses #92
Humanizr · Feb 18, 2014 · 4ff641a · 4ff641a
2 parents 69b4386 + bcef4ed
commit 4ff641a
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 7 deletions.
diff --git a/readme.md b/readme.md
@@ -106,6 +106,18 @@ And the usage is:
 
 And just like the Humanize API it honors the `Description` attribute. You don't have to provide the casing you provided during humanization: it figures it out.
 
+There is also a non-generic counterpart for when the original Enum is not known at compile time:
+
+```C#
+public static Enum DehumanizeTo(this string input, Type targetEnum) 
+```
+
+which can be used like:
+
+```C#
+"Member without description attribute".DehumanizeTo(typeof(EnumUnderTest)) => EnumUnderTest.MemberWithoutDescriptionAttribute
+```
+
 ###Humanize DateTime
 You can `Humanize` an instance of `DateTime` and get back a string telling how far back or forward in time that is:
 

diff --git a/release_notes.md b/release_notes.md
@@ -1,5 +1,5 @@
 ###In Development
-  -
+  - [#93](https://github.com/MehdiK/Humanizer/pull/93): added non-generic DehumanizeTo for Enums unknown at compile time
 
 [Commits](https://github.com/MehdiK/Humanizer/compare/v1.10.1...master)
 

diff --git a/src/Humanizer.Tests/DehumanizeToEnumTests.cs b/src/Humanizer.Tests/DehumanizeToEnumTests.cs
@@ -10,24 +10,28 @@ public class DehumanizeToEnumTests
         public void ThrowsForNonEnums()
         {
             Assert.Throws<ArgumentException>(() => EnumTestsResources.CustomDescription.DehumanizeTo<DummyStructWithEnumInterfaces>());
+            Assert.Throws<ArgumentException>(() => EnumTestsResources.CustomDescription.DehumanizeTo(typeof(DummyStructWithEnumInterfaces)));
         }
 
         [Fact]
         public void ThrowsForEnumNoMatch()
         {
             Assert.Throws<CannotMapToTargetException>(() => EnumTestsResources.CustomDescription.DehumanizeTo<DummyEnum>());
+            Assert.Throws<CannotMapToTargetException>(() => EnumTestsResources.CustomDescription.DehumanizeTo(typeof(DummyEnum)));
         }
 
         [Fact]
         public void HonorsDescriptionAttribute()
         {
             Assert.Equal(EnumUnderTest.MemberWithDescriptionAttribute, EnumTestsResources.CustomDescription.DehumanizeTo<EnumUnderTest>());
+            Assert.Equal(EnumUnderTest.MemberWithDescriptionAttribute, EnumTestsResources.CustomDescription.DehumanizeTo(typeof(EnumUnderTest)));
         }
 
         [Fact]
         public void DehumanizeMembersWithoutDescriptionAttribute()
         {
             Assert.Equal(EnumUnderTest.MemberWithoutDescriptionAttribute, EnumTestsResources.MemberWithoutDescriptionAttributeSentence.DehumanizeTo<EnumUnderTest>());
+            Assert.Equal(EnumUnderTest.MemberWithoutDescriptionAttribute, EnumTestsResources.MemberWithoutDescriptionAttributeSentence.DehumanizeTo(typeof(EnumUnderTest)));
         }
 
         [Theory]
@@ -36,17 +40,15 @@ public void DehumanizeMembersWithoutDescriptionAttribute()
         [InlineData(EnumTestsResources.MemberWithoutDescriptionAttributeSentence, EnumUnderTest.MemberWithoutDescriptionAttribute)]
         public void IsCaseInsensitive(string input, EnumUnderTest expectedEnum)
         {
-            Assert.Equal(
-                expectedEnum,
-                input.DehumanizeTo<EnumUnderTest>());
+            Assert.Equal(expectedEnum, input.DehumanizeTo<EnumUnderTest>());
+            Assert.Equal(expectedEnum, input.DehumanizeTo(typeof(EnumUnderTest)));
         }
 
         [Fact]
         public void AllCapitalMembersAreReturnedAsIs()
         {
-            Assert.Equal(
-                EnumUnderTest.ALLCAPITALS,
-                EnumUnderTest.ALLCAPITALS.ToString().DehumanizeTo<EnumUnderTest>());
+            Assert.Equal(EnumUnderTest.ALLCAPITALS, EnumUnderTest.ALLCAPITALS.ToString().DehumanizeTo<EnumUnderTest>());
+            Assert.Equal(EnumUnderTest.ALLCAPITALS, EnumUnderTest.ALLCAPITALS.ToString().DehumanizeTo(typeof(EnumUnderTest)));
         }
 
         struct DummyStructWithEnumInterfaces : IComparable, IFormattable, IConvertible

diff --git a/src/Humanizer/EnumDehumanizeExtensions.cs b/src/Humanizer/EnumDehumanizeExtensions.cs
@@ -27,6 +27,28 @@ public static TTargetEnum DehumanizeTo<TTargetEnum>(this string input)
 
             throw new CannotMapToTargetException("Couldn't find any enum member that matches the string " + input);
         }
+
+        /// <summary>
+        /// Dehumanizes a string into the Enum it was originally Humanized from!
+        /// </summary>
+        /// <param name="input">The string to be converted</param>
+        /// <param name="targetEnum">The target enum</param>
+        /// <exception cref="ArgumentException">If targetEnum is not an enum</exception>
+        /// <exception cref="CannotMapToTargetException">If the provided string cannot be mapped to the target enum</exception>
+        /// <returns></returns>
+        public static Enum DehumanizeTo(this string input, Type targetEnum) 
+        {
+            var values = Enum.GetValues(targetEnum);
+
+            foreach (var value in values)
+            {
+                var @enum = value as Enum;
+                if (string.Equals(@enum.Humanize(), input, StringComparison.OrdinalIgnoreCase))
+                    return @enum;
+            }
+
+            throw new CannotMapToTargetException("Couldn't find any enum member that matches the string " + input);
+        }
     }
 
     /// <summary>