Merge pull request #1122 from GordonRudman/main

Humanizr · Sep 13, 2021 · 962e00f · 962e00f
2 parents edc57f7 + c673638
commit 962e00f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/src/Humanizer.Tests.Shared/StringDehumanizeTests.cs b/src/Humanizer.Tests.Shared/StringDehumanizeTests.cs
@@ -5,15 +5,26 @@ namespace Humanizer.Tests
     public class StringDehumanizeTests
     {
         [Theory]
-        [InlineData("Pascal case sentence is camelized", "PascalCaseSentenceIsCamelized")]
-        [InlineData("Title Case Sentence Is Camelized", "TitleCaseSentenceIsCamelized")]
-        [InlineData("Mixed case sentence Is Camelized", "MixedCaseSentenceIsCamelized")]
-        [InlineData("lower case sentence is camelized", "LowerCaseSentenceIsCamelized")]
-        [InlineData("AlreadyDehumanizedStringIsUntouched", "AlreadyDehumanizedStringIsUntouched")]
         [InlineData("", "")]
+        [InlineData("Pascal case sentence is pascalized", "PascalCaseSentenceIsPascalized")]
+        [InlineData("Title Case Sentence Is Pascalized", "TitleCaseSentenceIsPascalized")]
+        [InlineData("Mixed case sentence Is Pascalized", "MixedCaseSentenceIsPascalized")]
+        [InlineData("lower case sentence is pascalized", "LowerCaseSentenceIsPascalized")]
         [InlineData("A special character is removed?", "ASpecialCharacterIsRemoved")]
         [InlineData("A special character is removed after a space ?", "ASpecialCharacterIsRemovedAfterASpace")]
         [InlineData("Internal special characters ?)@ are removed", "InternalSpecialCharactersAreRemoved")]
+        [InlineData("AlreadyDehumanizedStringIsUntouched", "AlreadyDehumanizedStringIsUntouched")]
+        [InlineData("CanDehumanizeIntoAPascalCaseWord", "CanDehumanizeIntoAPascalCaseWord")]
+        [InlineData("CanDehumanizeIntoAPascalCaseWord AndAnother", "CanDehumanizeIntoAPascalCaseWordAndAnother")]
+        [InlineData("OneAndTwo", "OneAndTwo")]
+        [InlineData("OneOrTwo", "OneOrTwo")]
+        [InlineData("OneOfTwo", "OneOfTwo")]
+        [InlineData("OneButTwo", "OneButTwo")]
+        [InlineData("OneATwo", "OneATwo")]
+        [InlineData("OneAsTwo", "OneAsTwo")]
+        [InlineData("OneYetTwo", "OneYetTwo")]
+        [InlineData("OneNorTwo", "OneNorTwo")]
+        [InlineData("WordSoTwo", "WordSoTwo")]
         public void CanDehumanizeIntoAPascalCaseWord(string input, string expectedResult)
         {
             Assert.Equal(expectedResult, input.Dehumanize());

diff --git a/src/Humanizer/StringDehumanizeExtensions.cs b/src/Humanizer/StringDehumanizeExtensions.cs
@@ -1,5 +1,7 @@
 using System.Linq;
 
+using Humanizer;
+
 namespace Humanizer
 {
     /// <summary>
@@ -9,13 +11,17 @@ public static class StringDehumanizeExtensions
     {
         /// <summary>
         /// Dehumanizes a string; e.g. 'some string', 'Some String', 'Some string' -> 'SomeString'
+        /// If a string is already dehumanized then it leaves it alone 'SomeStringAndAnotherString' -> 'SomeStringAndAnotherString'
         /// </summary>
         /// <param name="input">The string to be dehumanized</param>
         /// <returns></returns>
         public static string Dehumanize(this string input)
         {
-            var titlizedWords = input.Split(' ').Select(word => word.Humanize(LetterCasing.Title));
-            return string.Join("", titlizedWords).Replace(" ", "");
+            var pascalizedWords = input.Split(' ').Select(word => word.Humanize().Pascalize());
+            return string.Join("", pascalizedWords).Replace(" ", "");
         }
     }
 }
+
+
+