fix John regular expression to avoid confusion with Jonah

Author: avendesora

pythonbible/pythonbible/books.py

@@ -24,7 +24,7 @@ def _add_suffix(regex: str, suffix: str | None = None) -> str:
 _SAMUEL_REGULAR_EXPRESSION = r"(Samuel|Sam\.*|Sa\.*|Sm\.*)"
 _KINGS_REGULAR_EXPRESSION = r"(Kings|Kgs\.*|Kin\.*|Ki\.*)"
 _CHRONICLES_REGULAR_EXPRESSION = r"(Chronicles|Chron\.*|Chro\.*|Chr\.*|Ch\.*)"
-_JOHN_REGULAR_EXPRESSION = r"(John|Joh\.*|Jhn\.*|Jo\.*(?!shua|b|nah|el)|Jn\.*)"
+_JOHN_REGULAR_EXPRESSION = r"(John|Joh\.*|Jhn\.*|Jo\.*(?!shua|b|nah|el|n)|Jn\.*)"
 _CORINTHIANS_REGULAR_EXPRESSION = r"Co\.*(?:r\.*(?:inthians)?)?"
 _THESSALONIANS_REGULAR_EXPRESSION = r"Th\.*(?:(s|(es(?:s)?))\.*(?:alonians)?)?"
 _TIMOTHY_REGULAR_EXPRESSION = r"Ti\.*(?:m\.*(?:othy)?)?"

pythonbible/tests/parser/parser_test.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import pytest
+
 import pythonbible as bible
 
 
@@ -338,7 +339,7 @@ def test_book_abbreviations() -> None:
 
 
 @pytest.mark.parametrize(
-    "input_reference, expected_output",
+    ("input_reference", "expected_output"),
     [
         (
             "micah-jon",
@@ -348,7 +349,7 @@ def test_book_abbreviations() -> None:
                 start_verse=None,
                 end_chapter=None,
                 end_verse=None,
-                end_book=None,
+                end_book=bible.Book.JONAH,
             ),
         ),
         (
@@ -359,7 +360,7 @@ def test_book_abbreviations() -> None:
                 start_verse=None,
                 end_chapter=None,
                 end_verse=None,
-                end_book=None,
+                end_book=bible.Book.JONAH,
             ),
         ),
         (
@@ -382,7 +383,7 @@ def test_book_abbreviations() -> None:
                 end_chapter=None,
                 end_verse=None,
                 end_book=bible.Book.JOHN,
-            )
+            ),
         ),
     ],
 )