Merge pull request #22 from ambitioninc/develop

fixed a bug when a recurrence crosses a day light savings time boundary

localized_recurrence/models.py

@@ -154,7 +154,8 @@ def utc_of_next_schedule(self, current_time):
         can be called without side-effect.
         """
         local_time = fleming.convert_to_tz(current_time, self.timezone)
-        local_scheduled_time = _replace_with_offset(local_time, self.offset, self.interval)
+        local_scheduled_time = fleming.fleming.dst_normalize(
+            _replace_with_offset(local_time, self.offset, self.interval))
         utc_scheduled_time = fleming.convert_to_tz(local_scheduled_time, pytz.utc, return_naive=True)
         if utc_scheduled_time <= current_time:
             additional_time = {
@@ -166,6 +167,7 @@ def utc_of_next_schedule(self, current_time):
             }
             utc_scheduled_time = fleming.add_timedelta(
                 utc_scheduled_time, additional_time[self.interval], within_tz=self.timezone)
+
         return utc_scheduled_time
 
 

localized_recurrence/tests/models_tests.py

@@ -105,6 +105,13 @@ def test_basic_works(self):
         schedule_out = self.lr_day.utc_of_next_schedule(current_time)
         self.assertEqual(schedule_out, expected_next_schedule)
 
+    def test_dst_cross_monthly(self):
+        """The case when a monthly recurrence goes past daylight savings time"""
+        self.lr_month.offset = timedelta(hours=0)
+        self.lr_month.previous_scheduled = datetime(2015, 2, 1, 6)
+        scheduled_out = self.lr_month.utc_of_next_schedule(datetime(2015, 3, 31))
+        self.assertEqual(scheduled_out, datetime(2015, 4, 1, 5))
+
     def test_before_midnight(self):
         """The case when the scheduled and current time cross midnight.
 

localized_recurrence/version.py

@@ -1 +1 @@
-__version__ = '1.0.1'
+__version__ = '1.0.2'