Reorganize source around XML and JSON folders

MITLibraries · Dec 12, 2023 · 5f061bb · 5f061bb
1 parent 62d8e79
commit 5f061bb
Show file tree

Hide file tree

Showing 23 changed files with 27 additions and 27 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -5,8 +5,8 @@
 
 import transmogrifier.models as timdex
 from transmogrifier.config import SOURCES, load_external_config
-from transmogrifier.sources.datacite import Datacite
 from transmogrifier.sources.transformer import XmlTransformer
+from transmogrifier.sources.xml.datacite import Datacite
 
 
 @pytest.fixture(autouse=True)
@@ -29,7 +29,7 @@ def bad_config():
     SOURCES["bad-class-name"] = {
         "name": "Some Repository",
         "base-url": "https://example.com/",
-        "transform-class": "transmogrifier.sources.datacite.WrongClass",
+        "transform-class": "transmogrifier.sources.xml.datacite.WrongClass",
     }
     SOURCES["bad-module-path"] = {
         "name": "Some Repository",

diff --git a/tests/test_transformer.py → tests/sources/test_transformer.py b/tests/test_transformer.py → tests/sources/test_transformer.py
@@ -3,8 +3,8 @@
 import pytest
 
 from transmogrifier.models import TimdexRecord
-from transmogrifier.sources.datacite import Datacite
 from transmogrifier.sources.transformer import Transformer, XmlTransformer
+from transmogrifier.sources.xml.datacite import Datacite
 
 
 def test_transformer_get_transformer_returns_correct_class_name():

diff --git a/tests/test_datacite.py → tests/sources/xml/test_datacite.py b/tests/test_datacite.py → tests/sources/xml/test_datacite.py
@@ -13,7 +13,7 @@
     Subject,
     TimdexRecord,
 )
-from transmogrifier.sources.datacite import Datacite
+from transmogrifier.sources.xml.datacite import Datacite
 
 
 def test_datacite_transform_with_all_fields_transforms_correctly(

diff --git a/tests/test_dspace_dim.py → tests/sources/xml/test_dspace_dim.py b/tests/test_dspace_dim.py → tests/sources/xml/test_dspace_dim.py
@@ -1,5 +1,5 @@
 import transmogrifier.models as timdex
-from transmogrifier.sources.dspace_dim import DspaceDim
+from transmogrifier.sources.xml.dspace_dim import DspaceDim
 
 
 def test_dspace_dim_transform_with_all_fields_transforms_correctly():

diff --git a/tests/test_dspace_mets.py → tests/sources/xml/test_dspace_mets.py b/tests/test_dspace_mets.py → tests/sources/xml/test_dspace_mets.py
@@ -1,5 +1,5 @@
 import transmogrifier.models as timdex
-from transmogrifier.sources.dspace_mets import DspaceMets
+from transmogrifier.sources.xml.dspace_mets import DspaceMets
 
 
 def test_dspace_mets_transform_with_missing_optional_fields_transforms_correctly():

diff --git a/tests/test_ead.py → tests/sources/xml/test_ead.py b/tests/test_ead.py → tests/sources/xml/test_ead.py
@@ -1,7 +1,7 @@
 import logging
 
 import transmogrifier.models as timdex
-from transmogrifier.sources.ead import Ead
+from transmogrifier.sources.xml.ead import Ead
 
 
 def test_ead_record_all_fields_transform_correctly():
@@ -224,7 +224,7 @@ def test_ead_record_with_missing_archdesc_logs_error(caplog):
     assert len(list(output_records)) == 0
     assert output_records.processed_record_count == 1
     assert (
-        "transmogrifier.sources.ead",
+        "transmogrifier.sources.xml.ead",
         logging.ERROR,
         "Record ID repositories/2/resources/4 is missing archdesc element",
     ) in caplog.record_tuples
@@ -238,7 +238,7 @@ def test_ead_record_with_missing_archdesc_did_logs_error(caplog):
     assert len(list(output_records)) == 0
     assert output_records.processed_record_count == 1
     assert (
-        "transmogrifier.sources.ead",
+        "transmogrifier.sources.xml.ead",
         logging.ERROR,
         "Record ID repositories/2/resources/3 is missing archdesc > did element",
     ) in caplog.record_tuples

diff --git a/tests/test_marc.py → tests/sources/xml/test_marc.py b/tests/test_marc.py → tests/sources/xml/test_marc.py
@@ -3,7 +3,7 @@
 from bs4 import BeautifulSoup
 
 import transmogrifier.models as timdex
-from transmogrifier.sources.marc import Marc
+from transmogrifier.sources.xml.marc import Marc
 
 
 def test_marc_record_all_fields_transform_correctly():
@@ -752,7 +752,7 @@ def test_marc_record_missing_leader_logs_error(caplog):
     assert len(list(output_records)) == 0
     assert output_records.processed_record_count == 1
     assert (
-        "transmogrifier.sources.marc",
+        "transmogrifier.sources.xml.marc",
         logging.ERROR,
         "Record ID 990027185640106761 is missing MARC leader",
     ) in caplog.record_tuples
@@ -766,7 +766,7 @@ def test_marc_record_missing_008_logs_error(caplog):
     assert len(list(output_records)) == 0
     assert output_records.processed_record_count == 1
     assert (
-        "transmogrifier.sources.marc",
+        "transmogrifier.sources.xml.marc",
         logging.ERROR,
         "Record ID 990027185640106761 is missing MARC 008 field",
     ) in caplog.record_tuples

diff --git a/tests/test_oai_dc.py → tests/sources/xml/test_oai_dc.py b/tests/test_oai_dc.py → tests/sources/xml/test_oai_dc.py
@@ -1,5 +1,5 @@
 import transmogrifier.models as timdex
-from transmogrifier.sources.oaidc import OaiDc
+from transmogrifier.sources.xml.oaidc import OaiDc
 
 FIXTURES_PREFIX = "tests/fixtures/oai_dc"
 

diff --git a/tests/test_springshare.py → tests/sources/xml/test_springshare.py b/tests/test_springshare.py → tests/sources/xml/test_springshare.py
@@ -1,5 +1,5 @@
 import transmogrifier.models as timdex
-from transmogrifier.sources.springshare import SpringshareOaiDc
+from transmogrifier.sources.xml.springshare import SpringshareOaiDc
 
 SPRINGSHARE_FIXTURES_PREFIX = "tests/fixtures/oai_dc/springshare"
 

diff --git a/tests/test_whoas.py → tests/sources/xml/test_whoas.py b/tests/test_whoas.py → tests/sources/xml/test_whoas.py
@@ -1,4 +1,4 @@
-from transmogrifier.sources.whoas import Whoas
+from transmogrifier.sources.xml.whoas import Whoas
 
 
 def test_valid_content_types_with_all_invalid():

diff --git a/tests/test_zenodo.py → tests/sources/xml/test_zenodo.py b/tests/test_zenodo.py → tests/sources/xml/test_zenodo.py
@@ -1,4 +1,4 @@
-from transmogrifier.sources.zenodo import Zenodo
+from transmogrifier.sources.xml.zenodo import Zenodo
 
 
 def test_zenodo_create_source_record_id_generates_correct_id():

diff --git a/transmogrifier/config.py b/transmogrifier/config.py
@@ -81,42 +81,42 @@
             "https://mit.primo.exlibrisgroup.com/discovery/fulldisplay?"
             "vid=01MIT_INST:MIT&docid=alma"
         ),
-        "transform-class": "transmogrifier.sources.marc.Marc",
+        "transform-class": "transmogrifier.sources.xml.marc.Marc",
     },
     "aspace": {
         "name": "MIT ArchivesSpace",
         "base-url": "https://archivesspace.mit.edu/",
-        "transform-class": "transmogrifier.sources.ead.Ead",
+        "transform-class": "transmogrifier.sources.xml.ead.Ead",
     },
     "dspace": {
         "name": "DSpace@MIT",
         "base-url": "https://dspace.mit.edu/handle/",
-        "transform-class": "transmogrifier.sources.dspace_mets.DspaceMets",
+        "transform-class": "transmogrifier.sources.xml.dspace_mets.DspaceMets",
     },
     "jpal": {
         "name": "Abdul Latif Jameel Poverty Action Lab Dataverse",
         "base-url": "https://dataverse.harvard.edu/dataset.xhtml?persistentId=",
-        "transform-class": "transmogrifier.sources.datacite.Datacite",
+        "transform-class": "transmogrifier.sources.xml.datacite.Datacite",
     },
     "libguides": {
         "name": "LibGuides",
         "base-url": "https://libguides.mit.edu/",
-        "transform-class": "transmogrifier.sources.springshare.SpringshareOaiDc",
+        "transform-class": "transmogrifier.sources.xml.springshare.SpringshareOaiDc",
     },
     "researchdatabases": {
         "name": "Research Databases",
         "base-url": "https://libguides.mit.edu/",
-        "transform-class": "transmogrifier.sources.springshare.SpringshareOaiDc",
+        "transform-class": "transmogrifier.sources.xml.springshare.SpringshareOaiDc",
     },
     "whoas": {
         "name": "Woods Hole Open Access Server",
         "base-url": "https://darchive.mblwhoilibrary.org/handle/",
-        "transform-class": "transmogrifier.sources.whoas.Whoas",
+        "transform-class": "transmogrifier.sources.xml.whoas.Whoas",
     },
     "zenodo": {
         "name": "Zenodo",
         "base-url": "https://zenodo.org/record/",
-        "transform-class": "transmogrifier.sources.zenodo.Zenodo",
+        "transform-class": "transmogrifier.sources.xml.zenodo.Zenodo",
     },
 }
 

diff --git a/transmogrifier/sources/json/__init__.py b/transmogrifier/sources/json/__init__.py
diff --git a/transmogrifier/sources/xml/__init__.py b/transmogrifier/sources/xml/__init__.py
diff --git a/transmogrifier/sources/datacite.py → transmogrifier/sources/xml/datacite.py b/transmogrifier/sources/datacite.py → transmogrifier/sources/xml/datacite.py
diff --git a/transmogrifier/sources/dspace_dim.py → transmogrifier/sources/xml/dspace_dim.py b/transmogrifier/sources/dspace_dim.py → transmogrifier/sources/xml/dspace_dim.py
diff --git a/transmogrifier/sources/dspace_mets.py → transmogrifier/sources/xml/dspace_mets.py b/transmogrifier/sources/dspace_mets.py → transmogrifier/sources/xml/dspace_mets.py
diff --git a/transmogrifier/sources/ead.py → transmogrifier/sources/xml/ead.py b/transmogrifier/sources/ead.py → transmogrifier/sources/xml/ead.py
diff --git a/transmogrifier/sources/marc.py → transmogrifier/sources/xml/marc.py b/transmogrifier/sources/marc.py → transmogrifier/sources/xml/marc.py
diff --git a/transmogrifier/sources/oaidc.py → transmogrifier/sources/xml/oaidc.py b/transmogrifier/sources/oaidc.py → transmogrifier/sources/xml/oaidc.py
diff --git a/transmogrifier/sources/springshare.py → transmogrifier/sources/xml/springshare.py b/transmogrifier/sources/springshare.py → transmogrifier/sources/xml/springshare.py
@@ -7,7 +7,7 @@
 
 import transmogrifier.models as timdex
 from transmogrifier.helpers import validate_date
-from transmogrifier.sources.oaidc import OaiDc
+from transmogrifier.sources.xml.oaidc import OaiDc
 
 logger = logging.getLogger(__name__)
 

diff --git a/transmogrifier/sources/whoas.py → transmogrifier/sources/xml/whoas.py b/transmogrifier/sources/whoas.py → transmogrifier/sources/xml/whoas.py
@@ -1,6 +1,6 @@
 from bs4 import Tag
 
-from transmogrifier.sources.dspace_dim import DspaceDim
+from transmogrifier.sources.xml.dspace_dim import DspaceDim
 
 INVALID_CONTENT_TYPES = [
     "article",

diff --git a/transmogrifier/sources/zenodo.py → transmogrifier/sources/xml/zenodo.py b/transmogrifier/sources/zenodo.py → transmogrifier/sources/xml/zenodo.py
@@ -2,7 +2,7 @@
 
 from bs4 import Tag
 
-from transmogrifier.sources.datacite import Datacite
+from transmogrifier.sources.xml.datacite import Datacite
 
 VALID_CONTENT_TYPES = [
     "dataset",