closes #82

Author: xrotwang

CHANGES

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+unreleased
+----------
+
+- fixed expanding of URLs to account for QNames used as URI template.
+
+
 
 Version 3.6.0
 -------------

src/csvw/jsonld.py

@@ -79,8 +79,7 @@ def from_col(cls, table, col, row, prop, val, rownum):
         is_type = prop == 'rdf:type'
         valueUrl = col.valueUrl if col else table.inherit('valueUrl')
         if valueUrl:
-            val = table.expand(
-                valueUrl, row, _row=rownum, _name=_name, qname=is_type, uri=not is_type)
+            val = table.expand(valueUrl, row, _row=rownum, _name=_name, qname=is_type)
         val = format_value(val, col)
         s = None
         aboutUrl = col.aboutUrl if col else None

src/csvw/metadata.py

@@ -1098,7 +1098,7 @@ def base(self) -> typing.Union[str, pathlib.Path]:
         return self._parent._fname.parent if (self._parent and self._parent._fname) else \
             (self._fname.parent if self._fname else None)
 
-    def expand(self, tmpl: URITemplate, row: dict, _row, _name=None, qname=False, uri=False) -> str:
+    def expand(self, tmpl: URITemplate, row: dict, _row, _name=None, qname=False) -> str:
         """
         Expand a `URITemplate` using `row`, `_row` and `_name` as context and resolving the result
         against `TableLike.url`.
@@ -1113,25 +1113,28 @@ def expand(self, tmpl: URITemplate, row: dict, _row, _name=None, qname=False, ur
             'https://raw.githubusercontent.com/path?1#2'
 
         """
-        assert not (qname and uri)
         if tmpl is INVALID:
             return self.url.resolve(self.base)
-        res = Link(
-            tmpl.expand(
-                _row=_row, _name=_name, **{_k: _v for _k, _v in row.items() if isinstance(_k, str)}
-            )).resolve(self.url.resolve(self.base) if self.url else self.base)
+
+        for prefix, url in NAMESPACES.items():
+            if tmpl.uri.startswith(prefix + ':'):
+                # If the URI Template is a QName, we expand it to a URL to prevent `Link.resolve`
+                # from turning it into a local path.
+                res = '{}{}'.format(url, tmpl.uri.split(':')[1])
+                break
+        else:
+            res = Link(
+                tmpl.expand(
+                    _row=_row,
+                    _name=_name,
+                    **{_k: _v for _k, _v in row.items() if isinstance(_k, str)}
+                )).resolve(self.url.resolve(self.base) if self.url else self.base)
         if not isinstance(res, pathlib.Path):
             if qname:
                 for prefix, url in NAMESPACES.items():
                     if res.startswith(url):
                         res = res.replace(url, prefix + ':')
                         break
-            if uri:
-                if res != 'rdf:type':
-                    for prefix, url in NAMESPACES.items():
-                        if res.startswith(prefix + ':'):
-                            res = res.replace(prefix + ':', url)
-                            break
         return res
 
 

tests/fixtures/csv.txt-table-metadata.json

@@ -12,7 +12,7 @@
     "url": "csv.txt",
     "tableSchema": {
         "columns": [
-            {"name": "ID", "datatype": {"base": "string", "minLength": 3}},
+            {"name": "ID", "propertyUrl": "dc:identifier","datatype": {"base": "string", "minLength": 3}},
             {"datatype": "string"}
         ]
     }

tests/test_conformance.py

@@ -1,5 +1,9 @@
+import pathlib
+
 import pytest
 
+FIXTURES = pathlib.Path(__file__).parent / 'fixtures'
+
 
 @pytest.mark.conformance
 def test_csvw_json(csvwjsontest):
@@ -14,3 +18,11 @@ def test_csvw_nonnorm(csvwnonnormtest):
 @pytest.mark.conformance
 def test_csvw_validation(csvwvalidationtest):
     csvwvalidationtest.run()
+
+
+def test_prefix_in_property_url():
+    from csvw import CSVW
+
+    obj = CSVW(str(FIXTURES / 'csv.txt'), md_url=str(FIXTURES / 'csv.txt-table-metadata.json'))
+    row = obj.to_json()['tables'][0]['row'][0]['describes'][0]
+    assert 'dc:identifier' in row