protobin 0.0.43__tar.gz → 0.0.46__tar.gz

{protobin-0.0.43 → protobin-0.0.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: protobin
-Version: 0.0.43
+Version: 0.0.46
 Summary: Python library for encode and decode data in protobin format
 Project-URL: Homepage, https://github.com/drmelectronic/protobin-python
 Project-URL: Bug Tracker, https://github.com/drmelectronic/protobin-python/issues

{protobin-0.0.43 → protobin-0.0.46}/protobin/fields.py

@@ -121,7 +121,11 @@ class ArrayField(FieldBase):
             data = {}
             for f in self.fields:
                 val, binary = f.decode(binary)
-                data[f.key] = val
+                if f.keys:
+                    for k, v in val.items():
+                        data[k] = v
+                else:
+                    data[f.key] = val
             lista.append(data)
         return lista, binary
 
@@ -155,11 +159,13 @@ class BitsField(FieldBase):
             return b'\x00'
         binary = b''
         if len(val) % 8:
-            bits = '0' * (8 - (len(val) % 8))
+            final = '0' * (8 - (len(val) % 8))
         else:
-            bits = ''
+            final = ''
+        bits = ''
         for b in val:
             bits += '1' if b else '0'
+        bits += final
         bts = int(len(bits) / 8)
         if not self.length:
             binary += len(val).to_bytes(1, 'big', signed=False)
@@ -169,10 +175,12 @@ class BitsField(FieldBase):
     def from_binary_bits(self, binary, length):
         numero = int.from_bytes(binary, 'big', signed=False)
         bits = bin(numero)[2:]
-        val = [False] * 8
-        for b in bits:
-            val.append(b == '1')
-        val = val[-length:]
+        max_length = (length // 8) * 8 + (8 if (length % 8) else 0)
+        if len(bits) < max_length:
+            bits = '0' * (max_length - len(bits)) + bits
+        val = []
+        for i in range(length):
+            val.append(bits[i] == '1')
         return val
 
 
@@ -214,7 +222,7 @@ class CharField(FieldBase):
 
     def to_binary(self, val):
         if val is None:
-            return bytes([0])
+            val = ''
         encoded = val[:self.bytes].encode('utf')
         if self.bytes == 1 and len(encoded) > 1:
             raise ValueError(f'{self} of one byte is possible to encode a utf-8 character')

{protobin-0.0.43 → protobin-0.0.46}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "protobin"
-version = "0.0.43"
+version = "0.0.46"
 authors = [
     { name="Daniel Robles", email="drm.electronic@gmail.com" },
 ]

{protobin-0.0.43 → protobin-0.0.46}/tests/tests.py

@@ -177,6 +177,26 @@ class BasicTest(unittest.TestCase):
         binary = self.protocol.encode(data, 'bits')
         h, recv = self.protocol.decode(binary)
         self.assertEqual(data, recv)
+        data = {'test': [True, False]}
+        binary = self.protocol.encode(data, 'bits')
+        h, recv = self.protocol.decode(binary)
+        self.assertEqual(data, recv)
+
+    def test_bits_false(self):
+        data = {'test': [False, False]}
+        binary = self.protocol.encode(data, 'bits')
+        h, recv = self.protocol.decode(binary)
+        self.assertEqual(data, recv)
+
+    def test_bits_false2(self):
+        data = {'test': [False, True]}
+        binary = self.protocol.encode(data, 'bits')
+        h, recv = self.protocol.decode(binary)
+        self.assertEqual(data, recv)
+        data = {'test': [False, True, False, False, False, False, False, False, False, False, False, False, False, False]}
+        binary = self.protocol.encode(data, 'bits')
+        h, recv = self.protocol.decode(binary)
+        self.assertEqual(data, recv)
 
     def test_bits_fixed(self):
         data = {'test': [True, False, True, False, False, True, True]}
@@ -202,12 +222,16 @@ class BasicTest(unittest.TestCase):
         h, recv = self.protocol.decode(binary)
         self.assertEqual(data, recv)
 
-    def test_char_utf(self):
-        data = {'test': 'ñ'}
+    def test_char_none(self):
+        data = {'test': None}
         binary = self.protocol.encode(data, 'char')
-        print('binary', binary)
         h, recv = self.protocol.decode(binary)
-        self.assertEqual(data, recv)
+        self.assertEqual({'test': ' '}, recv)
+
+    def test_char_utf(self):
+        data = {'test': 'ñ'}
+        with self.assertRaises(ValueError):
+            self.protocol.encode(data, 'char')
 
     def test_char2(self):
         data = {'test': 'FA', 'prueba': 'DO'}
@@ -851,3 +875,46 @@ report:
         self.assertEqual(binary, rasp)
         h, recv = client.decode(binary)
         print(recv)
+
+    def test_flag_array(self):
+        codec = {
+            "formats":{
+                "flag_array": {
+                    "header": "F",
+                    "fields": {
+                        "id": {"bytes": 2, "type": "unsigned"},
+                        "lado,control,datear,activo": {"type": "flags"}
+                    }
+                }
+            }
+        }
+        data = {'lado': False, 'activo': True, 'datear': True, 'control': True, 'id': 1}
+        client = Protocol(js=codec, server=None)
+        binary = client.encode(data, 'flag_array')
+        h, recv = client.decode(binary)
+        self.assertEqual(data, recv)
+        codec = {
+            "formats":{
+                "flag_array": {
+                    "header": "F",
+                    "fields": {
+                        "items": {
+                            "type": "array",
+                            "array": {
+                                "id": {"bytes": 2, "type": "unsigned"},
+                                "lado,control,datear,activo": {"type": "flags"}
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        data = {'items': [
+            {'lado': False, 'activo': True, 'datear': True, 'control': True, 'id': 1},
+            {'lado': False, 'activo': True, 'datear': False, 'control': True, 'id': 2},
+            {'lado': False, 'activo': True, 'datear': False, 'control': False, 'id': 3}
+            ]}
+        client = Protocol(js=codec, server=None)
+        binary = client.encode(data, 'flag_array')
+        h, recv = client.decode(binary)
+        self.assertEqual(data, recv)