Merge pull request #40 from hydroshare/optional-value

hydroshare.org allows empty value
hydroshare · Mar 5, 2023 · 06974fc · 06974fc
2 parents ad48949 + 0439b56
commit 06974fc
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ site/
 htmlcov/
 hsmodels.egg-info
 .coverage
+tests/__pycache__/
diff --git a/hsmodels/schemas/rdf/fields.py b/hsmodels/schemas/rdf/fields.py
@@ -67,7 +67,7 @@ class IdentifierInRDF(RDFBaseModel):
 
 
 class ExtendedMetadataInRDF(RDFBaseModel):
-    value: str = Field(rdf_predicate=HSTERMS.value)
+    value: str = Field(rdf_predicate=HSTERMS.value, default="")
     key: str = Field(rdf_predicate=HSTERMS.key)
 
 

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='hsmodels',
-    version='0.5.3',
+    version='0.5.4',
     packages=find_packages(include=['hsmodels', 'hsmodels.*', 'hsmodels.schemas.*', 'hsmodels.schemas.rdf.*'],
                            exclude=("tests",)),
     install_requires=[

diff --git a/tests/data/json/resource.json b/tests/data/json/resource.json
@@ -74,7 +74,8 @@
   ],
   "additional_metadata": {
     "key1": "value1",
-    "key2": "value2"
+    "key2": "value2",
+    "key_empty": ""
   },
   "rights": {
     "statement": "my statement",

diff --git a/tests/data/metadata/resourcemetadata.xml b/tests/data/metadata/resourcemetadata.xml
@@ -70,6 +70,12 @@
         <hsterms:value>value2</hsterms:value>
       </rdf:Description>
     </hsterms:extendedMetadata>
+    <hsterms:extendedMetadata>
+      <rdf:Description>
+        <hsterms:key>key_empty</hsterms:key>
+        <hsterms:value></hsterms:value>
+      </rdf:Description>
+    </hsterms:extendedMetadata>
     <dc:coverage>
       <dcterms:box>
         <rdf:value>name=asdfsadf; northlimit=42.1505; eastlimit=-84.5739; southlimit=30.282; westlimit=-104.7887; units=Decimal degrees; projection=WGS 84 EPSG:4326</rdf:value>

diff --git a/tests/test_metadata.py b/tests/test_metadata.py
@@ -82,7 +82,7 @@ def test_resource_metadata(res_md):
 
     assert res_md.identifier == "http://www.hydroshare.org/resource/84805fd615a04d63b4eada65644a1e20"
 
-    assert len(res_md.additional_metadata) == 2
+    assert len(res_md.additional_metadata) == 3
     assert "key2" in res_md.additional_metadata
     assert res_md.additional_metadata["key2"] == "value2"
 

diff --git a/tests/test_metadata_json.py b/tests/test_metadata_json.py
@@ -33,11 +33,11 @@ def res_md():
 
 
 def test_resource_additional_metadata_dictionary(res_md):
-    assert res_md.additional_metadata == {"key1": "value1", "key2": "value2"}
+    assert res_md.additional_metadata == {"key1": "value1", "key2": "value2", "key_empty": ""}
     res_md_in = ResourceMetadataIn(**res_md.dict())
-    assert res_md_in.additional_metadata == {"key1": "value1", "key2": "value2"}
+    assert res_md_in.additional_metadata == {"key1": "value1", "key2": "value2", "key_empty": ""}
 
-    assert res_md_in.dict()["additional_metadata"] == {"key1": "value1", "key2": "value2"}
+    assert res_md_in.dict()["additional_metadata"] == {"key1": "value1", "key2": "value2", "key_empty": ""}
 
 
 metadata_json_input = [