commonmeta-py 0.127__tar.gz → 0.128__tar.gz

{commonmeta_py-0.127 → commonmeta_py-0.128}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonmeta-py
-Version: 0.127
+Version: 0.128
 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.127 → commonmeta_py-0.128}/commonmeta/__init__.py

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

{commonmeta_py-0.127 → commonmeta_py-0.128}/commonmeta/utils.py

@@ -1325,24 +1325,19 @@ def subjects_as_string(subjects):
     return ", ".join(keywords)
 
 
-def string_to_slug(text):
-    """makes a string lowercase and removes non-alphanumeric characters"""
-    # Remove FOS (Fields of Science) prefix
+def string_to_slug(text: str) -> str:
+    """Makes a string lowercase and removes non-alphanumeric characters"""
+
+    # Remove optional FOS (Fields of Science) prefix
     text = text.removeprefix("FOS: ")
-    # Lookup FOS name
-    slug = FOS_TO_STRING_MAPPINGS.get(text, None)
-    if slug is not None:
-        return slug.lower()
-
-    # Replace spaces with hyphens
-    slug = re.sub(r"\s+", "-", text.lower())
-    # Remove special characters
-    slug = re.sub(r"[^a-z0-9-]", "", slug)
-    # Remove multiple consecutive hyphens
-    slug = re.sub(r"-+", "-", slug)
-    # Remove leading and trailing hyphens
-    slug = slug.strip("-")
-    return slug
+
+    # Convert to lowercase and keep only letters and numbers
+    result = ""
+    for char in text:
+        if char.isalnum():
+            result += char.lower()
+
+    return result
 
 
 # def reverse():

{commonmeta_py-0.127 → commonmeta_py-0.128}/commonmeta/writers/inveniordm_writer.py

@@ -7,7 +7,6 @@ from typing import Dict, Optional
 import orjson as json
 import pydash as py_
 import requests
-from urllib3._collections import HTTPHeaderDict
 
 from ..base_utils import compact, parse_attributes, presence, wrap
 from ..constants import (
@@ -760,17 +759,13 @@ def update_legacy_record(record, legacy_key: str, field: str = None) -> dict:
         return record
 
 
-def search_by_slug(slug: str, type_value: str, host: str, token: str) -> Optional[str]:
+def search_by_slug(slug: str, type: str, host: str, token: str) -> Optional[str]:
     """Search for a community by slug in InvenioRDM"""
     headers = {
         "Authorization": f"Bearer {token}",
         "Content-Type": "application/json",
     }
-    params = HTTPHeaderDict()
-    params.add("q", f"slug:{slug}")
-    params.add("type", type_value)
-    params.add("type", "subject")
-    params.add("size", 1)
+    params = [("q", f"slug:{slug}"), ("type", type), ("type", "subject"), ("size", 1)]
     try:
         response = requests.get(
             f"https://{host}/api/communities", headers=headers, params=params

{commonmeta_py-0.127 → commonmeta_py-0.128}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "commonmeta-py"
-version = "0.127"
+version = "0.128"
 description = "Library for conversions to/from the Commonmeta scholarly metadata format"
 authors = [{ name = "Martin Fenner", email = "martin@front-matter.io" }]
 requires-python = ">=3.9,<4.0"