Added more functions and tests

Author: poing

.flake8

@@ -1,3 +1,4 @@
 [flake8]
 per-file-ignores =
-    js2pysecrets/settings.py:E731
+    js2pysecrets/settings.py:E731
+    js2pysecrets/base.py:E203

gems/defaults3.py

@@ -44,6 +44,8 @@
 print(data)
 
 
-print(secrets.str2hex('hello world', 2))
-print(node.str2hex('hello world', 2))
+foo = secrets.str2hex('hello world', 2)
+bar = node.str2hex('hello world', 2)
 
+print(secrets.hex2str(bar))
+print(node.hex2str(foo))

js2pysecrets/base.py

@@ -90,10 +90,6 @@ def str2hex(string, bytes_per_char=None):
             f"Bytes per character must be an integer between 1 and "
             f"{defaults.max_bytes_per_char}, inclusive."
         )
-    #         raise Exception(
-    #             "Bytes per character must be an integer between 1 and "
-    #             "{defaults.max_bytes_per_char}, inclusive."
-    #         )
 
     hex_chars = 2 * bytes_per_char
     max_val = 16**hex_chars - 1
@@ -117,6 +113,43 @@ def str2hex(string, bytes_per_char=None):
     return out
 
 
+def hex2str(hex_string, bytes_per_char=None):
+    if not isinstance(hex_string, str):
+        raise ValueError("Input must be a hexadecimal string.")
+
+    defaults = settings.get_defaults()
+
+    # defaults = {"bytes_per_char": 2, "max_bytes_per_char": 4}
+    # Assuming these defaults
+
+    bytes_per_char = bytes_per_char or defaults.bytes_per_char
+
+    if (
+        not isinstance(bytes_per_char, int)
+        or bytes_per_char % 1 != 0
+        or bytes_per_char < 1
+        or bytes_per_char > defaults.max_bytes_per_char
+    ):
+        raise ValueError(
+            f"Bytes per character must be an integer between 1 and "
+            f"{defaults.max_bytes_per_char}, inclusive."
+        )
+
+    hex_chars = 2 * bytes_per_char
+
+    # Pad left if necessary
+    hex_string = hex_string.zfill(
+        len(hex_string) + (hex_chars - len(hex_string) % hex_chars) % hex_chars
+    )
+
+    out = ""
+    for i in range(0, len(hex_string), hex_chars):
+        char_code = int(hex_string[i : i + hex_chars], 16)
+        out = chr(char_code) + out
+
+    return out
+
+
 def getConfig():
     settings.update_defaults(hasCSPRNG=isSetRNG())
     return settings.get_config()

tests/test_basePrivate.py

@@ -34,11 +34,11 @@ def test_get_config():
 
 @pytest.fixture(
     params=[
+        faker.name(),
+        faker.password(),
+        faker.pystr(),
         faker.sentence(),
         faker.text(max_nb_chars=160),
-        faker.pystr(),
-        faker.password(),
-        faker.name(),
         # Add more options as needed
     ]
 )
@@ -56,16 +56,29 @@ def bytes_per_char(request):
     return request.param
 
 
-def test_str2hex(random_string, encoding, bytes_per_char):
+def test_str2hex(random_string, bytes_per_char):
     # Convert random_string to bytes using specified encoding
-    byte_string = random_string.encode(encoding)
+    # byte_string = random_string.encode(encoding)
 
     # Perform conversion using str2hex function
-    py_string = secrets.str2hex(str(byte_string), bytes_per_char)
-    js_string = secrets.str2hex(str(byte_string), bytes_per_char)
+    # string = str(byte_string)
+    py_hex = secrets.str2hex(str(random_string), bytes_per_char)
+    js_hex = node.str2hex(str(random_string), bytes_per_char)
 
     # Perform your assertions on hex_representation
-    assert py_string == js_string
+    assert py_hex == js_hex
+
+
+def test_str2hex_utf8():
+    # Use the string from the JavaScript tests
+    key = "¥ · £ · € · $ · ¢ · ₡ · ₢ · ₣ · ₤ · ₥ · ₦ · ₧ · ₨ · ₩ · ₪ · ₫ · ₭ · ₮ · ₯ · ₹"
+
+    # Perform conversion using str2hex function
+    py_hex = secrets.str2hex(key)
+    js_hex = node.str2hex(key)
+
+    # Perform your assertions on hex_representation
+    assert py_hex == js_hex
 
 
 def test_str2hex_input():
@@ -85,3 +98,49 @@ def test_str2hex_bytes():
         assert len(caught_warnings) == 1
         assert issubclass(caught_warnings[0].category, Warning)
         assert match in str(caught_warnings[0].message)
+
+
+def test_hex2str(random_string, bytes_per_char):
+    # Convert random_string to bytes using specified encoding
+    # byte_string = random_string.encode(encoding)
+
+    # Perform conversion using str2hex function
+    py_hex = secrets.str2hex(str(random_string), bytes_per_char)
+    js_hex = node.str2hex(str(random_string), bytes_per_char)
+
+    # Perform your assertions on hex_representation
+    assert py_hex == js_hex
+
+    # Perform conversion using hex2str function py~py/js~js
+    py_value = secrets.hex2str(py_hex, bytes_per_char)
+    js_value = node.hex2str(js_hex, bytes_per_char)
+    assert py_value == str(random_string)
+    assert js_value == str(random_string)
+    assert py_value == js_value
+
+    # Perform conversion using hex2str function py~js/js~py
+    py_string = secrets.hex2str(js_hex, bytes_per_char)
+    js_string = node.hex2str(py_hex, bytes_per_char)
+    assert py_string == str(random_string)
+    assert js_string == str(random_string)
+    assert py_string == js_string
+
+
+def test_hex2str_input():
+    match = "Input must be a hexadecimal string."
+    with pytest.raises(ValueError, match=match):
+        secrets.hex2str(1234)
+        assert len(caught_warnings) == 1
+        assert issubclass(caught_warnings[0].category, Warning)
+        assert match in str(caught_warnings[0].message)
+
+
+def test_hex2str_bytes():
+    match = "must be an integer between 1 and 6"
+    with pytest.raises(ValueError, match=match):
+        string = secrets.str2hex("foobar")
+        secrets.hex2str(string, 7)
+        # Check if any warnings were raised
+        assert len(caught_warnings) == 1
+        assert issubclass(caught_warnings[0].category, Warning)
+        assert match in str(caught_warnings[0].message)