Fixes diff_for_humans() when you cross DST transition.

Author: sdispater

pendulum/formatting/difference_formatter.py

@@ -63,9 +63,9 @@ def diff_for_humans(self, date, other=None, absolute=False, locale=None):
 
             if diff.remaining_days > 3:
                 count += 1
-        elif diff.days > 0:
+        elif diff.remaining_days > 0:
             unit = 'day'
-            count = diff.days
+            count = diff.remaining_days
         elif diff.hours > 0:
             unit = 'hour'
             count = diff.hours

pendulum/period.py

@@ -99,6 +99,14 @@ def days(self):
     def remaining_days(self):
         return abs(self._delta['days']) % 7 * self._sign(self._days)
 
+    @property
+    def hours(self):
+        return self._delta['hours']
+
+    @property
+    def minutes(self):
+        return self._delta['minutes']
+
     @property
     def start(self):
         return self._start

tests/date_tests/test_diff.py

@@ -284,6 +284,17 @@ def test_diff_for_humans_absolute_years(self):
         self.assertEqual('1 year', Date.today().diff_for_humans(Date.today().subtract(years=1), True))
         self.assertEqual('1 year', Date.today().diff_for_humans(Date.today().add(years=1), True))
 
+    def test_diff_accuracy(self):
+        # DST
+        today = Pendulum.create(2017, 3, 7, tz='America/Toronto')
+
+        with self.wrap_with_test_now(today):
+            diff = today.add(days=6).diff(today, abs=True)
+            self.assertEqual(5, diff.days)
+            self.assertEqual(6, diff.remaining_days)
+            self.assertEqual(0, diff.hours)
+            self.assertEqual('6 days', diff.in_words())
+
     def test_diff_for_humans_accuracy(self):
         today = Pendulum.today()
 
@@ -297,6 +308,11 @@ def test_diff_for_humans_accuracy(self):
             self.assertEqual('2 weeks', today.add(days=14).diff_for_humans(absolute=True))
             self.assertEqual('2 weeks', today.add(days=13).diff_for_humans(absolute=True))
 
+        # DST
+        today = Pendulum.create(2017, 3, 7, tz='America/Toronto')
+        with self.wrap_with_test_now(today):
+            self.assertEqual('6 days', today.add(days=6).diff_for_humans(absolute=True))
+
     def test_subtraction(self):
         d = Date(2016, 7, 5)
         future_dt = date(2016, 7, 6)

tests/pendulum_tests/test_diff.py

@@ -573,6 +573,11 @@ def test_diff_for_humans_accuracy(self):
             self.assertEqual('1 year', now.add(years=1, months=3).diff_for_humans(absolute=True))
             self.assertEqual('2 years', now.add(years=1, months=8).diff_for_humans(absolute=True))
 
+        # DST
+        now = Pendulum.create(2017, 3, 7, tz='America/Toronto')
+        with self.wrap_with_test_now(now):
+            self.assertEqual('6 days', now.add(days=6).diff_for_humans(absolute=True))
+
     def test_seconds_since_midnight(self):
         d = Pendulum.create(2016, 7, 5, 12, 32, 25, 0)
         self.assertEqual(25 + 32 * 60 + 12 * 3600, d.seconds_since_midnight())