commonmeta-py 0.52__py3-none-any.whl → 0.53__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.52"
+__version__ = "0.53"
 __author__ = "Martin Fenner"
 __license__ = "MIT"
 

commonmeta/readers/json_feed_reader.py

@@ -49,7 +49,7 @@ def read_json_feed_item(data: Optional[dict], **kwargs) -> Commonmeta:
     read_options = kwargs or {}
     url = None
     if py_.get(meta, "blog.status", None) == "active":
-         url = normalize_url(meta.get("url", None))
+        url = normalize_url(meta.get("url", None))
     elif py_.get(meta, "blog.status", None) == "archived":
         url = normalize_url(meta.get("archive_url", None))
     _id = normalize_doi(read_options.get("doi", None) or meta.get("doi", None)) or url
@@ -189,9 +189,14 @@ def get_references(references: list) -> list:
             )
 
         else:
-            return {
-                "id": reference.get("id", None),
-            }
+            id_ = normalize_url(reference.get("id", None))
+            if id_ is None:
+                return None
+            return compact(
+                {
+                    "id": id_,
+                }
+            )
 
     def number_reference(reference: dict, index: int) -> dict:
         """number reference"""

commonmeta/utils.py

@@ -183,12 +183,18 @@ def normalize_ids(ids: list, relation_type=None) -> list:
     return [format_id(i) for i in ids]
 
 
-def normalize_url(url: Optional[str], secure=False, lower=False) -> Optional[str]:
+def normalize_url(
+    url: Optional[str], secure=False, fragments=False, lower=False
+) -> Optional[str]:
     """Normalize URL"""
     if url is None or not isinstance(url, str):
         return None
+    url = url.strip()
     if url.endswith("/"):
         url = url.strip("/")
+    scheme = urlparse(url).scheme
+    if not scheme or scheme not in ["http", "https"]:
+        return None
     if secure is True and url.startswith(HTTP_SCHEME):
         url = url.replace(HTTP_SCHEME, HTTPS_SCHEME)
     if lower is True:
@@ -196,6 +202,50 @@ def normalize_url(url: Optional[str], secure=False, lower=False) -> Optional[str
     return url
 
 
+# def normalize_url(url: Optional[str], secure=False, fragments=False, lower=False) -> Optional[str]:
+#     """Normalize URL"""
+#     if url is None or not isinstance(url, str):
+#         return None
+#     try:
+#         f = furl(url.strip())
+#         f.path.normalize()
+
+#         # only allow http and https schemes
+#         if f.scheme not in ["http", "https"]:
+#             return None
+#         if secure and f.scheme == "http":
+#             f.set(scheme="https")
+
+#         # remove index.html
+#         if f.path.segments and f.path.segments[-1] in ["index.html"]:
+#             f.path.segments.pop(-1)
+
+#         # remove fragments
+#         if fragments:
+#             f.remove(fragment=True)
+
+#         # remove specific query parameters
+#         f.remove(
+#             [
+#                 "origin",
+#                 "ref",
+#                 "referrer",
+#                 "source",
+#                 "utm_content",
+#                 "utm_medium",
+#                 "utm_campaign",
+#                 "utm_source",
+#             ]
+#         )
+
+#         if lower:
+#             return f.url.lower().strip("/")
+#         return f.url.strip("/")
+#     except ValueError:
+#         print(f"Error normalizing url {url}")
+#         return None
+
+
 def normalize_cc_url(url: Optional[str]):
     """Normalize Creative Commons URL"""
     if url is None or not isinstance(url, str):

{commonmeta_py-0.52.dist-info → commonmeta_py-0.53.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: commonmeta-py
-Version: 0.52
+Version: 0.53
 Summary: Library for conversions to/from the Commonmeta scholarly metadata format
 Home-page: https://python.commonmeta.org
 License: MIT

{commonmeta_py-0.52.dist-info → commonmeta_py-0.53.dist-info}/RECORD

@@ -1,4 +1,4 @@
-commonmeta/__init__.py,sha256=5SThp-SYRwKmgCGeYz3GtgQmaX2Gv5BJFvt0v_bS-rk,1779
+commonmeta/__init__.py,sha256=CWAn2ZHrz-0zqFcWvaWudK9dRbHt1qX2DmYjRalD4_0,1779
 commonmeta/api_utils.py,sha256=-ZHGVZZhJqnjnsLtp4-PoeHYbDqL0cQme7W70BEjo4U,2677
 commonmeta/author_utils.py,sha256=zBIPTgP5n7Zx57xomJ2h7x0dvC0AV8gJ2gPoYeDy5Lo,8348
 commonmeta/base_utils.py,sha256=AsUElA5kT2fw_Osy7Uaj2F6MKeq9yB7d5f2V-h2lh7c,3750
@@ -19,7 +19,7 @@ commonmeta/readers/csl_reader.py,sha256=5V_sHSJwcAWJmhB8SYk199nB96BWYX1Sq9vkQ3iE
 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=jzv0rXzT8OCdPD_MShBXTnlwD-F9tpTX7OKZGn8smzs,7480
-commonmeta/readers/json_feed_reader.py,sha256=XDCtPDRglr5zKl2_tjrRHnvXrUghUXdAGxPtW8uaohw,13592
+commonmeta/readers/json_feed_reader.py,sha256=uJrFTbHEfjTcydnR9U0ce81IF0X94xti72DiQVcR_A8,13731
 commonmeta/readers/kbase_reader.py,sha256=ehKXQsJyPCtaq2FmBxNb2Jb5Nktpx8pNscpmEM6N0A4,6763
 commonmeta/readers/ris_reader.py,sha256=v6qOd-i2OcMTEFy5RGd3MlYthJcYSU6yzmZ5yHDzmII,3677
 commonmeta/readers/schema_org_reader.py,sha256=xyWzO2XAWlI2pYVl2EbVRsUmfiWXEwP64CHRBQNRN-M,16835
@@ -58,7 +58,7 @@ commonmeta/resources/styles/modern-language-association.csl,sha256=HI2iU4krze1aH
 commonmeta/resources/styles/vancouver.csl,sha256=lun3_i2oTilgsANk4LjFao2UDPQlGj_hgFgKAWC_DF8,12878
 commonmeta/schema_utils.py,sha256=gg3l1jd_lFtRkQlO1DYGMVbC10nEmVTN4AWacxC4AAE,915
 commonmeta/translators.py,sha256=RpGJtKNLjmz41VREZDY7KyyE2eXOi8j7m-da4jHmknI,1362
-commonmeta/utils.py,sha256=dblEYOmR0q6qZgsqnQOunm_Zj7YP4bugzwK1ps5SYq8,42583
+commonmeta/utils.py,sha256=MkcI2v9hr_tJuSHzopOHbPZXkmmvL3ooQvt2RUq5c_M,43992
 commonmeta/writers/__init__.py,sha256=47-snms6xBHkoEXKYV1DBtH1npAtlVtvY29Z4Zr45qI,45
 commonmeta/writers/bibtex_writer.py,sha256=s3hIJIgWvSG7TAriZMRQEAyuitw6ebwWSI1YcYFQ-do,4971
 commonmeta/writers/citation_writer.py,sha256=RjaNh9EALxq6gfODLRWVJxGxPArGd6ZiHUlkYnCT6MA,2355
@@ -69,8 +69,8 @@ commonmeta/writers/datacite_writer.py,sha256=G7Lr0aZ4sAEdbfXe3dG4Y6AyGUKA9UWr_ii
 commonmeta/writers/inveniordm_writer.py,sha256=UMFjUC_uvF8Bkm-Le5mR_nDolagqr9M6XTUH-x2sxYc,9994
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.52.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.52.dist-info/METADATA,sha256=GQXWs4cm1Wyf6yNgR8A9SJIWOjKrVkTnsTY04N7eVBk,8282
-commonmeta_py-0.52.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-commonmeta_py-0.52.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
-commonmeta_py-0.52.dist-info/RECORD,,
+commonmeta_py-0.53.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.53.dist-info/METADATA,sha256=6HFvBtd6ddlGtLNAGf8aB1FCDNbmS_TPy66qNbbYYjk,8282
+commonmeta_py-0.53.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+commonmeta_py-0.53.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
+commonmeta_py-0.53.dist-info/RECORD,,