djangobible 0.0.25__tar.gz → 0.3.0__tar.gz

djangobible-0.3.0/PKG-INFO

@@ -0,0 +1,270 @@
+Metadata-Version: 2.4
+Name: djangobible
+Version: 0.3.0
+Author: Nathan Patton
+Author-email: Nathan Patton <npatton@gmail.com>
+License-Expression: MIT
+Classifier: Framework :: Django
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Software Development
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+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: License :: OSI Approved :: MIT License
+Requires-Dist: django>=4.2.0
+Requires-Dist: pythonbible==0.14.0
+Requires-Python: >=3.10
+Project-URL: Source, https://github.com/avendesora/djangobible
+Description-Content-Type: text/markdown
+
+# djangobible
+
+The djangobible library is a Django app that wraps the [pythonbible](https://github.com/avendesora/pythonbible) library and provides models, managers, and other tools to easily index an object by a scripture reference.
+
+<table>
+    <tr>
+        <td>Latest Version</td>
+        <td>
+            <a href="https://pypi.org/project/djangobible/"><img src="https://img.shields.io/pypi/v/djangobible?color=gold&logo=pypi&logoColor=lightgray"></a>
+            <img src="https://img.shields.io/pypi/dm/djangobible?color=gold">
+        </td>
+    </tr>
+    <tr>
+        <td>License</td>
+        <td><a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-orange.svg"></a></td>
+    </tr>
+    <tr>
+        <td>Tests</td>
+        <td>
+            <img src="https://github.com/avendesora/djangobible/actions/workflows/tests.yml/badge.svg">
+            <img src="https://github.com/avendesora/djangobible/workflows/Django%20CI/badge.svg"><br/>
+            <a href="https://app.codacy.com/gh/avendesora/djangobible/coverage/dashboard"><img src="https://app.codacy.com/project/badge/Coverage/83a28131bf6642ed9e439344122686fc"></a>
+        </td>
+    </tr>
+    <tr>
+        <td>Code Quality</td>
+        <td>
+            <img src="https://github.com/avendesora/djangobible/workflows/CodeQL/badge.svg">
+            <a href="https://app.codacy.com/gh/avendesora/djangobible?utm_source=github.com&utm_medium=referral&utm_content=avendesora/djangobible&utm_campaign=Badge_Grade_Settings"><img src="https://api.codacy.com/project/badge/Grade/ca34603bdaf8446ba288430b69092093"></a><br/>
+            <a href="https://results.pre-commit.ci/latest/github/avendesora/djangobible/main"><img src="https://results.pre-commit.ci/badge/github/avendesora/djangobible/main.svg"></a>
+            <a href="https://github.com/psf/black"><img src="https://img.shields.io/badge/code%20style-black-000000.svg"></a>
+        </td>
+    </tr>
+    <tr>
+        <td>Supported Python/Django Versions</td>
+        <td>
+            <a href="https://www.python.org/downloads/"><img src="https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-blue?logo=python&logoColor=lightgray"></a><br />
+            <a href="https://www.djangoproject.com/download/"><img src="https://img.shields.io/badge/Django-4.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-blue"></a><br />
+        </td>
+    </tr>
+</table>
+
+## Installation
+
+Pip install the djangobible library.
+
+```shell script
+pip install djangobible
+```
+
+Add djangobible to your Django project's ``INSTALLED_APPS`` setting:
+
+```python
+INSTALLED_APPS = [
+    ...,  # other apps
+    "djangobible",
+]
+```
+
+Run the django migrations for djangobible
+
+```shell script
+./manage.py migrate djangobible
+```
+
+### Settings
+
+There currently are no settings (other than INSTALLED_APPS) related to the djangobible project. In the future, it would be nice to have settings that determine things like the available versions of the Bible and the default version.
+
+Also, once support is implemented for multiple locales and languages, there could be related settings for that functionality.
+
+## Features
+
+The djangobible library is a complete wrapper for the [pythonbible](https://github.com/avendesora/pythonbible) library, so importing the djangobible library as:
+
+```python
+import djangobible as bible
+```
+
+will provide all the same functionality as importing the pythonbible library as:
+
+```python
+import pythonbible as bible
+```
+
+This includes features such as:
+- Searching text for Scripture references
+- Converting a normalized scripture reference into a list of integer verse ids
+- Converting a list of verse id integers into a list of normalized scripture references
+- Converting a list of normalized scripture references into a formatted string scripture reference
+- Retrieving the Biblical text (in one or more open-source or public domain versions) for a given verse ID integer
+
+For more information, see the [pythonbible documentation](https://github.com/avendesora/pythonbible).
+
+In addition, the djangobible library includes the following features:
+
+### Template Tags
+
+There are currently two template tags provided by the djangobible library: ``verse_reference`` and ``verse_text``.
+
+#### verse_reference
+
+The ``verse_reference`` template tag, given a verse ID and a Bible version, returns the appropriate Scripture reference string.
+
+For example, given ``verse_id = 1001001`` and ``version = djangobible.Version.KING_JAMES``, the following snippet from a Django template:
+
+```html
+{% load verse_tags %}
+...
+{% verse_reference verse_id version=version %}
+```
+
+would display:
+
+```
+Genesis 1:1
+```
+
+The version parameter is optional, and the current default is King James, though that will ideally be configurable in the future.
+
+There is another optional parameter, ``full_title``, which is a boolean flag to determine whether to display the long version or the short version of the book of the Bible title. It defaults to ``False``, which displays the short version. For example, given ``verse_id = 1001001`` and ``version = djangobible.Version.KING_JAMES`` and ``full_title = True``, the following snippet from a Django template:
+
+```html
+{% load verse_tags %}
+...
+{% verse_reference verse_id version=version full_title=full_title %}
+```
+
+would display:
+
+```
+The First Book of Moses, called Genesis 1:1
+```
+
+#### verse_text
+
+The ``verse_text`` template tag, given a verse ID and a Bible version, returns the appropriate text of that Bible verse.
+
+For example, given ``verse_id = 1001001`` and ``version = djangobible.Version.KING_JAMES``, the following snippet from a Django template:
+
+```html
+{% load verse_tags %}
+...
+{% verse_text verse_id %}
+```
+
+would display:
+
+```
+In the beginning God created the heaven and the earth.
+```
+
+The version parameter is optional, and the current default is King James, though that will ideally be configurable in the future.
+
+### One-to-many style relationships between verses and Django models
+
+For situations where an instance of a Django model needs to be associated with a single verse, that Django model can have a field of type ``VerseField``.
+
+For example:
+
+```python
+from django.db import models
+
+import djangobible as bible
+
+
+class MyModel(models.Model):
+    ...  # other fields
+
+    verse = bible.VerseField()
+```
+
+The underlying implementation of ``VerseField`` is an ``IntegerField`` which stores the verse ID of the associated verse.
+
+Having this custom field type provides several benefits:
+- The Django admin (and Wagtail) form contains a text field for the verse rather than an integer field and allows the user to enter the Scripture reference text rather than the verse id, which they may not know. It then validates that text to ensure it references one, and only one, verse.
+- As just mentioned, this allows for validation, not only that the value is one, and only one, verse id, but that it is also a valid verse id (i.e. that it represents a book, chapter, and verse of the Bible that actually exists).
+- More readable query filters (e.g. ``MyModel.objects.filter(verse=1001001)`` is valid, but so is ``MyModel.objects.filter(verse="Genesis 1:1")``).
+
+You can set the verse field with either the int verse ID or the string reference:
+
+```python
+my_object = MyModel.objects.create(name="my object")
+my_object.verse = 1001001
+my_object.save()
+```
+
+or
+
+```python
+my_object = MyModel.objects.create(name="my object")
+my_object.verse = "Genesis 1:1"
+my_object.save()
+```
+
+You can filter the objects in the query set by either the int verse ID or the string reference:
+
+```python
+MyModel.objects.filter(verse=1001001)
+```
+
+or
+
+```python
+MyModel.objects.filter(verse="Genesis 1:1")
+```
+
+In any of the above examples, if the verse is not a valid verse ID integer or string reference for a single verse, then a ``ValidationError`` will be raised.
+
+### Many-to-many style relationships between verses and Django models
+
+> **WARNING**: This is still a work in progress, and this functionality does not yet exist in a stable form.
+
+There are situations where an instance of a Django model needs to be associated with multiple verses. The current intended solution, inspired by the [django-taggit](https://github.com/jazzband/django-taggit) library, is to implement this feature in such a way that you would add this relationship to your model like:
+
+```python
+from django.db import models
+
+import djangobible as bible
+
+
+class MyModel(models.Model):
+    ...  # other fields
+
+    verses = bible.VerseManager()
+```
+
+Then you could add, remove, and reference those verses with something like:
+
+```
+>>> my_object = MyModel.objects.create(name="My Object")
+>>> my_object.verses.add("Genesis 1:1-3")
+>>> my_object.verses.all()
+[<Verse: Genesis 1:1>, <Verse: Genesis 1:2>, <Verse: Genesis 1:3>]
+>>> my_object.verses.remove("Genesis 1:2")
+>>> my_object.verses.all()
+[<Verse: Genesis 1:1>, <Verse: Genesis 1:3>]
+>>> MyModel.objects.filter(verses__in=[1001001])
+[<MyModel: My Object>]
+```
+
+Ideally, the form field would be a text field where the user could enter a list of Scripture references (e.g. "Genesis 1:1,3-10;Psalm 119;Luke 2:1-18;John 3:16")

{djangobible-0.0.25 → djangobible-0.3.0}/README.md

@@ -2,20 +2,43 @@
 
 The djangobible library is a Django app that wraps the [pythonbible](https://github.com/avendesora/pythonbible) library and provides models, managers, and other tools to easily index an object by a scripture reference.
 
-[![PyPI version](https://img.shields.io/pypi/v/djangobible?color=blue&logo=pypi&logoColor=lightgray)](https://pypi.org/project/djangobible/)
-[![license MIT](https://img.shields.io/badge/license-MIT-orange.svg)](https://opensource.org/licenses/MIT)
-
-![Django CI](https://github.com/avendesora/djangobible/workflows/Django%20CI/badge.svg)
-[![Codacy Badge](https://app.codacy.com/project/badge/Coverage/83a28131bf6642ed9e439344122686fc)](https://www.codacy.com/gh/avendesora/djangobible/dashboard?utm_source=github.com&utm_medium=referral&utm_content=avendesora/djangobible&utm_campaign=Badge_Coverage)
-
-![CodeQL](https://github.com/avendesora/djangobible/workflows/CodeQL/badge.svg)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ca34603bdaf8446ba288430b69092093)](https://app.codacy.com/gh/avendesora/djangobible?utm_source=github.com&utm_medium=referral&utm_content=avendesora/djangobible&utm_campaign=Badge_Grade_Settings)
-
-[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/avendesora/djangobible/main.svg)](https://results.pre-commit.ci/latest/github/avendesora/djangobible/main)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-
-[![Python 3.10](https://img.shields.io/badge/python-3.7%20%7C%203.8%20%7C%203.9%20%7C%203.10-blue?logo=python&logoColor=lightgray)](https://www.python.org/downloads/)
-[![Django 3.2+](https://img.shields.io/badge/Django-3.2%20%7C%204.0-blue)](https://www.djangoproject.com/download/)
+<table>
+    <tr>
+        <td>Latest Version</td>
+        <td>
+            <a href="https://pypi.org/project/djangobible/"><img src="https://img.shields.io/pypi/v/djangobible?color=gold&logo=pypi&logoColor=lightgray"></a>
+            <img src="https://img.shields.io/pypi/dm/djangobible?color=gold">
+        </td>
+    </tr>
+    <tr>
+        <td>License</td>
+        <td><a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-orange.svg"></a></td>
+    </tr>
+    <tr>
+        <td>Tests</td>
+        <td>
+            <img src="https://github.com/avendesora/djangobible/actions/workflows/tests.yml/badge.svg">
+            <img src="https://github.com/avendesora/djangobible/workflows/Django%20CI/badge.svg"><br/>
+            <a href="https://app.codacy.com/gh/avendesora/djangobible/coverage/dashboard"><img src="https://app.codacy.com/project/badge/Coverage/83a28131bf6642ed9e439344122686fc"></a>
+        </td>
+    </tr>
+    <tr>
+        <td>Code Quality</td>
+        <td>
+            <img src="https://github.com/avendesora/djangobible/workflows/CodeQL/badge.svg">
+            <a href="https://app.codacy.com/gh/avendesora/djangobible?utm_source=github.com&utm_medium=referral&utm_content=avendesora/djangobible&utm_campaign=Badge_Grade_Settings"><img src="https://api.codacy.com/project/badge/Grade/ca34603bdaf8446ba288430b69092093"></a><br/>
+            <a href="https://results.pre-commit.ci/latest/github/avendesora/djangobible/main"><img src="https://results.pre-commit.ci/badge/github/avendesora/djangobible/main.svg"></a>
+            <a href="https://github.com/psf/black"><img src="https://img.shields.io/badge/code%20style-black-000000.svg"></a>
+        </td>
+    </tr>
+    <tr>
+        <td>Supported Python/Django Versions</td>
+        <td>
+            <a href="https://www.python.org/downloads/"><img src="https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-blue?logo=python&logoColor=lightgray"></a><br />
+            <a href="https://www.djangoproject.com/download/"><img src="https://img.shields.io/badge/Django-4.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-blue"></a><br />
+        </td>
+    </tr>
+</table>
 
 ## Installation
 
@@ -46,30 +69,6 @@ There currently are no settings (other than INSTALLED_APPS) related to the djang
 
 Also, once support is implemented for multiple locales and languages, there could be related settings for that functionality.
 
-### Optional Dependencies
-
-If the [defusedxml](https://github.com/tiran/defusedxml) library is installed, djangobible/pythonbible will use it to parse XML files rather than the builtin xml.etree library.
-
-To install djangobible with all optional dependencies, use the following command.
-
-```shell script
-pip install djangobible[all]
-```
-
-### Python 3.6
-
-Python 3.6 is not officially supported (djangobible is only tested on Python 3.7+). However, djangobible should work on Python 3.6 if you have the dataclasses library installed:
-
-```shell script
-pip install dataclasses
-```
-
-If you are using Python 3.7+, the dataclasses library is included in the Python standard library, and you do not need to explicitly install the dataclasses library.
-
-### Django versions
-
-The djangobible library is actively tested on Django 3.0 and 3.1, and support for Django 3.2 is planned. It may work on previous versions, but it has not been tested on other versions.
-
 ## Features
 
 The djangobible library is a complete wrapper for the [pythonbible](https://github.com/avendesora/pythonbible) library, so importing the djangobible library as:

{djangobible-0.0.25 → djangobible-0.3.0}/djangobible/__init__.py

@@ -1,5 +1,4 @@
-"""
-djangobible python library.
+"""djangobible python library.
 
 djangobible lets you easily associate Django models with Bible Scripture references and
 search accordingly.
@@ -7,6 +6,6 @@ search accordingly.
 
 from __future__ import annotations
 
-__version__ = "0.0.25"
+__version__ = "0.3.0"
 
 from pythonbible import *

{djangobible-0.0.25 → djangobible-0.3.0}/djangobible/fields.py

@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable
+from typing import Any
+from typing import Callable
 
 import pythonbible as bible
 from django import forms
@@ -24,7 +25,8 @@ class VerseField(models.Field):
                 bible.get_references(value),
             )[0]
         elif isinstance(value, int) and not bible.is_valid_verse_id(value):
-            raise ValidationError(f"{value} is not a valid verse id.")
+            error_message = f"{value} is not a valid verse id."
+            raise ValidationError(error_message)
 
         return super().get_prep_value(value)
 
@@ -56,8 +58,8 @@ class VerseField(models.Field):
 
     def formfield(
         self: VerseField,
-        form_class: Any = None,
-        choices_form_class: Any = None,
+        form_class: type[forms.Field] | None = None,
+        choices_form_class: type[forms.Field] | None = None,
         **kwargs: Any,
     ) -> forms.Field:
         """Make sure the form field is a CharField."""
@@ -70,7 +72,7 @@ class VerseField(models.Field):
 
     def get_db_prep_save(
         self: VerseField,
-        value: Any,
+        value: int | str | None,
         **kwargs: Any,
     ) -> int | None:
         """Validate and convert the value to a verse id int before saving to the DB."""
@@ -79,17 +81,16 @@ class VerseField(models.Field):
 
         if isinstance(value, str):
             references = bible.get_references(value)
-            verse_ids = bible.convert_references_to_verse_ids(references)
-
-            if not verse_ids:
-                raise ValidationError(
-                    f"{value} does not contain a valid Scripture reference.",
-                )
 
-            value = verse_ids[0]
+            if verse_ids := bible.convert_references_to_verse_ids(references):
+                value = verse_ids[0]
+            else:
+                error_message = f"{value} does not contain a valid Scripture reference."
+                raise ValidationError(error_message)
 
         if not bible.is_valid_verse_id(value):
-            raise ValidationError(f"{value} is not a valid verse id.")
+            error_message = f"{value} is not a valid verse id."
+            raise ValidationError(error_message)
 
         return int(value)
 

{djangobible-0.0.25 → djangobible-0.3.0}/djangobible/migrations/0001_initial.py

@@ -7,7 +7,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

{djangobible-0.0.25 → djangobible-0.3.0}/djangobible/models.py

@@ -2,10 +2,9 @@
 
 from __future__ import annotations
 
-from typing import Any
-
 import pythonbible as bible
-from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
+from django.contrib.contenttypes.fields import GenericForeignKey
+from django.contrib.contenttypes.fields import GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 
@@ -29,8 +28,8 @@ class VerseRelation(models.Model):
         self: VerseRelation,
         force_insert: bool = False,
         force_update: bool = False,
-        using: Any = None,
-        update_fields: Any = None,
+        using: str | None = None,
+        update_fields: list[str] | None = None,
     ) -> None:
         """Save the instance to the DB."""
         if not bible.is_valid_verse_id(self.verse):
@@ -45,7 +44,7 @@ class ScriptureIndexedModelManager(models.Manager):
     def filter_by_verse_ids(
         self: ScriptureIndexedModelManager,
         verse_ids: list[int] | None,
-    ) -> Any:
+    ) -> models.QuerySet:
         """Return the Query Set for the objects related to the given verse ids."""
         content_type = ContentType.objects.get_for_model(self.model)
         verse_relations = VerseRelation.objects.filter(

{djangobible-0.0.25 → djangobible-0.3.0}/djangobible/templatetags/verse_tags.py

@@ -13,8 +13,7 @@ register = template.Library()
 
 @register.simple_tag
 def verse_reference(verse_id: int, **kwargs: Any) -> str:
-    """
-    For a given verse id return the formatted scripture reference string.
+    """For a given verse id return the formatted scripture reference string.
 
     :param verse_id:
     :return: the scripture reference string for the given verse id
@@ -24,10 +23,8 @@ def verse_reference(verse_id: int, **kwargs: Any) -> str:
     verse: int
     book, chapter, verse = bible.get_book_chapter_verse(verse_id)
 
-    version_id: str | None = kwargs.get("version")
-
-    if version_id:
-        kwargs["version"] = _get_version(version_id)
+    if version_id := kwargs.get("version"):
+        kwargs["version"] = _get_version(version_id)  # type: ignore[arg-type,assignment]
 
     reference = bible.NormalizedReference(book, chapter, verse, chapter, verse)
 
@@ -36,19 +33,18 @@ def verse_reference(verse_id: int, **kwargs: Any) -> str:
 
 @register.simple_tag
 def verse_text(verse_id: int, **kwargs: Any) -> str:
-    """
-    For a given verse id and version, return the verse text string.
+    """For a given verse id and version, return the verse text string.
 
     :param verse_id:
     :return: the verse text for the given verse id and version
     """
-    version_id: str | None = kwargs.get("version")
+    version_id: str | None = kwargs.get("version")  # type: ignore[assignment]
     text: str = (
         bible.get_verse_text(verse_id, _get_version(version_id))
         if version_id
         else bible.get_verse_text(verse_id)
     )
-    include_verse_numbers: bool = kwargs.get("include_verse_numbers", False)
+    include_verse_numbers: bool = kwargs.get("include_verse_numbers", False)  # type: ignore[assignment]
 
     return (
         f"{bible.get_verse_number(verse_id)}. {text}" if include_verse_numbers else text

{djangobible-0.0.25 → djangobible-0.3.0}/djangobible/validators.py

@@ -3,11 +3,9 @@
 from __future__ import annotations
 
 from django.core.exceptions import ValidationError
-from pythonbible import (
-    NormalizedReference,
-    convert_references_to_verse_ids,
-    get_references,
-)
+from pythonbible import NormalizedReference
+from pythonbible import convert_references_to_verse_ids
+from pythonbible import get_references
 
 
 def validate_verse(verse_value: str | None) -> None:
@@ -18,12 +16,15 @@ def validate_verse(verse_value: str | None) -> None:
     references: list[NormalizedReference] = get_references(verse_value)
 
     if not references:
-        raise ValidationError("Not a valid reference.")
+        error_message = "Not a valid reference."
+        raise ValidationError(error_message)
 
     if len(references) > 1:
-        raise ValidationError("Only single verse references allowed.")
+        error_message = "Only single verse references allowed."
+        raise ValidationError(error_message)
 
     verse_ids: list[int] = convert_references_to_verse_ids(references)
 
     if len(verse_ids) > 1:
-        raise ValidationError("Only single verse references allowed.")
+        error_message = "Only single verse references allowed."
+        raise ValidationError(error_message)