protobin 0.0.3__tar.gz → 0.0.5__tar.gz

{protobin-0.0.3 → protobin-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: protobin
-Version: 0.0.3
+Version: 0.0.5
 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.3 → protobin-0.0.5}/protobin/fields.py

@@ -75,8 +75,7 @@ class FieldBase:
     def split(self, binary):
         if self.bytes:
             return binary[:self.bytes], binary[self.bytes:]
-        self.bytes = binary[0]
-        return binary[1:self.bytes + 1], binary[self.bytes + 1:]
+        return binary[1:binary[0] + 1], binary[binary[0] + 1:]
 
     def to_dict(self):
         return {
@@ -134,11 +133,18 @@ class FieldBits(FieldBase):
         self.length = js.get('length', 0)
         self.bytes = math.ceil(self.length / 8)
 
+    def decode(self, binary):
+        self.ensure_length(binary)
+        a, b, length = self.split(binary)
+        val = self.from_binary_bits(a, length)
+        return val, b
+
     def split(self, binary):
-        if not self.length:
-            self.length = binary[0]
-            self.bytes = math.ceil(self.length / 8)
-        return binary[1:self.bytes + 1], binary[self.bytes + 1:]
+        if self.length:
+            return binary[:self.bytes], binary[self.bytes:], self.length
+        length = binary[0]
+        bts = math.ceil(length / 8)
+        return binary[1:bts + 1], binary[bts + 1:], length
 
     def to_binary(self, val: List[bool]):
         if len(val) == 0:
@@ -150,18 +156,19 @@ class FieldBits(FieldBase):
             bits = ''
         for b in val:
             bits += '1' if b else '0'
-        length = int(len(bits) / 8)
-        binary += len(val).to_bytes(1, 'big', signed=False)
-        binary += int(bits, 2).to_bytes(length, 'big', signed=False)
+        bts = int(len(bits) / 8)
+        if not self.length:
+            binary += len(val).to_bytes(1, 'big', signed=False)
+        binary += int(bits, 2).to_bytes(bts, 'big', signed=False)
         return binary
 
-    def from_binary(self, binary):
+    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[-self.length:]
+        val = val[-length:]
         return val
 
 
@@ -274,18 +281,18 @@ class FieldFloat(FieldBase):
 
     def __init__(self, js):
         super().__init__(js)
-        self.decimales = js['decimales']
+        self.decimals = js['decimals']
 
     def from_binary(self, binary):
         val = int.from_bytes(binary[:self.bytes], 'big', signed=True)
-        return val / (10 ** self.decimales)
+        return val / (10 ** self.decimals)
 
     def to_binary(self, val):
-        return int(round(val * (10 ** self.decimales))).to_bytes(self.bytes, 'big', signed=True)
+        return int(round(val * (10 ** self.decimals))).to_bytes(self.bytes, 'big', signed=True)
 
     def to_dict(self):
         d = super().to_dict()
-        d['decimales'] = self.decimales
+        d['decimals'] = self.decimals
         return d
 
 
@@ -313,10 +320,7 @@ class FieldString(FieldBase):
         return len(utf).to_bytes(1, 'big') + utf
 
     def from_binary(self, binary):
-        if self.bytes == 0:
-            self.bytes = int.from_bytes(binary[:1], 'big', signed=False)
-            binary = binary[1:]
-        return binary[:self.bytes].decode('utf')
+        return binary.decode('utf')
 
 
 class FieldTime(FieldBase):

{protobin-0.0.3 → protobin-0.0.5}/pyproject.toml

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

{protobin-0.0.3 → protobin-0.0.5}/tests/demo.json

@@ -7,7 +7,7 @@
         {"keys": ["activo", "reintegro"], "bytes": 1, "type": "flags"},
         {"keys": ["lunes", "martes", "miercoles", "jueves", "viernes", "sabado", "domingo", "feriado"], "bytes": 1, "type": "flags"},
         {"key": "ruta", "bytes": 2, "type": "unsigned"},
-        {"key": "tarifa", "bytes": 2, "type": "float", "decimales": 2},
+        {"key": "tarifa", "bytes": 2, "type": "float", "decimals": 2},
         {"key": "timestamp", "bytes": 6, "type": "datetime"}
     ],
     "command": [
@@ -45,8 +45,8 @@
     "geocerca": [
         {"key": "id", "bytes": 2, "type": "unsigned"},
         {"key": "orden", "bytes": 1, "type": "unsigned"},
-        {"key": "longitud", "bytes": 4, "type": "float", "decimales": 6},
-        {"key": "latitud", "bytes": 4, "type": "float", "decimales": 6},
+        {"key": "longitud", "bytes": 4, "type": "float", "decimals": 6},
+        {"key": "latitud", "bytes": 4, "type": "float", "decimals": 6},
         {"key": "radio", "bytes": 2, "type": "unsigned"},
         {"key": "ruta", "bytes": 1, "type": "unsigned"},
         {"keys": ["lado", "control", "datear", "activo"], "bytes": 1, "type": "flags"},
@@ -146,8 +146,8 @@
     "busstop": [
         {"key": "id", "bytes": 2, "type": "unsigned"},
         {"key": "orden", "bytes": 1, "type": "unsigned"},
-        {"key": "longitud", "bytes": 4, "type": "float", "decimales": 6},
-        {"key": "latitud", "bytes": 4, "type": "float", "decimales": 6},
+        {"key": "longitud", "bytes": 4, "type": "float", "decimals": 6},
+        {"key": "latitud", "bytes": 4, "type": "float", "decimals": 6},
         {"key": "radio", "bytes": 2, "type": "unsigned"},
         {"key": "ruta", "bytes": 1, "type": "unsigned"},
         {"keys": ["liquidar", "lado", "terminal", "activo"], "bytes": 1, "type": "flags"},
@@ -167,8 +167,8 @@
     "report": [
         {"key": "positions", "bytes": 19, "type": "array", "array": [
             {"key": "time", "bytes": 6, "type": "datetime"},
-            {"key": "lng", "bytes": 4, "type": "float", "decimales": 6},
-            {"key": "lat", "bytes": 4, "type": "float", "decimales": 6},
+            {"key": "lng", "bytes": 4, "type": "float", "decimals": 6},
+            {"key": "lat", "bytes": 4, "type": "float", "decimals": 6},
             {"key": "speed", "bytes": 1, "type": "unsigned"},
             {"key": "mark", "bytes": 2, "type": "unsigned"},
             {"key": "busstop", "bytes": 2, "type": "unsigned"}

{protobin-0.0.3 → protobin-0.0.5}/tests/tests.py

@@ -99,7 +99,7 @@ class FormatTest(unittest.TestCase):
             'date': [{'key': 'test', 'bytes': 3, 'type': 'date'}],
             'datetime': [{'key': 'test', 'bytes': 6, 'type': 'datetime'}],
             'flags': [{'keys': ['f1', 'f2', 'f3', 'f4'], 'bytes': 1, 'type': 'flags'}],
-            'float': [{'key': 'test', 'bytes': 4, 'decimales': 6, 'type': 'float'}],
+            'float': [{'key': 'test', 'bytes': 4, 'decimals': 6, 'type': 'float'}],
             'signed': [{'key': 'test', 'bytes': 2, 'type': 'signed'}],
             'string': [{'key': 'test', 'bytes': 0, 'type': 'string'}],
             'time': [{'key': 'test', 'bytes': 1, 'type': 'time'}],
@@ -116,12 +116,13 @@ class BasicTest(unittest.TestCase):
                 {'key': 'test', 'bytes': 0, 'type': 'string'}
             ]}],
             'bits': [{'key': 'test', 'type': 'bits'}],
+            'bits_fixed': [{'key': 'test', 'type': 'bits', 'length': 7}],
             'bool': [{'key': 'test', 'bytes': 1, 'type': 'bool'}],
             'char': [{'key': 'test', 'bytes': 1, 'type': 'char'}],
             'date': [{'key': 'test', 'bytes': 1, 'type': 'date'}],
             'datetime': [{'key': 'test', 'bytes': 1, 'type': 'datetime'}],
             'flags': [{'keys': ['f1', 'f2', 'f3', 'f4'], 'type': 'flags'}],
-            'float': [{'key': 'test', 'bytes': 4, 'decimales': 6, 'type': 'float'}],
+            'float': [{'key': 'test', 'bytes': 4, 'decimals': 6, 'type': 'float'}],
             'signed': [{'key': 'test', 'bytes': 2, 'type': 'signed'}],
             'string': [{'key': 'test', 'bytes': 0, 'type': 'string'}],
             'time': [{'key': 'test', 'bytes': 2, 'type': 'time'}],
@@ -138,14 +139,30 @@ class BasicTest(unittest.TestCase):
         binary = self.protocol.encode(data, 'array')
         recv = self.protocol.decode(binary, 'array')
         self.assertEqual(data, recv)
+        data = {'test': [
+            {'test': 'texto2 de prueba'},
+            {'test': 'segunda prueba4'},
+            {'test': 'otra más3'},
+            {'test': 'y una última'}]
+        }
+        binary = self.protocol.encode(data, 'array')
+        recv = self.protocol.decode(binary, 'array')
+        self.assertEqual(data, recv)
 
     def test_bits(self):
         data = {'test': [True, False, True, False, False] * 3}
-        print('data', data)
         binary = self.protocol.encode(data, 'bits')
-        print('binary', binary)
         recv = self.protocol.decode(binary, 'bits')
-        print('recv', recv)
+        self.assertEqual(data, recv)
+        data = {'test': [True, False, True, False, False] * 5}
+        binary = self.protocol.encode(data, 'bits')
+        recv = self.protocol.decode(binary, 'bits')
+        self.assertEqual(data, recv)
+
+    def test_bits_fixed(self):
+        data = {'test': [True, False, True, False, False, True, True]}
+        binary = self.protocol.encode(data, 'bits_fixed')
+        recv = self.protocol.decode(binary, 'bits_fixed')
         self.assertEqual(data, recv)
 
     def test_bool(self):
@@ -207,6 +224,10 @@ class BasicTest(unittest.TestCase):
         binary = self.protocol.encode(data, 'string')
         recv = self.protocol.decode(binary, 'string')
         self.assertEqual(data, recv)
+        data = {'test': 'otro texto de prueba más largo'}
+        binary = self.protocol.encode(data, 'string')
+        recv = self.protocol.decode(binary, 'string')
+        self.assertEqual(data, recv)
 
     def test_timestamp(self):
         data = {'test': datetime.datetime(2024, 9, 13, 15, 23, 51, 265981)}
@@ -231,9 +252,11 @@ class AdvancedTest(unittest.TestCase):
             ]})
         data = {'id': 2, 'nombre': 'Voltaje', 'valor': -20}
         binary = protocol.encode(data, 'medida')
-        print('binary', binary)
         recv = protocol.decode(binary, 'medida')
-        print('recv', recv)
+        self.assertEqual(data, recv)
+        data = {'id': 4, 'nombre': 'Corriente', 'valor': 240}
+        binary = protocol.encode(data, 'medida')
+        recv = protocol.decode(binary, 'medida')
         self.assertEqual(data, recv)