versiref 0.1.0__tar.gz → 0.2.0__tar.gz

{versiref-0.1.0 → versiref-0.2.0}/PKG-INFO

@@ -1,10 +1,9 @@
 Metadata-Version: 2.4
 Name: versiref
-Version: 0.1.0
+Version: 0.2.0
 Summary: A package for sophisticated parsing, manipulation, and printing of references to the Bible
-Project-URL: Homepage, https://github.com/fiapps/versiref
-Project-URL: Issues, https://github.com/fiapps/versiref/issues
-Author-email: "Fr. John Lawrence M. Polis" <emptier-sank-dose@duck.com>
+Author: Fr. John Lawrence M. Polis
+Author-email: Fr. John Lawrence M. Polis <emptier-sank-dose@duck.com>
 License-Expression: MIT
 License-File: LICENSE
 Classifier: Development Status :: 3 - Alpha
@@ -18,10 +17,13 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Religion
 Classifier: Topic :: Text Processing
-Requires-Python: >=3.9
 Requires-Dist: pyparsing>=3.2.3
+Requires-Python: >=3.9
+Project-URL: Homepage, https://github.com/fiapps/versiref
+Project-URL: Issues, https://github.com/fiapps/versiref/issues
 Description-Content-Type: text/markdown
 
 # VersiRef

{versiref-0.1.0 → versiref-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "versiref"
-version = "0.1.0"
+version = "0.2.0"
 description = "A package for sophisticated parsing, manipulation, and printing of references to the Bible"
 readme = "README.md"
 authors = [
@@ -18,6 +18,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Religion",
     "Topic :: Text Processing",
 ]
@@ -33,14 +34,12 @@ Homepage = "https://github.com/fiapps/versiref"
 Issues = "https://github.com/fiapps/versiref/issues"
 
 [build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
+requires = ["uv_build>=0.9.28,<0.10.0"]
+build-backend = "uv_build"
 
-[tool.hatch.build.targets.wheel]
+[tool.uv.build-backend]
 packages = ["src/versiref"]
-
-[tool.hatch.build.targets.wheel.sources]
-"data" = "src/versiref/data"
+include = ["src/versiref/data/**"]
 
 [tool.mypy]
 strict = true

{versiref-0.1.0 → versiref-0.2.0}/src/versiref/bible_ref.py

@@ -6,7 +6,7 @@ This module provides classes for representing and manipulating Bible references.
 from dataclasses import dataclass, field
 from typing import Generator, Optional
 
-from versiref.ref_style import RefStyle
+from versiref.ref_style import RefStyle, standard_names
 from versiref.versification import Versification
 
 
@@ -98,6 +98,21 @@ class SimpleBibleRef:
     ranges: list[VerseRange] = field(default_factory=list)
     original_text: Optional[str] = None
 
+    def __str__(self) -> str:
+        """Return a string representation of this simple Bible reference.
+
+        Shows a concise representation using the reference's original text
+        or formatted representation.
+
+        Returns:
+            A string representation of this simple Bible reference
+
+        """
+        ref_part = self.original_text or self.format(
+            RefStyle(names=standard_names("en-sbl_abbreviations"))
+        )
+        return f'SimpleBibleRef("{ref_part}")'
+
     @classmethod
     def for_range(
         cls,
@@ -320,6 +335,23 @@ class BibleRef:
     versification: Optional[Versification] = None
     original_text: Optional[str] = None
 
+    def __str__(self) -> str:
+        """Return a string representation of this Bible reference.
+
+        Shows a concise representation using the versification identifier if available,
+        and the reference's original text or formatted representation.
+
+        Returns:
+            A string representation of this Bible reference
+
+        """
+        ref_part = self.original_text or self.format(
+            RefStyle(names=standard_names("en-sbl_abbreviations"))
+        )
+        if self.versification is None:
+            return f'BibleRef("{ref_part}")'
+        return f'BibleRef("{ref_part}", versification={self.versification})'
+
     @classmethod
     def for_range(
         cls,
@@ -394,6 +426,51 @@ class BibleRef:
             return False
         return all(ref.is_valid(self.versification) for ref in self.simple_refs)
 
+    def range_keys(self) -> Generator[tuple[int, int], None, None]:
+        """Yield an integer key range for each verse range in the ref.
+
+        Book numbers are derived from self.versification, so it cannot be None.
+        If any book ID in the simple refs is not included in the versification,
+        no ranges for that book are yielded.
+
+        Verse numbers less than 0 (undefined) are replaced with:
+        - 0 for start verses
+        - the last verse number for the chapter for end verses
+
+        Yields:
+            (start_key, end_key): integer keys for the start and end of a range in the ref
+                Each key has 2 book digits, 3 chapter digits, and 3 verse digits.
+
+        """
+        if self.versification is None:
+            return
+        for simple_ref in self.simple_refs:
+            if simple_ref.book_id not in self.versification.max_verses:
+                continue
+            else:
+                book_num = (
+                    list(self.versification.max_verses.keys()).index(simple_ref.book_id)
+                    + 1
+                )
+            for range_ref in simple_ref.range_refs():
+                range = range_ref.ranges[0]
+
+                # Replace undefined start verse with 0
+                start_verse = 0 if range.start_verse < 0 else range.start_verse
+
+                # Replace undefined end verse with last verse of chapter
+                end_verse = range.end_verse
+                if end_verse < 0:
+                    end_verse = self.versification.last_verse(
+                        simple_ref.book_id, range.end_chapter
+                    )
+
+                start_key = (
+                    book_num * 1000000 + range.start_chapter * 1000 + start_verse
+                )
+                end_key = book_num * 1000000 + range.end_chapter * 1000 + end_verse
+                yield (start_key, end_key)
+
     def range_refs(self) -> Generator["BibleRef", None, None]:
         """Yield a new BibleRef for each verse range across all simple refs.
 

versiref-0.2.0/src/versiref/data/book_names/en-douay-rheims_names.json

@@ -0,0 +1,78 @@
+{
+  "GEN": "Genesis",
+  "EXO": "Exodus",
+  "LEV": "Leviticus",
+  "NUM": "Numbers",
+  "DEU": "Deuteronomy",
+  "JOS": "Josue",
+  "JDG": "Judges",
+  "RUT": "Ruth",
+  "1SA": "1 Kings",
+  "2SA": "2 Kings",
+  "1KI": "3 Kings",
+  "2KI": "4 Kings",
+  "1CH": "1 Paralipomenon",
+  "2CH": "2 Paralipomenon",
+  "EZR": "1 Esdras",
+  "NEH": "Nehemias",
+  "TOB": "Tobias",
+  "JDT": "Judith",
+  "EST": "Esther",
+  "JOB": "Job",
+  "PSA": "Psalm",
+  "PSAS": "Psalms",
+  "PRO": "Proverbs",
+  "ECC": "Ecclesiastes",
+  "SNG": "Canticle of Canticles",
+  "WIS": "Wisdom",
+  "SIR": "Ecclesiasticus",
+  "ISA": "Isaias",
+  "JER": "Jeremias",
+  "LAM": "Lamentations",
+  "BAR": "Baruch",
+  "EZK": "Ezechiel",
+  "DAN": "Daniel",
+  "HOS": "Osee",
+  "JOL": "Joel",
+  "AMO": "Amos",
+  "OBA": "Abdias",
+  "JON": "Jonas",
+  "MIC": "Micheas",
+  "NAM": "Nahum",
+  "HAB": "Habacuc",
+  "ZEP": "Sophonias",
+  "HAG": "Aggaeus",
+  "ZEC": "Zacharias",
+  "MAL": "Malachias",
+  "1MA": "1 Machabees",
+  "2MA": "2 Machabees",
+  "MAT": "Matthew",
+  "MRK": "Mark",
+  "LUK": "Luke",
+  "JHN": "John",
+  "ACT": "Acts",
+  "ROM": "Romans",
+  "1CO": "1 Corinthians",
+  "2CO": "2 Corinthians",
+  "GAL": "Galatians",
+  "EPH": "Ephesians",
+  "PHP": "Philippians",
+  "COL": "Colossians",
+  "1TH": "1 Thessalonians",
+  "2TH": "2 Thessalonians",
+  "1TI": "1 Timothy",
+  "2TI": "2 Timothy",
+  "TIT": "Titus",
+  "PHM": "Philemon",
+  "HEB": "Hebrews",
+  "JAS": "James",
+  "1PE": "1 Peter",
+  "2PE": "2 Peter",
+  "1JN": "1 John",
+  "2JN": "2 John",
+  "3JN": "3 John",
+  "JUD": "Jude",
+  "REV": "Apocalypse",
+  "1ES": "3 Esdras",
+  "2ES": "4 Esdras"
+}

{versiref-0.1.0 → versiref-0.2.0}/src/versiref/versification.py

@@ -13,11 +13,31 @@ class Versification:
     Versifications are defined by JSON data that is loaded from a file when an instance is created.
     The class provides methods to query information about the versification, such as the last verse
     of a given chapter in a given book.
+
+    Attributes:
+        max_verses: last valid verse number for each chapter of each book
+            The order of keys defines the book order.
+        identifier: optional name for the versification
+
     """
 
     max_verses: dict[str, list[int]] = field(default_factory=dict)
     identifier: Optional[str] = None
 
+    def __str__(self) -> str:
+        """Return a string representation of this versification.
+
+        If an identifier is set, returns a concise form: Versification.named("identifier")
+        Otherwise, returns the default dataclass representation.
+
+        Returns:
+            A string representation of this versification
+
+        """
+        if self.identifier:
+            return f'Versification.named("{self.identifier}")'
+        return object.__str__(self)
+
     @classmethod
     def from_file(
         cls, file_path: str, identifier: Optional[str] = None

versiref-0.1.0/.gitignore

@@ -1,11 +0,0 @@
-# Python-generated files
-__pycache__/
-*.py[oc]
-build/
-dist/
-wheels/
-*.egg-info
-
-# Virtual environments
-.venv
-.aider*

versiref-0.1.0/.python-version

@@ -1 +0,0 @@
-3.13

versiref-0.1.0/.vscode/settings.json

@@ -1,12 +0,0 @@
-{
-    "mypy-type-checker.importStrategy": "fromEnvironment",
-    "mypy-type-checker.ignorePatterns": [
-        "build/*.py"
-    ],
-    "python.testing.pytestArgs": [
-        "tests"
-    ],
-    "python.testing.unittestEnabled": false,
-    "python.testing.pytestEnabled": true,
-    "ruff.configuration": "pyproject.toml"
-}

versiref-0.1.0/CONVENTIONS.MD

@@ -1,4 +0,0 @@
-# Coding conventions that aider MUST follow
-
-- Only use comments when necessary, since they can become outdated. Instead, strive to make the code self-explanatory.
-- When comments are used, they should add useful information that is not readily apparent from the code.

versiref-0.1.0/DESIGN.md

@@ -1,88 +0,0 @@
-# VersiRef Design Document
-
-VersiRef is a Python package for sophisticated parsing, manipulation, and printing of references to the Bible.
-
-This design document was created prior to the implementation, and so may not fully correspond to it.
-
-## SimpleBibleRef
-
-An instance of `SimpleBibleRef` represents a sequence of verse ranges within a single book of the Bible.
-These ranges are not necessarily in numeric order because the person who creates the citation may prefer a different order.
-The class is naive in that it doesn't specify its versification (this is something like `datetime`'s naive classes, which don't specify a time zone).
-In the simplest case, it designates a single chapter and verse, such as John 3:16.
-More generally, each range contains a start chapter, start verse, start subverse, end chapter, end verse, and end subverse.
-Each range also has `original_text: Optional[str]`: this is the text from which the range was parsed, if any.
-The class stores a list of such ranges, a book ID, and the `original_text` from which the book ID was parsed.
-Book IDs are the three-letter codes used by Paratext, e.g., "GEN", "1CO", or "JHN".
-The start and end chapter numbers will almost always be the same, but the volume of data is probably not large enough to justify complicating the code by optimizing for that.
-Similarly, subverse divisions (e.g., "a" or "d") will often not be used: when there is none, the subverse will be an empty string.
-We can just store all six values for each range, even in the trivial case where the range is a single verse.
-Chapter and verse numbers are `int`s: on careful consideration, we never need to use strings for either.
-Although some Bible translations use letters for "chapter numbers" (e.g., Greek Esther in Rahlfs and NAB), we don't need to support that explicitly: Paratext's scheme represents these as numbered chapters with a different book name (ESG instead of EST).
-The rare case of verse numbers like "4kk" can be represented as verse 4, subverse "kk": that is how it would parse anyway.
-As a special case, a `SimpleBibleRef` with an empty list of ranges refers to the entire book.
-The constructor takes a book ID and an `original_text`, which defaults to `None`.
-
-## BibleRef
-
-An instance of `BibleRef` represents a sequence of verse ranges within a one or more books of the Bible.
-It holds an array of `SimpleBibleRef` and the `Versification` they use.
-
-## Versification
-
-An instance of `Versification` represents a way of dividing the text of the Bible into chapters and verses.
-Versifications are defined by JSON data that is loaded from a file when an instance is created.
-Alternatively, the JSON data could be converted to Python data and stored as constants in code.
-The `last_verse(book, chapter)` method returns the integer number of the last verse of the given chapter of the given book.
-If the book is unknown or the chapter does not exist, it returns -1.
-An initial, trivial implementation will not load a data file and will simply return 99 from `last_verse()` regardless of its arguments.
-Support for mapping verses between versifications can be added at a later stage.
-
-For versification data, we can use JSON files from a [UBSCAP GitHub repo](https://github.com/ubsicap/versification_json).
-These are under an MIT license.
-As the README notes, some of the files contain errors: there are mappings from verses that do not exist according to the max verse counts.
-However, it seems the best starting point available, and those known errors will be harmless because such mappings will never be applied.
-There's a JSON schema in the repo that can be used for validation.
-The `maxVerses` property of the top-level object contains the data `last_verse()` must return.
-
-The JSON files have data for Paratext's seven standard versifications.
-Mappings are defined relative to the mapping called "Original" (`org.json`) for lack of a better name: This uses the BHS OT, the UBS GNT NT, and the "Catholic" deuterocanon.
-
-It would not be hard to derive `maxVerses` and `excludedVerses` data for specific Bibles from verse lists exported from Accordance.
-Mappings for these Bibles are an open question.
-
-### Mapping verses between versifications
-
-This would have to be done one range at a time, mapping the start and end of each.
-When mapping a range start, if the location maps to a range, we pick the start of the range.
-When mapping a range end, if the location maps to a range, we pick the end of the range.
-For example, if 1KI 18:33 maps to 1KI 18:33-34 and we are mapping a range that starts at 1KI 18:33, then the mapped range starts at 1KI 18:33.
-But if we are mapping a range that ends at 1KI 18:33, then the mapped range ends at 1KI 18:34.
-However, we might not at first need code to handle the case where a location maps to a range, since it seems Paratext doesn't handle that. Consequently, its files don't define such mappings, even though there are cases in which they ought to be used.
-
-## Style
-
-A `Style` defines how a `SimpleBibleRef` or `BibleRef` is converted to a string and how strings are parsed to produce these classes.
-
-* `names`: maps Bible book IDs to string abbreviations or to full names, depending on the style.
-* `chapter_verse_separator`: Separates chapter number from verse ranges Defaults to ":".
-* `verse_range_separator`: Separates ranges of verses in a single chapter. Defaults to ", ".
-* `chapter_separator`: Defaults to "; ".
-* `recognized_names`: maps abbreviations and/or full names to Bible book IDs. For flexibility in parsing, this typically recognizes additional abbreviations beyond those used in `names`. It defaults to the inverse of `names`.
-
-### Named sets of book names/abbreviations
-
-We need to have a way of supplying named sets of book names and book name abbreviations, so users can select, e.g., short SBL abbreviations.
-These sets are simply dictionaries, but perhaps we need to store them in files or allow users to define their own set of abbreviations in a file.
-
-### Bible IDs that require special handling
-
-* PSA: we need to allow for both a singular and a plural form. The latter can be coded in abbreviation lists as PSAS, e.g., `"PSA": "Psalm", "PSAS": "Psalms"
-* PS2: this is Psalm 151. It uses the PSA abbreviation (or PSAS when referenced with other psalms). Any abbreviation defined for PS2 will be ignored. Perhaps we should issue a warning if it's defined.
-* ESG: this is Greek portions of Esther. Special handling may be required when it uses the same name as EST but letters for chapters (e.g., NABRE).
-
-## RefParser
-
-The constructor takes a `Style` and builds a PEG parser that recognizes Bible references in that style.
-Whitespace is generally ignored by the parser (default for `pyparser`).
-Various methods support parsing a whole string to a `SimpleBibleRef` or `BibleRef`, scanning a long string for references, and transforming a long string (e.g., to tag references).

versiref-0.1.0/test_all_versions.py

@@ -1,26 +0,0 @@
-"""Run tests across all supported Python versions using uv."""
-
-import subprocess
-
-versions = ["3.9", "3.10", "3.11", "3.12", "3.13"]
-
-for version in versions:
-    print(f"\n=== Testing Python {version} ===")
-    try:
-        subprocess.run(
-            [
-                "uv",
-                "run",
-                "--isolated",
-                "--python",
-                version,
-                "python",
-                "-m",
-                "pytest",
-                "tests",
-            ],
-            check=True,
-        )
-        print(f"✅ Python {version}: PASSED")
-    except subprocess.CalledProcessError:
-        print(f"❌ Python {version}: FAILED")

versiref-0.1.0/tests/__init__.py

@@ -1 +0,0 @@
-"""Test versiref with pytest."""