Enhanced the use of namespaces

tests/test_namespace.py

@@ -10,6 +10,7 @@
     from typing import Callable
 
 
+# if True:
 def test_namespaces() -> None:
     """Test namespaces."""
     pytest.importorskip("rdflib")
@@ -56,6 +57,45 @@ def test_namespaces() -> None:
 
     assert FOOD2.NonExisting == FOOD2 + "NonExisting"
 
+    # Save and reuse the cache
+    FOOD2._save_cache()  # pylint: disable=protected-access
+    FOOD3 = Namespace(
+        "http://onto-ns.com/ontologies/examples/food#", check=True
+    )
+    assert FOOD3[name] == FOOD3 + name
+    assert FOOD3.Vegetable == FOOD3 + name
+    with pytest.raises(NoSuchIRIError):
+        FOOD3.NonExisting  # pylint: disable=pointless-statement
+
+
+# if True:
+def test_triplestore_arg() -> None:
+    """Test triplestore argument of Namespace.__init__()."""
+    pytest.importorskip("rdflib")
+    from tripper import RDF, Namespace, Triplestore
+    from tripper.errors import NamespaceError, NoSuchIRIError
+    from tripper.testutils import ontodir
+
+    assert str(RDF) == "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    assert RDF.type == "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+
+    ts = Triplestore("rdflib")
+    ts.parse(ontodir / "family.ttl")
+
+    FAM = Namespace(
+        "http://onto-ns.com/ontologies/examples/family#",
+        check=True,
+        triplestore=ts,
+    )
+    assert FAM.Son == "http://onto-ns.com/ontologies/examples/family#Son"
+    assert FAM["Son"] == "http://onto-ns.com/ontologies/examples/family#Son"
+    assert FAM + "Son" == "http://onto-ns.com/ontologies/examples/family#Son"
+    with pytest.raises(NoSuchIRIError):
+        FAM.NonExisting  # pylint: disable=pointless-statement
+
+    with pytest.raises(NamespaceError):
+        Namespace("http://example.com", check=True, triplestore=Ellipsis)
+
 
 # if True:
 def test_namespace_emmo():

tests/test_triplestore.py

@@ -321,3 +321,25 @@ def test_find_literal_triples() -> None:
             (FAM.Per, FAM.hasName, Literal("Per")),
         ]
     )
+
+
+# if True:
+def test_bind_errors():
+    """Test for errors in Triplestore.bind()."""
+    pytest.importorskip("rdflib")
+
+    from tripper import Triplestore
+
+    ts = Triplestore(backend="rdflib", base_iri="http://example.com#")
+    EX = ts.bind("ex")
+    assert EX == "http://example.com#"
+    assert "ex" in ts.namespaces
+
+    ts.bind("ex", None)
+    assert "ex" not in ts.namespaces
+
+    ts2 = Triplestore(backend="rdflib")
+    with pytest.raises(ValueError):
+        ts2.bind("ex")
+    with pytest.raises(TypeError):
+        ts2.bind("ex", Ellipsis)

tests/test_utils.py

@@ -265,3 +265,7 @@ def test_extend_namespace():
 
     extend_namespace(FOOD, ontodir / "food-more.ttl")
     assert FOOD.Fish == FOOD + "FOOD_90f5dd54_9e5c_46c9_824f_e10625a90c26"
+
+    EX = Namespace("http://example.com#")
+    with pytest.raises(TypeError):
+        extend_namespace(EX, {"Item": EX + "Item"})

tripper/backends/rdflib.py

@@ -66,14 +66,12 @@ class RdflibStrategy:
 
     def __init__(
         self,
-        base_iri: "Optional[str]" = None,
+        base_iri: "Optional[str]" = None,  # pylint: disable=unused-argument
         database: "Optional[str]" = None,
         triplestore_url: "Optional[str]" = None,
         format: "Optional[str]" = None,  # pylint: disable=redefined-builtin
         graph: "Graph" = None,
     ) -> None:
-        if base_iri:
-            warnings.warn("base_iri", UnusedArgumentWarning, stacklevel=3)
         if database:
             warnings.warn("database", UnusedArgumentWarning, stacklevel=3)
 

tripper/namespace.py

@@ -66,7 +66,7 @@
     ):
         # pylint: disable=redefined-builtin
         if cachemode != -1:
             warnings.warn(
                 "The `cachemode` argument of Triplestore.__init__() is "
                 "deprecated.  Use `reload` instead (with `cachemode=NO_CACHE` "
                 "corresponding to `reload=True`).\n\n"
@@ -74,11 +74,11 @@
                 DeprecationWarning,
                 stacklevel=2,
             )
             if reload is None and cachemode == 0:
                 reload = True
 
         if triplestore_url:
             warnings.warn(
                 "The `triplestore_url` argument of Triplestore.__init__() is "
                 "deprecated.  Use the `triplestore` argument instead (which "
                 "now accepts a string argument with the URL).\n\n"
@@ -86,8 +86,8 @@
                 DeprecationWarning,
                 stacklevel=2,
             )
             if triplestore is None:
                 triplestore = triplestore_url
 
         if label_annotations is True:
             label_annotations = (SKOS.prefLabel, RDF.label, SKOS.altLabel)
@@ -129,7 +129,7 @@
                 ts = Triplestore("rdflib")
             ts.parse(triplestore, format=format)
         elif isinstance(triplestore, Triplestore):
             ts = triplestore
         elif not isinstance(triplestore, Triplestore):
             raise NamespaceError(
                 "If given, `triplestore` argument must be either a URL "
@@ -174,7 +174,7 @@
         # pylint: disable=invalid-name
         cachefile = self._get_cachefile()
         if self._iris is None:
             self._iris = {}
         if cachefile.exists():
             with open(cachefile, "rb") as f:
                 self._iris.update(pickle.load(f))  # nosec
@@ -192,7 +192,7 @@
         return self.__getattr__(key)
 
     def __repr__(self):
-        return f"Namespace({self._iri})"
+        return f"Namespace('{self._iri}')"
 
     def __str__(self):
         return self._iri
@@ -222,15 +222,15 @@
     finaldir = None
     if not site_cachedir:
         if sys.platform.startswith("win32"):
             site_cachedir = Path.home() / "AppData" / "Local"
             finaldir = "Cache"
         elif sys.platform.startswith("darwin"):
             site_cachedir = Path.home() / "Library" / "Caches"
         else:  # Default to UNIX
             site_cachedir = Path.home() / ".cache"  # type: ignore
     cachedir = Path(site_cachedir) / "tripper"  # type: ignore
     if finaldir:
         cachedir /= finaldir
 
     if create:
         path = Path(cachedir.root)