Merge pull request #15 from evtn/dev

fix: implemented .case_insensitive on many entities with .apply

Author: evtn

.coveragerc

@@ -0,0 +1,4 @@
+[report]
+exclude_lines = 
+    pragma: not covered
+    @overload

.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: Test that everything works
+name: Test
 
 on:
   workflow_dispatch:
@@ -53,4 +53,9 @@ jobs:
       - run: poetry install --with dev
 
       - name: Test
-        run: poetry run pytest test/
+        run: poetry run coverage run --include "rgx/*" -m pytest test/
+
+      - name: Coveralls Update
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rgx"
-version = "1.4.0"
+version = "1.4.2"
 description = "Typed, simple and readable regexp generation"
 authors = ["Dmitry Gritsenko <rgx@evtn.ru>"]
 license = "MIT"
@@ -17,6 +17,7 @@ python = "^3.7"
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.0"
 mypy = "^1.4.1"
+coveralls = "^3.3.1"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

rgx/entities.py

@@ -449,7 +449,7 @@ def render_prefix(self) -> StrGen:
         yield self.prefix
 
     def case_insensitive(self):
-        return self.__class__(self.contents.case_insensitive())
+        return self.apply(lambda x: x.case_insensitive())
 
     def render(self) -> StrGen:
         yield "("
@@ -818,10 +818,8 @@ def __init__(self, *contents: AnyRegexPattern) -> None:
     def __add__(self, other: AnyRegexPattern) -> Concat:
         return Concat(*self.contents, other)
 
-    def case_insensitive(self):
-        new = Concat()
-        new.contents = [part.case_insensitive() for part in self.contents]
-        return new
+    def case_insensitive(self) -> RegexPattern:
+        return self.apply(lambda x: x.case_insensitive())
 
     def render(self) -> StrGen:
         for part in self.contents:
@@ -855,13 +853,7 @@ def __init__(self, *alternatives: AnyRegexPattern):
         ]
 
     def case_insensitive(self) -> RegexPattern:
-        new = Option()
-        alts = [part.case_insensitive() for part in self.alternatives]
-
-        if all(isinstance(alt, LocalFlags) and "i" in alt.flags for alt in alts):
-            pass
-
-        return new
+        return self.apply(lambda x: x.case_insensitive())
 
     def merge_flags(self) -> LocalFlags | Option:
         self = self.apply(lambda x: x.merge_flags())
@@ -948,12 +940,7 @@ def __init__(
         self.lazy = lazy
 
     def case_insensitive(self) -> RegexPattern:
-        new = self.contents.case_insensitive().repeat(self.min_count)
-        if self.max_count is None:
-            new = new.or_more()
-        else:
-            new = new.to(self.max_count)
-        return new
+        return self.apply(lambda x: x.case_insensitive())
 
     def repeat(self, count: int, lazy: bool = False) -> Range:
         """
@@ -1161,13 +1148,6 @@ def __init__(
         self.true_option = respect_priority(true_option, Option.priority + 1)
         self.false_option = respect_priority(false_option, Option.priority + 1)
 
-    def case_insensitive(self) -> RegexPattern:
-        return ConditionalPattern(
-            self.group,
-            self.true_option.case_insensitive(),
-            self.false_option.case_insensitive(),
-        )
-
     def render(self) -> StrGen:
         yield "(?("
         yield str(self.group)
@@ -1184,6 +1164,9 @@ def apply(self, fn: Processor) -> Self:
             fn(self.false_option),
         )
 
+    def case_insensitive(self) -> RegexPattern:
+        return self.apply(lambda x: x.case_insensitive())
+
 
 class Literal(RegexPattern):
     def __init__(self, contents: str) -> None: