Gdt 82 transformer class refactor

tests/conftest.py

@@ -5,8 +5,8 @@
 
 import transmogrifier.models as timdex
 from transmogrifier.config import SOURCES, load_external_config
-from transmogrifier.helpers import parse_xml_records
 from transmogrifier.sources.datacite import Datacite
+from transmogrifier.sources.transformer import XmlTransformer
 
 
 @pytest.fixture(autouse=True)
@@ -48,15 +48,17 @@ def runner():
 
 @pytest.fixture()
 def datacite_records():
-    return parse_xml_records("tests/fixtures/datacite/datacite_records.xml")
+    return XmlTransformer.parse_source_file(
+        "tests/fixtures/datacite/datacite_records.xml"
+    )
 
 
 @pytest.fixture()
 def datacite_record_all_fields():
-    input_records = parse_xml_records(
+    source_records = XmlTransformer.parse_source_file(
         "tests/fixtures/datacite/datacite_record_all_fields.xml"
     )
-    return Datacite("cool-repo", input_records)
+    return Datacite("cool-repo", source_records)
 
 
 @pytest.fixture()
@@ -71,7 +73,7 @@ def marc_content_type_crosswalk():
 
 @pytest.fixture()
 def oai_pmh_records():
-    return parse_xml_records("tests/fixtures/oai_pmh_records.xml")
+    return XmlTransformer.parse_source_file("tests/fixtures/oai_pmh_records.xml")
 
 
 @pytest.fixture()

tests/test_config.py

@@ -6,10 +6,8 @@
 from transmogrifier.config import (
     configure_logger,
     configure_sentry,
-    get_transformer,
     load_external_config,
 )
-from transmogrifier.sources.datacite import Datacite
 
 
 def test_configure_logger_not_verbose():
@@ -44,25 +42,6 @@ def test_configure_sentry_env_variable_is_dsn(monkeypatch):
     assert result == "Sentry DSN found, exceptions will be sent to Sentry with env=test"
 
 
-def test_get_transformer_returns_correct_class_name():
-    assert get_transformer("jpal") == Datacite
-
-
-def test_get_transformer_source_missing_class_name_raises_error():
-    with pytest.raises(KeyError):
-        get_transformer("cool-repo")
-
-
-def test_get_transformer_source_wrong_class_name_raises_error(bad_config):
-    with pytest.raises(AttributeError):
-        get_transformer("bad-class-name")
-
-
-def test_get_transformer_source_wrong_module_path_raises_error(bad_config):
-    with pytest.raises(ImportError):
-        get_transformer("bad-module-path")
-
-
 def test_load_external_config_invalid_file_type_raises_error():
     with pytest.raises(ValueError):
         load_external_config("config/loc-countries.xml", "zxr")

tests/test_datacite.py

@@ -1,4 +1,3 @@
-from transmogrifier.helpers import parse_xml_records
 from transmogrifier.models import (
     AlternateTitle,
     Contributor,
@@ -170,10 +169,10 @@ def test_datacite_transform_with_all_fields_transforms_correctly(
 
 
 def test_datacite_transform_missing_required_datacite_fields_logs_warning(caplog):
-    input_records = parse_xml_records(
+    source_records = Datacite.parse_source_file(
         "tests/fixtures/datacite/datacite_record_missing_datacite_required_fields.xml"
     )
-    output_records = Datacite("cool-repo", input_records)
+    output_records = Datacite("cool-repo", source_records)
     next(output_records)
 
     assert (
@@ -195,10 +194,10 @@ def test_datacite_transform_missing_required_datacite_fields_logs_warning(caplog
 
 
 def test_datacite_transform_with_optional_fields_blank_transforms_correctly():
-    input_records = parse_xml_records(
+    source_records = Datacite.parse_source_file(
         "tests/fixtures/datacite/datacite_record_optional_fields_blank.xml"
     )
-    output_records = Datacite("cool-repo", input_records)
+    output_records = Datacite("cool-repo", source_records)
     assert next(output_records) == TimdexRecord(
         citation=("Title not provided. https://example.com/doi:10.7910/DVN/19PPE7"),
         source="A Cool Repository",
@@ -218,10 +217,10 @@ def test_datacite_transform_with_optional_fields_blank_transforms_correctly():
 
 
 def test_datacite_transform_with_optional_fields_missing_transforms_correctly():
-    input_records = parse_xml_records(
+    source_records = Datacite.parse_source_file(
         "tests/fixtures/datacite/datacite_record_optional_fields_missing.xml"
     )
-    output_records = Datacite("cool-repo", input_records)
+    output_records = Datacite("cool-repo", source_records)
     assert next(output_records) == TimdexRecord(
         citation=("Title not provided. https://example.com/doi:10.7910/DVN/19PPE7"),
         source="A Cool Repository",
@@ -241,10 +240,10 @@ def test_datacite_transform_with_optional_fields_missing_transforms_correctly():
 
 
 def test_datacite_with_attribute_and_subfield_variations_transforms_correctly():
-    input_records = parse_xml_records(
+    source_records = Datacite.parse_source_file(
         "tests/fixtures/datacite/datacite_record_attribute_and_subfield_variations.xml"
     )
-    output_records = Datacite("cool-repo", input_records)
+    output_records = Datacite("cool-repo", source_records)
     assert next(output_records) == TimdexRecord(
         citation=(
             "Creator, No affiliation no identifier, Creator, Blank affiliation blank "

tests/test_dspace_dim.py

@@ -1,13 +1,12 @@
 import transmogrifier.models as timdex
-from transmogrifier.helpers import parse_xml_records
 from transmogrifier.sources.dspace_dim import DspaceDim
 
 
 def test_dspace_dim_transform_with_all_fields_transforms_correctly():
-    input_records = parse_xml_records(
+    source_records = DspaceDim.parse_source_file(
         "tests/fixtures/dspace/dspace_dim_record_all_fields.xml"
     )
-    output_records = DspaceDim("cool-repo", input_records)
+    output_records = DspaceDim("cool-repo", source_records)
     assert next(output_records) == timdex.TimdexRecord(
         citation="Journal of Geophysical Research: Solid Earth 121 (2016): 5859–5879",
         source="A Cool Repository",
@@ -133,10 +132,10 @@ def test_dspace_dim_transform_with_all_fields_transforms_correctly():
 
 
 def test_dspace_dim_transform_with_attribute_variations_transforms_correctly():
-    input_records = parse_xml_records(
+    source_records = DspaceDim.parse_source_file(
         "tests/fixtures/dspace/dspace_dim_record_attribute_variations.xml"
     )
-    output_records = DspaceDim("cool-repo", input_records)
+    output_records = DspaceDim("cool-repo", source_records)
     assert next(output_records) == timdex.TimdexRecord(
         citation="Title with Blank Qualifier. https://example.com/1912/2641",
         source="A Cool Repository",
@@ -188,10 +187,10 @@ def test_dspace_dim_transform_with_attribute_variations_transforms_correctly():
 
 
 def test_dspace_dim_transform_with_optional_fields_blank_transforms_correctly():
-    input_records = parse_xml_records(
+    source_records = DspaceDim.parse_source_file(
         "tests/fixtures/dspace/dspace_dim_record_optional_fields_blank.xml"
     )
-    output_records = DspaceDim("cool-repo", input_records)
+    output_records = DspaceDim("cool-repo", source_records)
     assert next(output_records) == timdex.TimdexRecord(
         source="A Cool Repository",
         source_link="https://example.com/1912/2641",
@@ -204,10 +203,10 @@ def test_dspace_dim_transform_with_optional_fields_blank_transforms_correctly():
 
 
 def test_dspace_dim_transform_with_optional_fields_missing_transforms_correctly():
-    input_records = parse_xml_records(
+    source_records = DspaceDim.parse_source_file(
         "tests/fixtures/dspace/dspace_dim_record_optional_fields_missing.xml"
     )
-    output_records = DspaceDim("cool-repo", input_records)
+    output_records = DspaceDim("cool-repo", source_records)
     assert next(output_records) == timdex.TimdexRecord(
         source="A Cool Repository",
         source_link="https://example.com/1912/2641",

tests/test_dspace_mets.py

@@ -1,10 +1,9 @@
 import transmogrifier.models as timdex
-from transmogrifier.helpers import parse_xml_records
 from transmogrifier.sources.dspace_mets import DspaceMets
 
 
 def test_dspace_mets_transform_with_missing_optional_fields_transforms_correctly():
-    dspace_xml_records = parse_xml_records(
+    dspace_xml_records = DspaceMets.parse_source_file(
         "tests/fixtures/dspace/dspace_mets_record_optional_fields_missing.xml"
     )
     output_records = DspaceMets("dspace", dspace_xml_records)
@@ -20,7 +19,7 @@ def test_dspace_mets_transform_with_missing_optional_fields_transforms_correctly
 
 
 def test_dspace_mets_transform_with_blank_optional_fields_transforms_correctly():
-    dspace_xml_records = parse_xml_records(
+    dspace_xml_records = DspaceMets.parse_source_file(
         "tests/fixtures/dspace/dspace_mets_record_optional_fields_blank.xml"
     )
     output_records = DspaceMets("dspace", dspace_xml_records)
@@ -36,7 +35,7 @@ def test_dspace_mets_transform_with_blank_optional_fields_transforms_correctly()
 
 
 def test_dspace_mets_with_attribute_and_subfield_variations_transforms_correctly():
-    dspace_xml_records = parse_xml_records(
+    dspace_xml_records = DspaceMets.parse_source_file(
         "tests/fixtures/dspace/dspace_mets_record_attribute_and_subfield_variations.xml"
     )
     output_records = DspaceMets("dspace", dspace_xml_records)
@@ -85,7 +84,7 @@ def test_dspace_mets_with_attribute_and_subfield_variations_transforms_correctly
 
 
 def test_dspace_mets_transform_with_all_fields_transforms_correctly():
-    dspace_xml_records = parse_xml_records(
+    dspace_xml_records = DspaceMets.parse_source_file(
         "tests/fixtures/dspace/dspace_mets_record_all_fields.xml"
     )
     output_records = DspaceMets("dspace", dspace_xml_records)

tests/test_ead.py

@@ -1,12 +1,13 @@
 import logging
 
 import transmogrifier.models as timdex
-from transmogrifier.helpers import parse_xml_records
 from transmogrifier.sources.ead import Ead
 
 
 def test_ead_record_all_fields_transform_correctly():
-    ead_xml_records = parse_xml_records("tests/fixtures/ead/ead_record_all_fields.xml")
+    ead_xml_records = Ead.parse_source_file(
+        "tests/fixtures/ead/ead_record_all_fields.xml"
+    )
     output_records = Ead("aspace", ead_xml_records)
     assert next(output_records) == timdex.TimdexRecord(
         source="MIT ArchivesSpace",
@@ -216,7 +217,7 @@ def test_ead_record_all_fields_transform_correctly():
 
 
 def test_ead_record_with_missing_archdesc_logs_error(caplog):
-    ead_xml_records = parse_xml_records(
+    ead_xml_records = Ead.parse_source_file(
         "tests/fixtures/ead/ead_record_missing_archdesc.xml"
     )
     output_records = Ead("aspace", ead_xml_records)
@@ -230,7 +231,7 @@ def test_ead_record_with_missing_archdesc_logs_error(caplog):
 
 
 def test_ead_record_with_missing_archdesc_did_logs_error(caplog):
-    ead_xml_records = parse_xml_records(
+    ead_xml_records = Ead.parse_source_file(
         "tests/fixtures/ead/ead_record_missing_archdesc_did.xml"
     )
     output_records = Ead("aspace", ead_xml_records)
@@ -244,7 +245,7 @@ def test_ead_record_with_missing_archdesc_did_logs_error(caplog):
 
 
 def test_ead_record_with_attribute_and_subfield_variations_transforms_correctly():
-    ead_xml_records = parse_xml_records(
+    ead_xml_records = Ead.parse_source_file(
         "tests/fixtures/ead/ead_record_attribute_and_subfield_variations.xml"
     )
     output_records = Ead("aspace", ead_xml_records)
@@ -470,7 +471,7 @@ def test_ead_record_with_attribute_and_subfield_variations_transforms_correctly(
 
 
 def test_ead_record_with_blank_optional_fields_transforms_correctly():
-    ead_xml_records = parse_xml_records(
+    ead_xml_records = Ead.parse_source_file(
         "tests/fixtures/ead/ead_record_blank_optional_fields.xml"
     )
     output_records = Ead("aspace", ead_xml_records)
@@ -488,7 +489,7 @@ def test_ead_record_with_blank_optional_fields_transforms_correctly():
 
 
 def test_ead_record_invalid_date_and_date_range_are_omitted(caplog):
-    ead_xml_records = parse_xml_records(
+    ead_xml_records = Ead.parse_source_file(
         "tests/fixtures/ead/ead_record_attribute_and_subfield_variations.xml"
     )
     output_record = next(Ead("aspace", ead_xml_records))
@@ -507,7 +508,7 @@ def test_ead_record_invalid_date_and_date_range_are_omitted(caplog):
 
 
 def test_ead_record_correct_identifiers_from_multiple_unitid(caplog):
-    ead_xml_records = parse_xml_records(
+    ead_xml_records = Ead.parse_source_file(
         "tests/fixtures/ead/ead_record_attribute_and_subfield_variations.xml"
     )
     output_record = next(Ead("aspace", ead_xml_records))
@@ -516,7 +517,7 @@ def test_ead_record_correct_identifiers_from_multiple_unitid(caplog):
 
 
 def test_ead_record_with_missing_optional_fields_transforms_correctly():
-    ead_xml_records = parse_xml_records(
+    ead_xml_records = Ead.parse_source_file(
         "tests/fixtures/ead/ead_record_missing_optional_fields.xml"
     )
     output_records = Ead("aspace", ead_xml_records)

tests/test_helpers.py

@@ -4,7 +4,6 @@
 from transmogrifier.helpers import (
     generate_citation,
     parse_date_from_string,
-    parse_xml_records,
     validate_date,
     validate_date_range,
 )
@@ -189,11 +188,6 @@ def test_generate_citation_with_all_fields():
     )
 
 
-def test_parse_xml_records_returns_record_iterator():
-    records = parse_xml_records("tests/fixtures/datacite/datacite_records.xml")
-    assert len(list(records)) == 38
-
-
 def test_parse_date_from_string_success():
     for date in [
         "1930",