commonmeta-py 0.90__py3-none-any.whl → 0.91__py3-none-any.whl

commonmeta/__init__.py

@@ -10,7 +10,7 @@ commonmeta-py is a Python library to convert scholarly metadata
 """
 
 __title__ = "commonmeta-py"
-__version__ = "0.90"
+__version__ = "0.91"
 __author__ = "Martin Fenner"
 __license__ = "MIT"
 

commonmeta/readers/json_feed_reader.py

@@ -13,6 +13,7 @@ from ..utils import (
     dict_to_spdx,
     name_to_fos,
     validate_ror,
+    validate_url,
     issn_as_url,
 )
 from ..author_utils import get_authors
@@ -230,6 +231,7 @@ def get_funding_references(meta: Optional[dict]) -> Optional[list]:
         elif len(urls) == 2 and validate_prefix(urls[0]) == "10.13039":
             if urls[0] == "https://doi.org/10.13039/100000001":
                 funder_name = "National Science Foundation"
+                funder_identifier = "https://ror.org/021nxhr62"
             else:
                 funder_name = None
             f = furl(urls[1])
@@ -242,8 +244,8 @@ def get_funding_references(meta: Optional[dict]) -> Optional[list]:
                 compact(
                     {
                         "funderName": funder_name,
-                        "funderIdentifier": urls[0],
-                        "funderIdentifierType": "Crossref Funder ID",
+                        "funderIdentifier": funder_identifier,
+                        "funderIdentifierType": "ROR",
                         "awardUri": urls[1],
                         "awardNumber": award_number,
                     }
@@ -286,9 +288,32 @@ def get_funding_references(meta: Optional[dict]) -> Optional[list]:
             if i.get("type", None) == "HasAward"
         ]
     )
+    def format_funding_reference(funding: dict) -> dict:
+        """format funding reference. Make sure award URI is either a DOI or URL"""
+
+        award_uri = funding.get("awardUri", None)
+        if validate_url(funding.get("awardUri", None)) not in ["DOI", "URL"]:
+            award_uri = None
+        funder_identifier = funding.get("funderIdentifier", None)
+        funder_identifier_type = funding.get("funderIdentifierType", None)
+        if not funder_identifier_type and validate_ror(
+            funding.get("funderIdentifier", None)
+        ):
+            funder_identifier_type = "ROR"
+
+        return compact(
+            {
+                "funderName": funding.get("funderName", None),
+                "funderIdentifier": funder_identifier,
+                "funderIdentifierType": funder_identifier_type,
+                "awardTitle": funding.get("awardTitle", None),
+                "awardNumber": funding.get("awardNumber", None),
+                "awardUri": award_uri,
+            }
+        )
     funding_references = py_.get(meta, "funding_references")
     if funding_references is not None:
-        awards += [compact(i) for i in funding_references]
+        awards += [format_funding_reference(i) for i in funding_references if i.get("funderName", None)]
     
     awards += wrap(py_.get(meta, "blog.funding"))
     return py_.uniq(awards)

{commonmeta_py-0.90.dist-info → commonmeta_py-0.91.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonmeta-py
-Version: 0.90
+Version: 0.91
 Summary: Library for conversions to/from the Commonmeta scholarly metadata format
 Project-URL: Homepage, https://python.commonmeta.org
 Project-URL: Repository, https://github.com/front-matter/commonmeta-py

{commonmeta_py-0.90.dist-info → commonmeta_py-0.91.dist-info}/RECORD

@@ -1,4 +1,4 @@
-commonmeta/__init__.py,sha256=ywUHwDbqP_6koJ1bVCBxdElkbuDqlucZ44AVpxYXBQU,1911
+commonmeta/__init__.py,sha256=Z2tINoXodJGwjrvj8fZzV3Wf7IVLPcAZHw6jNNE-oMo,1911
 commonmeta/api_utils.py,sha256=-ZHGVZZhJqnjnsLtp4-PoeHYbDqL0cQme7W70BEjo4U,2677
 commonmeta/author_utils.py,sha256=1oQQfxaq7aMQI3rLt8XMufksuBeC8Zht96aJ8vz09Ug,8459
 commonmeta/base_utils.py,sha256=AsUElA5kT2fw_Osy7Uaj2F6MKeq9yB7d5f2V-h2lh7c,3750
@@ -22,7 +22,7 @@ commonmeta/readers/csl_reader.py,sha256=ynqJeqK9TlHFsmgMREPmKGlcj6tVycpnqDN0N0Lj
 commonmeta/readers/datacite_reader.py,sha256=CdOtxhthrakBoQMsLTdPx6sUCmqtEWo5ICYE6ZsWDdo,12026
 commonmeta/readers/datacite_xml_reader.py,sha256=nhnO92fZihr1HZlbXjyem-HJXc9_DWLgJ2zeltuPMIg,13041
 commonmeta/readers/inveniordm_reader.py,sha256=F0syoLZ3amzkrEk8efb9WxwhMDY8QM8ctOH32E3fGqM,8358
-commonmeta/readers/json_feed_reader.py,sha256=1re1uI88y2VHZ3EsgnnrviLcLZJnqp-CIhZJPmvFZ2U,13275
+commonmeta/readers/json_feed_reader.py,sha256=E1IAXjuKGK3fExl6uRmzTpoZghEytO6JKC-2D3i-aq4,14409
 commonmeta/readers/kbase_reader.py,sha256=ehKXQsJyPCtaq2FmBxNb2Jb5Nktpx8pNscpmEM6N0A4,6763
 commonmeta/readers/ris_reader.py,sha256=v6qOd-i2OcMTEFy5RGd3MlYthJcYSU6yzmZ5yHDzmII,3677
 commonmeta/readers/schema_org_reader.py,sha256=78vYWCZqrYevZsSbx7oVVLm3mlNzi323WNW5E_PL9o0,17234
@@ -70,8 +70,8 @@ commonmeta/writers/datacite_writer.py,sha256=UpDp4Brg5xrmS5T3QYoNi6PPXKdRxAo254e
 commonmeta/writers/inveniordm_writer.py,sha256=-GsTcVMPlbbB9kSTmHP00ZJ1aHIbA21K0LkcuPWBMm8,11429
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.90.dist-info/METADATA,sha256=VHOpxlL0e5XQ9aybUWIeUSXlDmhM0GP7gu-FeKFBm7Y,7429
-commonmeta_py-0.90.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-commonmeta_py-0.90.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
-commonmeta_py-0.90.dist-info/licenses/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.90.dist-info/RECORD,,
+commonmeta_py-0.91.dist-info/METADATA,sha256=65-gfoa34ZG1A-WhWpN5-BJMeXCuJxdQigKFvJFFSI4,7429
+commonmeta_py-0.91.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+commonmeta_py-0.91.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
+commonmeta_py-0.91.dist-info/licenses/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.91.dist-info/RECORD,,