fix: update exception handling in TypeID tests and improve get_prefix_and_suffix logic to properly handle the case where the input string is empty

Author: akhundMurad

tests/test_spec.py

@@ -2,11 +2,12 @@
 from uuid6 import UUID
 
 from typeid import TypeID
+from typeid.errors import TypeIDException
 
 
 def test_invalid_spec(invalid_spec: list) -> None:
     for spec in invalid_spec:
-        with pytest.raises(Exception):
+        with pytest.raises(TypeIDException):
             TypeID.from_string(spec["typeid"])
 
 

typeid/typeid.py

@@ -81,14 +81,18 @@ def from_uuid(suffix: uuid6.UUID, prefix: Optional[str] = None) -> TypeID:
 
 def get_prefix_and_suffix(string: str) -> tuple:
     parts = string.rsplit("_", 1)
+    
+    # When there's no underscore in the string.
     if len(parts) == 1:
-        prefix = None
-        suffix = parts[0]
-    elif len(parts) == 2 and parts[0] == "":
+        if parts[0].strip() == "":
+            raise InvalidTypeIDStringException(f"Invalid TypeID: {string}")
+        return None, parts[0]
+    
+    # When there is an underscore, unpack prefix and suffix.
+    prefix, suffix = parts
+    if prefix.strip() == "" or suffix.strip() == "":
         raise InvalidTypeIDStringException(f"Invalid TypeID: {string}")
-    else:
-        prefix, suffix = parts
-
+    
     return prefix, suffix