1. Flakification. 2. Updated builder.

Author: asladeofgreen

pyessv/parsing/identifiers/builder.py

@@ -2,6 +2,9 @@
 
 from pyessv import IDENTIFIER_TYPE_SET, IDENTIFIER_TYPE_FILENAME
 from pyessv.parsing.identifiers.config import get_config
+from pyessv.parsing.identifiers.config import CollectionParsingSpecification
+from pyessv.parsing.identifiers.config import ConstantParsingSpecification
+from pyessv.parsing.identifiers.config import RegExParsingSpecification
 
 
 def build_identifier(scope, identifier_type, terms, regex_terms={}):
@@ -46,34 +49,39 @@ def build_identifier(scope, identifier_type, terms, regex_terms={}):
     known_terms.extend(set([(name,) for name in regex_terms.keys()]))  # hack to fake multiple name in regex_term
     known_terms = set.union(*known_terms)
     # print(set.union(*known_terms))
+
     for idx, spec in enumerate(cfg.specs):
-        if not spec.startswith("const") and template_part[idx] not in optional_template_part:
-            if spec.startswith("regex"):
+        if not isinstance(spec, ConstantParsingSpecification) and \
+           template_part[idx] not in optional_template_part:
+            if isinstance(spec, RegExParsingSpecification):
                 if template_part[idx] not in known_terms:
                     msg = f'Invalid known terms : missing {template_part[idx]} to build {identifier_type}'
                     raise ValueError(msg)
-            elif spec.split(":")[-1] not in known_terms:
-                msg = f'Invalid known terms : missing {spec.split(":")[-1]} to build {identifier_type}'
+            elif spec.namespace.split(":")[-1] not in known_terms:
+                msg = f'Invalid known terms : missing {spec.namespace.split(":")[-1]} to build {identifier_type}'
                 raise ValueError(msg)
 
     # Building the identifier
     identifier_part = list()
     for idx, spec in enumerate(cfg.specs):
+        # ... collection members.
+        if isinstance(spec, CollectionParsingSpecification):
+            for term in terms:
+                if spec.namespace.replace(term.scope.namespace + ":", "") in term.collection.all_names:
+                    identifier_part.append(term.raw_name)
+                    break
+
         # ... constants.
-        if spec.startswith("const"):
-            identifier_part.append(spec.split(":")[1])
+        elif isinstance(spec, ConstantParsingSpecification):
+            identifier_part.append(spec.value)
 
         # ... regular expressions
-        elif spec.startswith("regex"):
+        elif isinstance(spec, RegExParsingSpecification):
             if template_part[idx] in regex_terms.keys():
                 identifier_part.append(regex_terms[template_part[idx]])
 
-        # ... collection members.
         else:
-            for term in terms:
-                if spec.replace(term.scope.namespace + ":", "") in term.collection.all_names:
-                    identifier_part.append(term.raw_name)
-                    break
+            raise ValueError("Unsupported specification type")
 
     result = cfg.seperator.join(identifier_part)
 

pyessv/parsing/identifiers/parser.py

@@ -43,8 +43,16 @@ def parse_identifer(scope, identifier_type, identifier, strictness=PARSING_STRIC
     # For each identifier element, execute relevant vaidator.
     result = set()
     for idx, (element, spec) in enumerate(zip(elements, cfg.specs)):
+        # ... vocabulary collection members.
+        if isinstance(spec, CollectionParsingSpecification):
+            match_result = match_term(load_collection(spec.namespace), element, strictness)
+            if match_result is False:
+                msg = 'Invalid identifier - failed vocab check. Element=#{}::({}). Identifier={}'
+                raise ValueError(msg.format(idx + 1, element, identifier))
+            result.add(match_result)
+
         # ... constants.
-        if isinstance(spec, ConstantParsingSpecification):
+        elif isinstance(spec, ConstantParsingSpecification):
             if element != spec.value:
                 msg = 'Invalid identifier - failed const check. Element=#{}::({}). Identifier={}'
                 raise ValueError(msg.format(idx + 1, element, spec.value, identifier))
@@ -57,14 +65,6 @@ def parse_identifer(scope, identifier_type, identifier, strictness=PARSING_STRIC
                 msg = 'Invalid identifier - failed regex check. Element=#{}::({}). Identifier={}'
                 raise ValueError(msg.format(idx + 1, element, identifier))
 
-        # ... vocabulary collection members.
-        elif isinstance(spec, CollectionParsingSpecification):
-            match_result = match_term(load_collection(spec.namespace), element, strictness)
-            if match_result is False:
-                msg = 'Invalid identifier - failed vocab check. Element=#{}::({}). Identifier={}'
-                raise ValueError(msg.format(idx + 1, element, identifier))
-            result.add(match_result)
-
         else:
             raise ValueError("Unsupported specification type")
 

tests/_test_parser_template.py

@@ -4,3 +4,13 @@
 from tests.fixtures.identifiers import directory_identifiers_invalid
 from tests.fixtures.identifiers import filename_identifiers
 from tests.fixtures.identifiers import filename_identifiers_invalid
+
+
+__all__ = [
+    dataset_identifiers,
+    dataset_identifiers_invalid,
+    directory_identifiers,
+    directory_identifiers_invalid,
+    filename_identifiers,
+    filename_identifiers_invalid
+]

tests/fixtures/__init__.py

@@ -10,31 +10,38 @@
 # Path to test assets folder.
 _ASSETS: pathlib.Path = pathlib.Path(os.path.dirname(__file__)).parent / "assets" / "identifiers"
 
+
 @pytest.fixture(scope="session")
 def dataset_identifiers() -> typing.Tuple[pyessv.Scope, str]:
-    return list(_yield_valid_identifiers(pyessv.IDENTIFIER_TYPE_DATASET))
+    return list(_yield_identifiers(pyessv.IDENTIFIER_TYPE_DATASET))
+
 
 @pytest.fixture(scope="session")
 def dataset_identifiers_invalid() -> typing.Tuple[pyessv.Scope, str]:
-    return list(_yield_invalid_identifiers(pyessv.IDENTIFIER_TYPE_DATASET))
+    return list(_yield_identifiers_invalid(pyessv.IDENTIFIER_TYPE_DATASET))
+
 
 @pytest.fixture(scope="session")
 def directory_identifiers() -> typing.Tuple[pyessv.Scope, str]:
-    return list(_yield_valid_identifiers(pyessv.IDENTIFIER_TYPE_DIRECTORY))
+    return list(_yield_identifiers(pyessv.IDENTIFIER_TYPE_DIRECTORY))
+
 
 @pytest.fixture(scope="session")
 def directory_identifiers_invalid() -> typing.Tuple[pyessv.Scope, str]:
-    return list(_yield_invalid_identifiers(pyessv.IDENTIFIER_TYPE_DIRECTORY))
+    return list(_yield_identifiers_invalid(pyessv.IDENTIFIER_TYPE_DIRECTORY))
+
 
 @pytest.fixture(scope="session")
 def filename_identifiers() -> typing.Tuple[pyessv.Scope, str]:
-    return list(_yield_valid_identifiers(pyessv.IDENTIFIER_TYPE_FILENAME))
+    return list(_yield_identifiers(pyessv.IDENTIFIER_TYPE_FILENAME))
+
 
 @pytest.fixture(scope="session")
 def filename_identifiers_invalid() -> typing.Tuple[pyessv.Scope, str]:
-    return list(_yield_invalid_identifiers(pyessv.IDENTIFIER_TYPE_FILENAME))
+    return list(_yield_identifiers_invalid(pyessv.IDENTIFIER_TYPE_FILENAME))
 
-def _yield_valid_identifiers(identifier_type: str) -> typing.Iterator[typing.Tuple[pyessv.Scope, str]]:
+
+def _yield_identifiers(identifier_type: str) -> typing.Iterator[typing.Tuple[pyessv.Scope, str]]:
     fpath: pathlib.Path = _ASSETS
     if not fpath.exists():
         return []
@@ -47,8 +54,9 @@ def _yield_valid_identifiers(identifier_type: str) -> typing.Iterator[typing.Tup
         for identifier in [i for i in fixture["identifiers"] if i]:
             yield scope, identifier
 
-def _yield_invalid_identifiers(identifier_type: str):
-    for scope, identifier in _yield_valid_identifiers(identifier_type):
+
+def _yield_identifiers_invalid(identifier_type: str):
+    for scope, identifier in _yield_identifiers(identifier_type):
         elements = identifier.split(".")
 
         # Invalid: too few elements.

tests/fixtures/identifiers.py

@@ -12,25 +12,25 @@
 
 
 def test_interface():
-	"""pyessv-tests: caching: interface.
+    """pyessv-tests: caching: interface.
 
-	"""
-	assert inspect.isfunction(encache)
-	assert inspect.isfunction(decache)
-	assert inspect.isfunction(get_cached)
+    """
+    assert inspect.isfunction(encache)
+    assert inspect.isfunction(decache)
+    assert inspect.isfunction(get_cached)
 
 
 def test_cache():
-	"""pyessv-tests: caching: cache
+    """pyessv-tests: caching: cache
 
-	"""
-	assert isinstance(get_cached(tu.AUTHORITY_NAME), pyessv.Authority)
+    """
+    assert isinstance(get_cached(tu.AUTHORITY_NAME), pyessv.Authority)
 
 
 def test_decache():
-	"""pyessv-tests: caching: decache
+    """pyessv-tests: caching: decache
 
-	"""
-	decache(tu.AUTHORITY_NAME)
+    """
+    decache(tu.AUTHORITY_NAME)
 
-	assert get_cached(tu.AUTHORITY_NAME) is None
+    assert get_cached(tu.AUTHORITY_NAME) is None

tests/test_cache.py

@@ -1,5 +1,3 @@
-import inspect
-
 import pytest
 
 from pyessv.codecs import decode
@@ -36,7 +34,7 @@ def yield_parameterizations():
         tu.create_term_01,
         tu.create_term_02,
         tu.create_term_03
-        ):
+    ):
         for encoding in ENCODING_SET:
             yield node_factory(), encoding
 

tests/test_codecs.py

@@ -15,7 +15,7 @@
 def _yield_parameterizations():
     """Test parameterizations.
 
-    """    
+    """
     for factory, typeof in (
         (tu.create_authority, Authority),
         (tu.create_scope, Scope),
@@ -25,7 +25,7 @@ def _yield_parameterizations():
         (tu.create_term_01, Term),
         (tu.create_term_02, Term),
         (tu.create_term_03, Term)
-        ):
+    ):
         yield factory, typeof
 
 

tests/test_factory.py

@@ -7,13 +7,13 @@
 def yield_parameterizations():
     """Test parameterizations.
 
-    """   
+    """
     for func, status in (
         (pyessv.accept, pyessv.GOVERNANCE_STATUS_ACCEPTED),
         (pyessv.reject, pyessv.GOVERNANCE_STATUS_REJECTED),
         (pyessv.reset, pyessv.GOVERNANCE_STATUS_PENDING),
         (pyessv.deprecate, pyessv.GOVERNANCE_STATUS_DEPRECATED)
-        ):
+    ):
         yield func, status
 
 

tests/test_governance.py

@@ -92,7 +92,7 @@
 def yield_parameterizations():
     """Yields test parameterizations.
 
-    """    
+    """
     for members, member_type in (
         (_CLASSES, 'class'),
         (_CONSTANTS, 'constant'),