Fix ability to get months and weeks

Humanizr · Nov 23, 2019 · 53a1f5f · 53a1f5f
1 parent 93b66cd
commit 53a1f5f
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 16 deletions.
diff --git a/src/Humanizer.Tests.Shared/TimeSpanHumanizeTests.cs b/src/Humanizer.Tests.Shared/TimeSpanHumanizeTests.cs
@@ -15,25 +15,28 @@ public void AllTimeSpansMustBeUniqueForASequenceOfDays()
             var culture = new CultureInfo("en-US");
             var qry = from i in Enumerable.Range(0, 100000)
                       let ts = TimeSpan.FromDays(i)
-                      let text = ts.Humanize(precision: 3, culture: culture, maxUnit: TimeUnit.Year)
+                      let text = ts.Humanize(precision: 7, culture: culture, maxUnit: TimeUnit.Year)
                       select text;
             var grouping = from t in qry
                            group t by t into g
                            select new { g.Key, Count = g.Count() };
+
+            var moreThanOne = grouping.Where(g => g.Count > 1).ToList();
+
             var allUnique = grouping.All(g => g.Count == 1);
             Assert.True(allUnique);
         }
 
         [Theory]
-        [InlineData(365, "11 months, 30 days")]
+        [InlineData(365, "11 months, 4 weeks, 2 days")]
         [InlineData(365 + 1, "1 year")]
-        [InlineData(365 + 365, "1 year, 11 months, 29 days")]
+        [InlineData(365 + 365, "1 year, 11 months, 4 weeks, 1 day")]
         [InlineData(365 + 365 + 1, "2 years")]
-        [InlineData(365 + 365 + 365, "2 years, 11 months, 29 days")]
+        [InlineData(365 + 365 + 365, "2 years, 11 months, 4 weeks, 1 day")]
         [InlineData(365 + 365 + 365 + 1, "3 years")]
-        [InlineData(365 + 365 + 365 + 365, "3 years, 11 months, 29 days")]
+        [InlineData(365 + 365 + 365 + 365, "3 years, 11 months, 4 weeks, 1 day")]
         [InlineData(365 + 365 + 365 + 365 + 1, "4 years")]
-        [InlineData(365 + 365 + 365 + 365 + 366, "4 years, 11 months, 30 days")]
+        [InlineData(365 + 365 + 365 + 365 + 366, "4 years, 11 months, 4 weeks, 2 days")]
         [InlineData(365 + 365 + 365 + 365 + 366 + 1, "5 years")]
         public void Year(int days, string expected)
         {
@@ -44,15 +47,15 @@ public void Year(int days, string expected)
         [Theory]
         [InlineData(30, "4 weeks, 2 days")]
         [InlineData(30 + 1, "1 month")]
-        [InlineData(30 + 30, "1 month, 29 days")]
+        [InlineData(30 + 30, "1 month, 4 weeks, 1 day")]
         [InlineData(30 + 30 + 1, "2 months")]
-        [InlineData(30 + 30 + 31, "2 months, 30 days")]
+        [InlineData(30 + 30 + 31, "2 months, 4 weeks, 2 days")]
         [InlineData(30 + 30 + 31 + 1, "3 months")]
-        [InlineData(30 + 30 + 31 + 30, "3 months, 29 days")]
+        [InlineData(30 + 30 + 31 + 30, "3 months, 4 weeks, 1 day")]
         [InlineData(30 + 30 + 31 + 30 + 1, "4 months")]
-        [InlineData(30 + 30 + 31 + 30 + 31, "4 months, 30 days")]
+        [InlineData(30 + 30 + 31 + 30 + 31, "4 months, 4 weeks, 2 days")]
         [InlineData(30 + 30 + 31 + 30 + 31 + 1, "5 months")]
-        [InlineData(365, "11 months, 30 days")]
+        [InlineData(365, "11 months, 4 weeks, 2 days")]
         [InlineData(366, "1 year")]
         public void Month(int days, string expected)
         {
@@ -433,5 +436,15 @@ public void CanSpecifyCultureExplicitly(int ms, int precision, string culture, s
             var actual = TimeSpan.FromMilliseconds(ms).Humanize(precision: precision, culture: new CultureInfo(culture), collectionSeparator: collectionSeparator);
             Assert.Equal(expected, actual);
         }
+
+        [Fact]
+        //Fixes https://stackoverflow.com/questions/56550059/humanizer-months-weeks-days-hours
+        public void MonthsAndWeeks()
+        {
+            var ts = new TimeSpan(109, 4, 0, 0, 0);
+            var humanized = ts.Humanize(4, maxUnit: TimeUnit.Month);
+
+            Assert.Equal("3 months, 2 weeks, 3 days, 4 hours", humanized);
+        }
     }
 }
diff --git a/src/Humanizer/TimeSpanHumanizeExtensions.cs b/src/Humanizer/TimeSpanHumanizeExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -143,7 +143,14 @@ private static int GetSpecialCaseWeeksAsInteger(TimeSpan timespan, bool isTimeUn
             {
                 return timespan.Days / _daysInAWeek;
             }
-            return 0;
+            else
+            {
+                var timespanRemaining = timespan - TimeSpan.FromDays(GetSpecialCaseYearAsInteger(timespan) * _daysInAYear)
+                                             - TimeSpan.FromDays(
+                                                 GetSpecialCaseMonthAsInteger(timespan, false) * _daysInAMonth);
+
+                return timespanRemaining.Days / _daysInAWeek;
+            }
         }
 
         private static int GetSpecialCaseDaysAsInteger(TimeSpan timespan, bool isTimeUnitToGetTheMaximumTimeUnit)
@@ -152,12 +159,17 @@ private static int GetSpecialCaseDaysAsInteger(TimeSpan timespan, bool isTimeUni
             {
                 return timespan.Days;
             }
-            if (timespan.Days < _daysInAMonth)
+            else
             {
-                var remainingDays = timespan.Days % _daysInAWeek;
+                var timespanRemaining = timespan - TimeSpan.FromDays(
+                                                     GetSpecialCaseYearAsInteger(timespan) * _daysInAYear) 
+                                                 - TimeSpan.FromDays(
+                                                     GetSpecialCaseMonthAsInteger(timespan, false) * _daysInAMonth)
+                                                 - TimeSpan.FromDays(
+                                                     GetSpecialCaseWeeksAsInteger(timespan, false) * _daysInAWeek);
+                var remainingDays = timespanRemaining.Days;
                 return remainingDays;
             }
-            return (int)(timespan.Days % _daysInAMonth);
         }
 
         private static int GetNormalCaseTimeAsInteger(int timeNumberOfUnits, double totalTimeNumberOfUnits, bool isTimeUnitToGetTheMaximumTimeUnit)