Merge pull request #15 from grumBit/fix_slash_lists_and_L_prefix

Allow lists of slashes that include ranges. Allow day of week to prefix L.

Author: grumBit

.github/workflows/publish-to-test-pypi.yml

@@ -8,62 +8,63 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@master
-    - name: 🐍 Set up Python 3.7
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.7"
-    - name: 🛠 Install dev requirements
-      run: >-
-        python -m
-        pip install
-        --requirement requirements_dev.txt
-        --user
-    - name: 🧪 Python linting
-      run: >-
-        python -m
-        pylint
-        ./src
-        ./tests
-    - name: 🧪 Python format checking
-      run: >-
-        python -m
-        black
-        ./src
-        ./tests
-        -l 120
-    - name: 🧪 Python type checking
-      run: >-
-        python -m
-        mypy
-        --pretty
-        --show-error-codes
-        --show-error-context
-        ./src
-        ./tests
-    - name: 🧪 Python testing & coverage
-      run: >-
-        python -m
-        pytest
-        --cov
-    - name: 🧰 Build binary wheel & source tarball
-      run: >-
-        python -m
-        build
-        --sdist
-        --wheel
-        --outdir dist/
-    - name: 📦 Publish package to Test PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-        repository_url: https://test.pypi.org/legacy/
-        verbose: true
-        skip_existing: true
-    - name: 📦 Publish package to PyPI
-      if: startsWith(github.ref, 'refs/tags/v')
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        password: ${{ secrets.PYPI_API_TOKEN }}
-        verbose: true
-        skip_existing: true
+      - uses: actions/checkout@master
+      - name: 🐍 Set up Python 3.7
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.7"
+      - name: 🛠 Install dev requirements
+        run: >-
+          python -m
+          pip install
+          --requirement requirements_dev.txt
+          --user
+      - name: 🧪 Python linting
+        run: >-
+          python -m
+          pylint
+          ./src
+          ./tests
+      - name: 🧪 Python format checking
+        run: >-
+          python -m
+          black
+          ./src
+          ./tests
+          -l 120
+          --check
+      - name: 🧪 Python type checking
+        run: >-
+          python -m
+          mypy
+          --pretty
+          --show-error-codes
+          --show-error-context
+          ./src
+          ./tests
+      - name: 🧪 Python testing & coverage
+        run: >-
+          python -m
+          pytest
+          --cov
+      - name: 🧰 Build binary wheel & source tarball
+        run: >-
+          python -m
+          build
+          --sdist
+          --wheel
+          --outdir dist/
+      - name: 📦 Publish package to Test PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+          repository_url: https://test.pypi.org/legacy/
+          verbose: true
+          skip_existing: true
+      - name: 📦 Publish package to PyPI
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          password: ${{ secrets.PYPI_API_TOKEN }}
+          verbose: true
+          skip_existing: true

src/aws_cron_expression_validator/validator.py

@@ -94,7 +94,7 @@ def range_regex(cls, values: str) -> str:
         return rf"({values}|(\*\-{values})|({values}\-{values})|({values}\-\*))"  # v , *-v , v-v or v-*
 
     @classmethod
-    def list_regex(cls, values: str) -> str:
+    def list_range_regex(cls, values: str) -> str:
         range_ = cls.range_regex(values)
         return rf"({range_}(\,{range_})*)"  # One or more ranges separated by a comma
 
@@ -105,9 +105,15 @@ def slash_regex(cls, values: str) -> str:
         # Slash can be preceded by *, range, or a valid value and must be followed by a natural
         # number as the increment.
 
+    @classmethod
+    def list_slash_regex(cls, values: str) -> str:
+        slash = cls.slash_regex(values)
+        slash_or_range = rf"({slash}|{cls.range_regex(values)})"
+        return rf"({slash_or_range}(\,{slash_or_range})*)"  # One or more separated by a comma
+
     @classmethod
     def common_regex(cls, values: str) -> str:
-        return rf"({cls.list_regex(values)}|\*|{cls.slash_regex(values)})"  # values , - * /
+        return rf"({cls.list_range_regex(values)}|\*|{cls.list_slash_regex(values)})"  # values , - * /
 
     @classmethod
     def minute_regex(cls) -> str:
@@ -129,7 +135,8 @@ def month_regex(cls):
 
     @classmethod
     def day_of_week_regex(cls):
-        return rf"^({cls.list_regex(cls.day_of_week_values)}|\*|\?|L|{cls.day_of_week_hash})$"  # values , - * ? L #
+        range_list = cls.list_range_regex(cls.day_of_week_values)
+        return rf"^({range_list}|\*|\?|{cls.day_of_week_values}L|L|{cls.day_of_week_hash})$"  # values , - * ? L #
 
     @classmethod
     def year_regex(cls):

tests/aws_cron_expression_validator/test_validator.py

@@ -23,7 +23,8 @@ def _check_non_match(self, regex: str, match: str):
     def test_slash_regex(self):
         minute_values = r"(0?[0-9]|[1-5][0-9])"  # [0]0-59
         given_regex = validator.AWSCronExpressionValidator.slash_regex(minute_values)
-        given_valid_matches = ["*/10", "1/10", "0/05", "0/15", "0/30", "55/1"]
+        given_valid_matches = ["*/10", "1/10", "0/05", "0/15", "0/30", "55/1", "1-7/2"]
+
         given_invalid_matches = [
             "",
             "/",
@@ -44,15 +45,23 @@ def test_slash_regex(self):
         self._then_matches(given_regex, given_valid_matches)
         self._then_does_not_match(given_regex, given_invalid_matches)
 
+    def test_list_slash_regex(self):
+        given_regex = validator.AWSCronExpressionValidator.list_slash_regex(r"[B-Y]")
+        given_valid_matches = ["B", "B/2,C-D/2", "*/10,*/3"]
+        given_valid_matches = ["B/2", "B/2,C/2", "B/2,C/2,D/2", "*/10,*/3", "B,C/2,D/2", "B/2,C,D/2", "C/2,D-T/2"]
+        given_invalid_matches = ["*/10,*/3,"]
+        self._then_matches(given_regex, given_valid_matches)
+        self._then_does_not_match(given_regex, given_invalid_matches)
+
     def test_range_regex(self):
         given_regex = validator.AWSCronExpressionValidator.range_regex(r"[B-Y]")
         given_valid_matches = ["B", "*-D", "D-*", "B-Y", "D-F", "D-B"]
         given_invalid_matches = ["*-*", "*B", "A-D", "D-Z", "B-C-D", ""]
         self._then_matches(given_regex, given_valid_matches)
         self._then_does_not_match(given_regex, given_invalid_matches)
 
-    def test_list_regex(self):
-        given_regex = validator.AWSCronExpressionValidator.list_regex(r"[B-Y]")
+    def test_list_range_regex(self):
+        given_regex = validator.AWSCronExpressionValidator.list_range_regex(r"[B-Y]")
         given_valid_matches = ["D", "D,F", "F-D", "D,F,C,J", "D-F,J", "B,D-F,J", "D,F-J", "*-R,X", "R,X-*", "*-R,T,X-*"]
         given_invalid_matches = ["*,P", "P,*,Q", "Q-P,*", "", "D,F,", ",D,F", ""]
         self._then_matches(given_regex, given_valid_matches)
@@ -120,15 +129,14 @@ def test_month_regex(self):
 
     def test_day_of_week_regex(self):
         given_regex = validator.AWSCronExpressionValidator.day_of_week_regex()
-        given_valid_matches = ["*", "1", "5", "7", "MON", "?", "L", "3#2", "MON-FRI"]
+        given_valid_matches = ["*", "1", "5", "7", "MON", "?", "L", "5L", "MONL", "3#2", "MON-FRI"]
         given_invalid_matches = [
             "Monday",
             "0",
             "01",
             "8",
             "?5",
             "5?",
-            "5L",
             "5-L",
             "L5",
             "#",
@@ -182,6 +190,7 @@ def test_validator(self):
         valid_expressions = [
             "0 18 ? * MON-FRI *",
             "0 18 ? * L *",
+            "0 18 ? * SATL *",
             "0 18 L * ? *",
             "0 18 31W * ? *",
             "0 10 * * ? *",
@@ -215,6 +224,11 @@ def test_validator(self):
             "0 11-23/4 ? * 2-6 *",
             "0 11-23/2 * * ? *",
             "0 0 1 1-12/3 ? *",
+            "0 1-7/2,11-23/2 * * ? *",
+            "0 1-7/2,11-23/2,10 * * ? *",
+            "30 0 1 JAN-APR,JUL-OCT/2,DEC ? *",
+            "15 10 ? * L 2019-2022",
+            "15 10 ? * 6L 2019-2022",
         ]
 
         invalid_expression_exceptions = [
@@ -231,6 +245,8 @@ def test_validator(self):
             ("0,5 07/12 ? * 1 2000-2200", validator.AWSCronExpressionYearError),
             ("15/30 10 * * ? 2400", validator.AWSCronExpressionYearError),
             ("0 9 ? * ? *", validator.AWSCronExpressionError),
+            ("0 18 3L * ? *", validator.AWSCronExpressionDayOfMonthError),
+            ("0 1-7/2,11-23/2, * * ? *", validator.AWSCronExpressionHourError),
         ]
 
         for valid_expression in valid_expressions: