Further updates based on discussion in PR #199

* Refactor get_source_link method
* Update dependencies to address new safety vulnerability
* Updates to address linting errors
* Add XMLTransformer.record_is_deleted unit test

tests/sources/test_xmltransformer.py

@@ -75,6 +75,13 @@ def test_xmltransformer_record_is_deleted_returns_true_if_deleted(caplog):
     assert XMLTransformer.record_is_deleted(next(source_records)) is True
 
 
+def test_xmltransformer_record_is_deleted_returns_false_if_not_deleted(caplog):
+    source_records = XMLTransformer.parse_source_file(
+        "tests/fixtures/record_title_field_blank.xml"
+    )
+    assert XMLTransformer.record_is_deleted(next(source_records)) is False
+
+
 def test_xmltransformer_get_required_fields_returns_expected_values(oai_pmh_records):
     transformer = XMLTransformer("cool-repo", oai_pmh_records)
     assert transformer.get_required_fields(next(oai_pmh_records)) == {

tests/test_config.py

@@ -54,4 +54,6 @@ def test_load_external_config_json():
 
 
 def test_load_external_config_xml():
-    assert type(load_external_config("config/loc-countries.xml", "xml")) == BeautifulSoup
+    assert isinstance(
+        load_external_config("config/loc-countries.xml", "xml"), BeautifulSoup
+    )

tests/test_helpers.py

@@ -250,7 +250,7 @@ def test_parse_date_from_string_success():
         "1930-12-31T12:34:56.000001",
         "1930-12-31T12:34:56.000001Z",
     ]:
-        assert type(parse_date_from_string(date)) == datetime
+        assert isinstance(parse_date_from_string(date), datetime)
 
 
 def test_parse_date_from_string_invalid_date_returns_none():

transmogrifier/sources/json/aardvark.py

@@ -55,10 +55,11 @@ def get_source_link(
                 - not used by default implementation, but could be useful for subclass
                     overrides
         """
-        if links := cls.get_links(source_record):
-            url_links = [link for link in links if link.kind == "Website"]
-            if len(url_links) == 1:
-                return url_links[0].url
+        if (links := cls.get_links(source_record)) and (
+            url_links := [link for link in links if link.kind == "Website"]
+        ):
+            return url_links[0].url
+
         message = "Could not locate a kind=Website link to pull the source link from."
         raise ValueError(message)
 

transmogrifier/sources/xml/whoas.py

@@ -46,6 +46,6 @@ def valid_content_types(cls, content_type_list: list[str]) -> bool:
         Args:
             content_type_list: A list of content_type values.
         """
-        if all(item.lower() in INVALID_CONTENT_TYPES for item in content_type_list):
-            return False
-        return True
+        return not all(
+            item.lower() in INVALID_CONTENT_TYPES for item in content_type_list
+        )

transmogrifier/sources/xmltransformer.py

@@ -161,9 +161,7 @@ def record_is_deleted(cls, source_record: Tag) -> bool:
         Args:
             source_record: A BeautifulSoup Tag representing a single XML record
         """
-        if source_record.find("header", status="deleted"):
-            return True
-        return False
+        return source_record.find("header", status="deleted") is not None
 
     def get_optional_fields(self, _source_record: Tag) -> dict | None:
         """