protobin 0.0.3__tar.gz → 0.0.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: protobin
-Version: 0.0.3
+Version: 0.0.4
 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.4}/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
 
 
@@ -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.4}/pyproject.toml

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

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

@@ -116,6 +116,7 @@ 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'}],
@@ -148,6 +149,15 @@ class BasicTest(unittest.TestCase):
         print('recv', recv)
         self.assertEqual(data, recv)
 
+    def test_bits_fixed(self):
+        data = {'test': [True, False, True, False, False, True, True]}
+        print('data', data)
+        binary = self.protocol.encode(data, 'bits_fixed')
+        print('binary', binary)
+        recv = self.protocol.decode(binary, 'bits_fixed')
+        print('recv', recv)
+        self.assertEqual(data, recv)
+
     def test_bool(self):
         data = {'test': False}
         binary = self.protocol.encode(data, 'bool')
@@ -207,6 +217,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)}