Add support for long to ToQuantity

readme.md

@@ -414,7 +414,7 @@ class SomeClass
 
 string FormatSomeClass(SomeClass sc)
 {
-	return string.Format("SomeObject #{0} - {1}", sc.SomeInt, sc.SomeString);
+    return string.Format("SomeObject #{0} - {1}", sc.SomeInt, sc.SomeString);
 }
 
 var collection = new List<SomeClass>

src/Humanizer.Tests.Shared/NumberToWordsTests.cs

@@ -40,6 +40,31 @@ public void ToWords(int number, string expected)
             Assert.Equal(expected, number.ToWords());
         }
 
+        [InlineData(1L, "one")]
+        [InlineData(11L, "eleven")]
+        [InlineData(111L, "one hundred and eleven")]
+        [InlineData(1111L, "one thousand one hundred and eleven")]
+        [InlineData(11111L, "eleven thousand one hundred and eleven")]
+        [InlineData(111111L, "one hundred and eleven thousand one hundred and eleven")]
+        [InlineData(1111111L, "one million one hundred and eleven thousand one hundred and eleven")]
+        [InlineData(11111111L, "eleven million one hundred and eleven thousand one hundred and eleven")]
+        [InlineData(111111111L, "one hundred and eleven million one hundred and eleven thousand one hundred and eleven")]
+        [InlineData(1111111111L, "one billion one hundred and eleven million one hundred and eleven thousand one hundred and eleven")]
+        [InlineData(11111111111L, "eleven billion one hundred and eleven million one hundred and eleven thousand one hundred and eleven")]
+        [InlineData(111111111111L, "one hundred and eleven billion one hundred and eleven million one hundred and eleven thousand one hundred and eleven")]
+        [InlineData(1111111111111L, "one trillion one hundred and eleven billion one hundred and eleven million one hundred and eleven thousand one hundred and eleven")]
+        [InlineData(11111111111111L, "eleven trillion one hundred and eleven billion one hundred and eleven million one hundred and eleven thousand one hundred and eleven")]
+        [InlineData(111111111111111L, "one hundred and eleven trillion one hundred and eleven billion one hundred and eleven million one hundred and eleven thousand one hundred and eleven")]
+        [InlineData(1111111111111111L, "one quadrillion one hundred and eleven trillion one hundred and eleven billion one hundred and eleven million one hundred and eleven thousand one hundred and eleven")]
+        [InlineData(11111111111111111L, "eleven quadrillion one hundred and eleven trillion one hundred and eleven billion one hundred and eleven million one hundred and eleven thousand one hundred and eleven")]
+        [InlineData(111111111111111111L, "one hundred and eleven quadrillion one hundred and eleven trillion one hundred and eleven billion one hundred and eleven million one hundred and eleven thousand one hundred and eleven")]
+        [InlineData(1111111111111111111L, "one quintillion one hundred and eleven quadrillion one hundred and eleven trillion one hundred and eleven billion one hundred and eleven million one hundred and eleven thousand one hundred and eleven")]
+        [Theory]
+        public void ToWords(long number, string expected)
+        {
+            Assert.Equal(expected, number.ToWords());
+        }
+
         [Theory]
         [InlineData(0, "zeroth")]
         [InlineData(1, "first")]

src/Humanizer.Tests.Shared/ToQuantityTests.cs

@@ -23,6 +23,7 @@ public class ToQuantityTests
         public void ToQuantity(string word, int quantity, string expected)
         {
             Assert.Equal(expected, word.ToQuantity(quantity));
+            Assert.Equal(expected, word.ToQuantity((long)quantity));
         }
 
         [Theory]
@@ -40,6 +41,7 @@ public void ToQuantity(string word, int quantity, string expected)
         public void ToQuantityWithNoQuantity(string word, int quantity, string expected)
         {
             Assert.Equal(expected, word.ToQuantity(quantity, ShowQuantityAs.None));
+            Assert.Equal(expected, word.ToQuantity((long)quantity, ShowQuantityAs.None));
         }
 
         [Theory]
@@ -58,6 +60,7 @@ public void ToQuantityNumeric(string word, int quantity, string expected)
         {
 // ReSharper disable once RedundantArgumentDefaultValue
             Assert.Equal(expected, word.ToQuantity(quantity, ShowQuantityAs.Numeric));
+            Assert.Equal(expected, word.ToQuantity((long)quantity, ShowQuantityAs.Numeric));
         }
 
         [Theory]
@@ -76,6 +79,7 @@ public void ToQuantityNumeric(string word, int quantity, string expected)
         public void ToQuantityWords(string word, int quantity, string expected)
         {
             Assert.Equal(expected, word.ToQuantity(quantity, ShowQuantityAs.Words));
+            Assert.Equal(expected, word.ToQuantity((long)quantity, ShowQuantityAs.Words));
         }
 
         [Theory]
@@ -93,6 +97,7 @@ public void ToQuantityWords(string word, int quantity, string expected)
         public void ToQuantityWordsWithCurrentCultureFormatting(string word, int quantity, string format, string expected)
         {
             Assert.Equal(expected, word.ToQuantity(quantity, format));
+            Assert.Equal(expected, word.ToQuantity((long)quantity, format));
         }
 
         [Theory]
@@ -110,6 +115,7 @@ public void ToQuantityWordsWithCustomCultureFormatting(string word, int quantity
             var culture = new CultureInfo(cultureCode);
 
             Assert.Equal(expected, word.ToQuantity(quantity, format, culture), GetStringComparer(culture));
+            Assert.Equal(expected, word.ToQuantity((long)quantity, format, culture), GetStringComparer(culture));
         }
 
         internal static StringComparer GetStringComparer(CultureInfo culture)

src/Humanizer.Tests/ApiApprover/PublicApiApprovalTest.approve_public_api.approved.txt

@@ -463,6 +463,8 @@ namespace Humanizer
         public static string ToOrdinalWords(this int number, Humanizer.GrammaticalGender gender, System.Globalization.CultureInfo culture = null) { }
         public static string ToWords(this int number, System.Globalization.CultureInfo culture = null) { }
         public static string ToWords(this int number, Humanizer.GrammaticalGender gender, System.Globalization.CultureInfo culture = null) { }
+        public static string ToWords(this long number, System.Globalization.CultureInfo culture = null) { }
+        public static string ToWords(this long number, Humanizer.GrammaticalGender gender, System.Globalization.CultureInfo culture = null) { }
     }
     public class On
     {
@@ -961,6 +963,8 @@ namespace Humanizer
     {
         public static string ToQuantity(this string input, int quantity, Humanizer.ShowQuantityAs showQuantityAs = 1) { }
         public static string ToQuantity(this string input, int quantity, string format, System.IFormatProvider formatProvider = null) { }
+        public static string ToQuantity(this string input, long quantity, Humanizer.ShowQuantityAs showQuantityAs = 1) { }
+        public static string ToQuantity(this string input, long quantity, string format, System.IFormatProvider formatProvider = null) { }
     }
     public class static TruncateExtensions
     {
@@ -1099,8 +1103,8 @@ namespace Humanizer.Localisation.NumberToWords
 
     public interface INumberToWordsConverter
     {
-        string Convert(int number);
-        string Convert(int number, Humanizer.GrammaticalGender gender);
+        string Convert(long number);
+        string Convert(long number, Humanizer.GrammaticalGender gender);
         string ConvertToOrdinal(int number);
         string ConvertToOrdinal(int number, Humanizer.GrammaticalGender gender);
     }

src/Humanizer.v2.ncrunchsolution

@@ -0,0 +1,13 @@
+<SolutionConfiguration>
+  <FileVersion>1</FileVersion>
+  <InferProjectReferencesUsingAssemblyNames>false</InferProjectReferencesUsingAssemblyNames>
+  <AllowParallelTestExecution>false</AllowParallelTestExecution>
+  <AllowTestsToRunInParallelWithThemselves>true</AllowTestsToRunInParallelWithThemselves>
+  <FrameworkUtilisationTypeForNUnit>UseDynamicAnalysis</FrameworkUtilisationTypeForNUnit>
+  <FrameworkUtilisationTypeForGallio>UseStaticAnalysis</FrameworkUtilisationTypeForGallio>
+  <FrameworkUtilisationTypeForMSpec>UseStaticAnalysis</FrameworkUtilisationTypeForMSpec>
+  <FrameworkUtilisationTypeForMSTest>UseStaticAnalysis</FrameworkUtilisationTypeForMSTest>
+  <FrameworkUtilisationTypeForXUnitV2>UseStaticAnalysis</FrameworkUtilisationTypeForXUnitV2>
+  <MetricsExclusionList>
+</MetricsExclusionList>
+</SolutionConfiguration>

src/Humanizer/Localisation/NumberToWords/AfrikaansNumberToWordsConverter.cs

@@ -22,9 +22,13 @@ internal class AfrikaansNumberToWordsConverter : GenderlessNumberToWordsConverte
             {19, "negentiende"}
         };
 
-        public override string Convert(int number)
+        public override string Convert(long number)
         {
-            return Convert(number, false);
+            if(number > Int32.MaxValue|| number < Int32.MinValue)
+            {
+                throw new NotImplementedException();
+            }
+            return Convert((int)number, false);
         }
 
         public override string ConvertToOrdinal(int number)

src/Humanizer/Localisation/NumberToWords/ArabicNumberToWordsConverter.cs

@@ -15,8 +15,14 @@ internal class ArabicNumberToWordsConverter : GenderlessNumberToWordsConverter
         private static readonly string[] AppendedTwos = { "مئتان", "ألفان", "مليونان", "ملياران", "تريليونان", "كوادريليونان", "كوينتليونان", "سكستيليونلن" };
         private static readonly string[] Twos = { "مئتان", "ألفان", "مليونان", "ملياران", "تريليونان", "كوادريليونان", "كوينتليونان", "سكستيليونان" };
 
-        public override string Convert(int number)
+        public override string Convert(long input)
         {
+            if (input > Int32.MaxValue || input < Int32.MinValue)
+            {
+                throw new NotImplementedException();
+            }
+            var number = (int)input;
+
             if (number == 0)
                 return "صفر";
 

src/Humanizer/Localisation/NumberToWords/BanglaNumberToWordsConverter.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace Humanizer.Localisation.NumberToWords
 {
@@ -59,8 +60,14 @@ public override string ConvertToOrdinal(int number)
             return Convert(number) + " তম";
         }
 
-        public override string Convert(int number)
+        public override string Convert(long input)
         {
+            if (input > Int32.MaxValue || input < Int32.MinValue)
+            {
+                throw new NotImplementedException();
+            }
+            var number = (int)input;
+
             if (number == 0)
                 return UnitsMap[0];
 

src/Humanizer/Localisation/NumberToWords/BrazilianPortugueseNumberToWordsConverter.cs

@@ -13,8 +13,14 @@ internal class BrazilianPortugueseNumberToWordsConverter : GenderedNumberToWords
         private static readonly string[] PortugueseOrdinalTensMap = { "zero", "décimo", "vigésimo", "trigésimo", "quadragésimo", "quinquagésimo", "sexagésimo", "septuagésimo", "octogésimo", "nonagésimo" };
         private static readonly string[] PortugueseOrdinalHundredsMap = { "zero", "centésimo", "ducentésimo", "trecentésimo", "quadringentésimo", "quingentésimo", "sexcentésimo", "septingentésimo", "octingentésimo", "noningentésimo" };
 
-        public override string Convert(int number, GrammaticalGender gender)
+        public override string Convert(long input, GrammaticalGender gender)
         {
+            if (input > Int32.MaxValue || input < Int32.MinValue)
+            {
+                throw new NotImplementedException();
+            }
+            var number = (int)input;
+
             if (number == 0)
                 return "zero";
 

src/Humanizer/Localisation/NumberToWords/DefaultNumberToWordsConverter.cs

@@ -20,7 +20,7 @@ public DefaultNumberToWordsConverter(CultureInfo culture)
         /// </summary>
         /// <param name="number">Number to be turned to words</param>
         /// <returns></returns>
-        public override string Convert(int number)
+        public override string Convert(long number)
         {
             return number.ToString(_culture);
         }

src/Humanizer/Localisation/NumberToWords/DutchNumberToWordsConverter.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace Humanizer.Localisation.NumberToWords
@@ -31,8 +32,14 @@ class Fact
             new Fact {Value = 100,        Name = "honderd", Prefix = "",  Postfix = "",  DisplayOneUnit = false}
         };
 
-        public override string Convert(int number)
+        public override string Convert(long input)
         {
+            if (input > Int32.MaxValue || input < Int32.MinValue)
+            {
+                throw new NotImplementedException();
+            }
+            var number = (int)input;
+
             if (number == 0)
                 return UnitsMap[0];
 

src/Humanizer/Localisation/NumberToWords/EnglishNumberToWordsConverter.cs

@@ -8,7 +8,7 @@ internal class EnglishNumberToWordsConverter : GenderlessNumberToWordsConverter
         private static readonly string[] UnitsMap = { "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen", "eighteen", "nineteen" };
         private static readonly string[] TensMap = { "zero", "ten", "twenty", "thirty", "forty", "fifty", "sixty", "seventy", "eighty", "ninety" };
 
-        private static readonly Dictionary<int, string> OrdinalExceptions = new Dictionary<int, string>
+        private static readonly Dictionary<long, string> OrdinalExceptions = new Dictionary<long, string>
         {
             {1, "first"},
             {2, "second"},
@@ -20,7 +20,7 @@ internal class EnglishNumberToWordsConverter : GenderlessNumberToWordsConverter
             {12, "twelfth"},
         };
 
-        public override string Convert(int number)
+        public override string Convert(long number)
         {
             return Convert(number, false);
         }
@@ -30,7 +30,7 @@ public override string ConvertToOrdinal(int number)
             return Convert(number, true);
         }
 
-        private string Convert(int number, bool isOrdinal)
+        private string Convert(long number, bool isOrdinal)
         {
             if (number == 0)
                 return GetUnitValue(0, isOrdinal);
@@ -40,6 +40,24 @@ private string Convert(int number, bool isOrdinal)
 
             var parts = new List<string>();
 
+            if ((number / 1000000000000000000) > 0)
+            {
+                parts.Add(string.Format("{0} quintillion", Convert(number / 1000000000000000000)));
+                number %= 1000000000000000000;
+            }
+
+            if ((number / 1000000000000000) > 0)
+            {
+                parts.Add(string.Format("{0} quadrillion", Convert(number / 1000000000000000)));
+                number %= 1000000000000000;
+            }
+
+            if ((number / 1000000000000) > 0)
+            {
+                parts.Add(string.Format("{0} trillion", Convert(number / 1000000000000)));
+                number %= 1000000000000;
+            }
+
             if ((number / 1000000000) > 0)
             {
                 parts.Add(string.Format("{0} billion", Convert(number / 1000000000)));
@@ -93,7 +111,7 @@ private string Convert(int number, bool isOrdinal)
             return toWords;
         }
 
-        private static string GetUnitValue(int number, bool isOrdinal)
+        private static string GetUnitValue(long number, bool isOrdinal)
         {
             if (isOrdinal)
             {
@@ -116,7 +134,7 @@ private static string RemoveOnePrefix(string toWords)
             return toWords;
         }
 
-        private static bool ExceptionNumbersToWords(int number, out string words)
+        private static bool ExceptionNumbersToWords(long number, out string words)
         {
             return OrdinalExceptions.TryGetValue(number, out words);
         }

src/Humanizer/Localisation/NumberToWords/FarsiNumberToWordsConverter.cs

@@ -9,8 +9,14 @@ internal class FarsiNumberToWordsConverter : GenderlessNumberToWordsConverter
         private static readonly string[] FarsiTensMap = { "صفر", "ده", "بیست", "سی", "چهل", "پنجاه", "شصت", "هفتاد", "هشتاد", "نود" };
         private static readonly string[] FarsiUnitsMap = { "صفر", "یک", "دو", "سه", "چهار", "پنج", "شش", "هفت", "هشت", "نه", "ده", "یازده", "دوازده", "سیزده", "چهارده", "پانزده", "شانزده", "هفده", "هجده", "نوزده" };
 
-        public override string Convert(int number)
+        public override string Convert(long input)
         {
+            if (input > Int32.MaxValue || input < Int32.MinValue)
+            {
+                throw new NotImplementedException();
+            }
+            var number = (int)input;
+
             if (number < 0)
                 return string.Format("منفی {0}", Convert(-number));
 

src/Humanizer/Localisation/NumberToWords/FinnishNumberToWordsConverter.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace Humanizer.Localisation.NumberToWords
 {
@@ -13,8 +14,14 @@ internal class FinnishNumberToWordsConverter : GenderlessNumberToWordsConverter
             {2, "kahdes" }
         };
 
-        public override string Convert(int number)
+        public override string Convert(long input)
         {
+            if (input > Int32.MaxValue || input < Int32.MinValue)
+            {
+                throw new NotImplementedException();
+            }
+            var number = (int)input;
+
             if (number < 0)
                 return string.Format("miinus {0}", Convert(-number));
 

src/Humanizer/Localisation/NumberToWords/FrenchNumberToWordsConverter.cs

@@ -15,8 +15,14 @@ internal class FrenchNumberToWordsConverter : GenderedNumberToWordsConverter
             {91, "quatre-vingt-onze"}
         };
 
-        public override string Convert(int number, GrammaticalGender gender)
+        public override string Convert(long input, GrammaticalGender gender)
         {
+            if (input > Int32.MaxValue || input < Int32.MinValue)
+            {
+                throw new NotImplementedException();
+            }
+            var number = (int)input;
+
             if (number == 0)
                 return UnitsMap[0];
 

src/Humanizer/Localisation/NumberToWords/GenderedNumberToWordsConverter.cs

@@ -14,7 +14,7 @@ protected GenderedNumberToWordsConverter(GrammaticalGender defaultGender = Gramm
         /// </summary>
         /// <param name="number"></param>
         /// <returns></returns>
-        public string Convert(int number)
+        public string Convert(long number)
         {
             return Convert(number, _defaultGender);
         }
@@ -25,7 +25,7 @@ public string Convert(int number)
         /// <param name="number"></param>
         /// <param name="gender"></param>
         /// <returns></returns>
-        public abstract string Convert(int number, GrammaticalGender gender);
+        public abstract string Convert(long number, GrammaticalGender gender);
 
         /// <summary>
         /// Converts the number to ordinal string using the locale's default grammatical gender

src/Humanizer/Localisation/NumberToWords/GenderlessNumberToWordsConverter.cs

@@ -7,15 +7,15 @@ abstract class GenderlessNumberToWordsConverter : INumberToWordsConverter
         /// </summary>
         /// <param name="number"></param>
         /// <returns></returns>
-        public abstract string Convert(int number);
+        public abstract string Convert(long number);
 
         /// <summary>
         /// Converts the number to string ignoring the provided grammatical gender
         /// </summary>
         /// <param name="number"></param>
         /// <param name="gender"></param>
         /// <returns></returns>
-        public string Convert(int number, GrammaticalGender gender)
+        public string Convert(long number, GrammaticalGender gender)
         {
             return Convert(number);
         }