fixed test, renamed OsfmapJsonDeriver

Author: bodintsov

tests/trove/derive/test_osfmap_json.py

@@ -1,11 +1,11 @@
 import json
-from trove.derive.osfmap_json import OsfmapJsonDeriver
+from trove.derive.osfmap_json import OsfmapJsonFullDeriver
 from trove.derive.osfmap_json_mini import IndexcardJsonDeriver
 from ._base import BaseIndexcardDeriverTest
 
 
 class TestOsfmapJsonDeriver(BaseIndexcardDeriverTest):
-    deriver_class = OsfmapJsonDeriver
+    deriver_class = OsfmapJsonFullDeriver
     expected_outputs = {
         'blarg-item': {
             "@id": "blarg:my_item",

tests/trove/digestive_tract/test_derive.py

@@ -29,9 +29,9 @@ def setUpTestData(cls):
         )
 
     def test_derive(self):
-        (_derived,) = digestive_tract.derive(self.indexcard)
+        (_derived,) = digestive_tract.derive(self.indexcard, deriver_iris=[TROVE['derive/osfmap_json_full']])
         self.assertEqual(_derived.upriver_indexcard_id, self.indexcard.id)
-        self.assertEqual(_derived.deriver_identifier.sufficiently_unique_iri, get_sufficiently_unique_iri(TROVE['derive/osfmap_json']))
+        self.assertEqual(_derived.deriver_identifier.sufficiently_unique_iri, get_sufficiently_unique_iri(TROVE['derive/osfmap_json_full']))
         self.assertEqual(json.loads(_derived.derived_text), {
             '@id': 'blarg:this',
             'resourceType': [{'@id': 'blarg:Thing'}],
@@ -51,9 +51,9 @@ def test_derive_with_supplementary(self):
 blarg:this blarg:unlike blarg:nonthing .
 ''',
         )
-        (_derived,) = digestive_tract.derive(self.indexcard)
+        (_derived,) = digestive_tract.derive(self.indexcard, deriver_iris=[TROVE['derive/osfmap_json_full']])
         self.assertEqual(_derived.upriver_indexcard_id, self.indexcard.id)
-        self.assertEqual(_derived.deriver_identifier.sufficiently_unique_iri, get_sufficiently_unique_iri(TROVE['derive/osfmap_json']))
+        self.assertEqual(_derived.deriver_identifier.sufficiently_unique_iri, get_sufficiently_unique_iri(TROVE['derive/osfmap_json_full']))
         self.assertEqual(json.loads(_derived.derived_text), {
             '@id': 'blarg:this',
             'resourceType': [{'@id': 'blarg:Thing'}],

trove/derive/__init__.py

@@ -1,23 +1,30 @@
 from . import (
     sharev2_elastic,
     osfmap_json_mini,
-    oaidc_xml,
+    oaidc_xml, osfmap_json,
 )
 
 DERIVER_SET = (
     sharev2_elastic.ShareV2ElasticDeriver,
     osfmap_json_mini.IndexcardJsonDeriver,
+    osfmap_json.OsfmapJsonFullDeriver,
     oaidc_xml.OaiDcXmlDeriver,
     # TODO:
     # datacite_xml, (from osf.metadata)
     # datacite_json, (from osf.metadata)
     # property_label?
 )
 
+DEFAULT_DERIVER_SET = (
+    sharev2_elastic.ShareV2ElasticDeriver,
+    osfmap_json_mini.IndexcardJsonDeriver,
+    oaidc_xml.OaiDcXmlDeriver,
+)
+
 
 def get_deriver_classes(deriver_iri_filter=None):
     if deriver_iri_filter is None:
-        return DERIVER_SET
+        return DEFAULT_DERIVER_SET
     return [
         _deriver_class
         for _deriver_class in DERIVER_SET

trove/derive/osfmap_json.py

@@ -12,7 +12,7 @@
 from ._base import IndexcardDeriver
 
 
-class OsfmapJsonDeriver(IndexcardDeriver):
+class OsfmapJsonFullDeriver(IndexcardDeriver):
     # abstract method from IndexcardDeriver
     @staticmethod
     def deriver_iri() -> str:

trove/derive/osfmap_json_mini.py

@@ -1,5 +1,5 @@
 from trove.vocab import namespaces as ns
-from trove.derive.osfmap_json import OsfmapJsonDeriver
+from trove.derive.osfmap_json import OsfmapJsonFullDeriver
 from trove.vocab.namespaces import TROVE
 
 INCLUDED_PREDICATE_SET = frozenset({
@@ -36,7 +36,7 @@
 })
 
 
-class IndexcardJsonDeriver(OsfmapJsonDeriver):
+class IndexcardJsonDeriver(OsfmapJsonFullDeriver):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.convert_tripledict()