Fix #10 -- support day ranges (#11)

dramatiq_crontab/__init__.py

@@ -14,10 +14,8 @@
 __version__ = _version.version
 VERSION = _version.version_tuple
 
-
 __all__ = ["cron", "scheduler"]
 
-
 scheduler = BlockingScheduler()
 
 
@@ -41,21 +39,12 @@ def cron_test():
     """
 
     def decorator(actor):
-        *_, day_of_week = schedule.split(" ")
-
-        if day_of_week.lower() not in (
-            "*",
-            "mon",
-            "tue",
-            "wed",
-            "thu",
-            "fri",
-            "sat",
-            "sun",
-        ):
-            # CronTrigger uses Python's timezone dependent first weekday,
-            # so in Berlin monday is 0 and sunday is 6. We use literals to avoid
-            # confusion. Literals are also more readable and crontab conform.
+        *_, day_schedule = schedule.split(" ")
+
+        # CronTrigger uses Python's timezone dependent first weekday,
+        # so in Berlin monday is 0 and sunday is 6. We use literals to avoid
+        # confusion. Literals are also more readable and crontab conform.
+        if any(i.isdigit() for i in day_schedule):
             raise ValueError(
                 "Please use a literal day of week (Mon, Tue, Wed, Thu, Fri, Sat, Sun) or *"
             )

tests/test_tasks.py

@@ -30,14 +30,38 @@ def test_cron__stars():
 def test_cron__day_of_week():
     assert not scheduler.remove_all_jobs()
     assert tasks.cron("* * * * Mon")(tasks.heartbeat)
-    init = datetime.datetime(2021, 1, 1, 0, 0, 0)
+    init = datetime.datetime(2021, 1, 1, 0, 0, 0)  # Friday
     assert scheduler.get_jobs()[0].trigger.get_next_fire_time(
         init, init
     ) == datetime.datetime(
         2021, 1, 4, 0, 0, tzinfo=zoneinfo.ZoneInfo(key="Europe/Berlin")
     )
 
 
+@pytest.mark.parametrize(
+    "schedule",
+    [
+        "0 0 * * Tue-Wed",
+        "0 0 * * Tue,Wed",
+    ],
+)
+def test_cron_day_range(schedule):
+    assert not scheduler.remove_all_jobs()
+    assert tasks.cron(schedule)(tasks.heartbeat)
+    init = datetime.datetime(2021, 1, 1, 0, 0, 0)  # Friday
+    assert scheduler.get_jobs()[0].trigger.get_next_fire_time(
+        init, init
+    ) == datetime.datetime(
+        2021, 1, 5, 0, 0, tzinfo=zoneinfo.ZoneInfo(key="Europe/Berlin")
+    )
+    init = datetime.datetime(2021, 1, 5, 0, 0, 0)  # Tuesday
+    assert scheduler.get_jobs()[0].trigger.get_next_fire_time(
+        init, init
+    ) == datetime.datetime(
+        2021, 1, 6, 0, 0, tzinfo=zoneinfo.ZoneInfo(key="Europe/Berlin")
+    )
+
+
 def test_cron__every_15_minutes():
     assert not scheduler.remove_all_jobs()
     assert tasks.cron("*/15 * * * *")(tasks.heartbeat)
@@ -49,10 +73,18 @@ def test_cron__every_15_minutes():
     )
 
 
-def test_cron__error():
+@pytest.mark.parametrize(
+    "schedule",
+    [
+        "* * * * 1",
+        "* * * * 2-3",
+        "* * * * 1,7",
+    ],
+)
+def test_cron__error(schedule):
     assert not scheduler.remove_all_jobs()
     with pytest.raises(ValueError) as e:
-        tasks.cron("* * * * 1")(tasks.heartbeat)
+        tasks.cron(schedule)(tasks.heartbeat)
     assert (
         "Please use a literal day of week (Mon, Tue, Wed, Thu, Fri, Sat, Sun) or *"
         in str(e.value)