soia-client 1.1.10__tar.gz → 1.1.12__tar.gz

{soia_client-1.1.10/soia_client.egg-info → soia_client-1.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soia-client
-Version: 1.1.10
+Version: 1.1.12
 Author-email: Tyler Fibonacci <gepheum@gmail.com>
 License: MIT License
         

{soia_client-1.1.10 → soia_client-1.1.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "soia-client"
-version = "1.1.10"
+version = "1.1.12"
 description = ""
 readme = "README.md"
 authors = [{ name = "Tyler Fibonacci", email = "gepheum@gmail.com" }]

{soia_client-1.1.10 → soia_client-1.1.12}/soia/_impl/primitives.py

@@ -66,7 +66,7 @@ class _BoolAdapter(AbstractPrimitiveAdapter[bool]):
     def from_json_expr(
         self, json_expr: ExprLike, keep_unrecognized_expr: ExprLike
     ) -> Expr:
-        return Expr.join("(True if ", json_expr, " else False)")
+        return Expr.join("(", json_expr, " not in (0, '0'))")
 
     @staticmethod
     def encode(
@@ -407,6 +407,13 @@ class _StringAdapter(AbstractPrimitiveAdapter[str]):
 STRING_ADAPTER: Final[TypeAdapter] = _StringAdapter()
 
 
+def _bytes_from_json(json: str) -> bytes:
+    if json.startswith("hex:"):
+        return bytes.fromhex(json[4:])
+    else:
+        return base64.b64decode(json)
+
+
 class _BytesAdapter(AbstractPrimitiveAdapter[bytes]):
     def default_expr(self) -> ExprLike:
         return 'b""'
@@ -422,18 +429,25 @@ class _BytesAdapter(AbstractPrimitiveAdapter[bytes]):
         in_expr: ExprLike,
         readable: bool,
     ) -> Expr:
-        return Expr.join(
-            Expr.local("b64encode", base64.b64encode),
-            "(",
-            in_expr,
-            ").decode('utf-8')",
-        )
+        if readable:
+            return Expr.join(
+                "('hex:' + ",
+                in_expr,
+                ".hex())",
+            )
+        else:
+            return Expr.join(
+                Expr.local("b64encode", base64.b64encode),
+                "(",
+                in_expr,
+                ").decode('utf-8')",
+            )
 
     def from_json_expr(
         self, json_expr: ExprLike, keep_unrecognized_expr: ExprLike
     ) -> Expr:
         return Expr.join(
-            Expr.local("b64decode", base64.b64decode), "(", json_expr, ' or "")'
+            Expr.local("bytes_from_json", _bytes_from_json), "(", json_expr, ' or "")'
         )
 
     @staticmethod

{soia_client-1.1.10 → soia_client-1.1.12/soia_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soia-client
-Version: 1.1.10
+Version: 1.1.12
 Author-email: Tyler Fibonacci <gepheum@gmail.com>
 License: MIT License
         

{soia_client-1.1.10 → soia_client-1.1.12}/tests/test_serializers.py

@@ -13,6 +13,9 @@ class SerializersTestCase(unittest.TestCase):
         self.assertEqual(primitive_serializer("bool").from_json_code("true"), True)
         self.assertEqual(primitive_serializer("bool").from_json_code("false"), False)
         self.assertEqual(primitive_serializer("bool").from_json_code("0"), False)
+        self.assertEqual(primitive_serializer("bool").from_json_code('"0"'), False)
+        self.assertEqual(primitive_serializer("bool").from_json_code("1"), True)
+        self.assertEqual(primitive_serializer("bool").from_json_code('"1"'), True)
 
         self.assertEqual(primitive_serializer("int32").to_json_code(7), "7")
         self.assertEqual(