drb 2.4.2__tar.gz → 2.4.3__tar.gz

{drb-2.4.2/drb.egg-info → drb-2.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drb
-Version: 2.4.2
+Version: 2.4.3
 Summary: Data Request Broker
 Author: GAEL Systems
 Author-email: drb-python@gael.fr
@@ -65,8 +65,6 @@ You can also join the moderators team. Please contact me.
 
 Contribution process is based on gitlab best practice and processes the following schema:
 
-![](docs/modification_process.png)
-
 ### How to contribute
 Contributor shall work in its own fork of the project and provides its contributions via the merge request process.
 The merge request shall be approved and merged by a maintainers. So the step-by-step procedure to contribute is:

{drb-2.4.2 → drb-2.4.3}/README.md

@@ -36,8 +36,6 @@ You can also join the moderators team. Please contact me.
 
 Contribution process is based on gitlab best practice and processes the following schema:
 
-![](docs/modification_process.png)
-
 ### How to contribute
 Contributor shall work in its own fork of the project and provides its contributions via the merge request process.
 The merge request shall be approved and merged by a maintainers. So the step-by-step procedure to contribute is:

{drb-2.4.2 → drb-2.4.3}/drb/core/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2026-06-26T17:44:46+0000",
+ "date": "2026-06-26T23:35:37+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "d6abeea9ba11991cf33d5cc12fc33405c6032658",
- "version": "2.4.2"
+ "full-revisionid": "3fe10812b0582229d483dc9325051d2e70c16653",
+ "version": "2.4.3"
 }
 '''  # END VERSION_JSON
 

{drb-2.4.2 → drb-2.4.3}/drb/topics/resolver.py

@@ -283,6 +283,24 @@ class _DrbFactoryResolver(DrbFactory):
         pp = urlparse(url)
 
         if curl is None and path is None:
+            # Chained scheme "<base>+<forced>://": resolve the base URL
+            # normally -- walking the path through any container (e.g. a zip
+            # inside an S3 object) -- then apply each forced driver to the
+            # descended leaf. Without this, the forced token is crammed onto
+            # the whole-path base resource (e.g. an S3 object key that
+            # includes the in-archive path), which cannot be opened.
+            if pp.scheme and '+' in pp.scheme:
+                base, *tokens = pp.scheme.split('+')
+                if base == '' or any(t == '' for t in tokens):
+                    raise DrbFactoryException(
+                        f'Invalid scheme "{pp.scheme}": empty segment')
+                clean_url = base + url[len(pp.scheme):]
+                node = self.__create_from_url(clean_url)
+                for token in tokens:
+                    _, factory = _resolve_token(token)
+                    node = factory.create(node)
+                return node
+
             try:
                 return self.create(UrlNode(url))
             except (DrbFactoryException, DrbException,

{drb-2.4.2 → drb-2.4.3/drb.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drb
-Version: 2.4.2
+Version: 2.4.3
 Summary: Data Request Broker
 Author: GAEL Systems
 Author-email: drb-python@gael.fr
@@ -65,8 +65,6 @@ You can also join the moderators team. Please contact me.
 
 Contribution process is based on gitlab best practice and processes the following schema:
 
-![](docs/modification_process.png)
-
 ### How to contribute
 Contributor shall work in its own fork of the project and provides its contributions via the merge request process.
 The merge request shall be approved and merged by a maintainers. So the step-by-step procedure to contribute is:

{drb-2.4.2 → drb-2.4.3}/drb.egg-info/SOURCES.txt

@@ -101,6 +101,7 @@ tests/test_rdf_dao_multi_url.py
 tests/test_rdf_dao_scheme.py
 tests/test_rdf_dao_signatures.py
 tests/test_scheme_force_impl.py
+tests/test_scheme_force_url.py
 tests/test_signature_exact.py
 tests/test_signature_hierarchy.py
 tests/test_signatures.py

drb-2.4.3/tests/test_scheme_force_url.py

@@ -0,0 +1,81 @@
+import unittest
+from unittest.mock import patch, MagicMock
+
+import drb.topics.resolver as resolver_mod
+from drb.core.factory import DrbFactory
+from drb.core.node import DrbNode
+from drb.nodes.logical_node import DrbLogicalNode
+from drb.nodes.url_node import UrlNode
+from drb.exceptions.core import DrbFactoryException
+
+
+class _WrapFactory(DrbFactory):
+    """Wraps the received node and records the call order on a shared list."""
+    def __init__(self, tag, order):
+        self.tag = tag
+        self.order = order
+
+    def _create(self, node: DrbNode) -> DrbNode:
+        self.order.append(self.tag)
+        wrapped = DrbLogicalNode(self.tag)
+        wrapped.append_child(node)
+        return wrapped
+
+
+class TestForcedSchemeUrl(unittest.TestCase):
+    """``__create_from_url`` on a chained ``<base>+<forced>://`` scheme must
+    resolve the *base* URL (token stripped, so the existing path-walking can
+    descend any container) and then apply each forced driver to the resulting
+    leaf -- not cram the forced driver onto the whole-path base resource.
+    """
+
+    def _from_url(self, url, base_leaf, token_factories):
+        r = resolver_mod._DrbFactoryResolver()
+        with patch.object(r, 'create', return_value=base_leaf) as create, \
+             patch.object(resolver_mod, '_resolve_token',
+                          side_effect=lambda tok: (MagicMock(),
+                                                   token_factories[tok])):
+            result = r._DrbFactoryResolver__create_from_url(url)
+        return result, create
+
+    def test_base_url_resolved_with_token_stripped(self):
+        leaf = DrbLogicalNode('base-leaf')
+        order = []
+        result, create = self._from_url(
+            's3+xml://bucket/a.zip/inner', leaf,
+            {'xml': _WrapFactory('xml', order)})
+        # The base resolution must receive the clean s3:// URL.
+        self.assertEqual(1, create.call_count)
+        received = create.call_args[0][0]
+        self.assertIsInstance(received, UrlNode)
+        self.assertEqual('s3', received.path.scheme)
+        self.assertEqual('s3://bucket/a.zip/inner', received.path.name)
+
+    def test_forced_driver_applied_to_base_leaf(self):
+        leaf = DrbLogicalNode('base-leaf')
+        order = []
+        result, _ = self._from_url(
+            's3+xml://bucket/a.zip/inner', leaf,
+            {'xml': _WrapFactory('xml', order)})
+        self.assertEqual('xml', result.name)            # forced driver on top
+        self.assertEqual('base-leaf', result[0].name)   # wrapping the leaf
+        self.assertEqual(['xml'], order)
+
+    def test_multiple_tokens_applied_in_order(self):
+        leaf = DrbLogicalNode('base-leaf')
+        order = []
+        result, _ = self._from_url(
+            'https+odata+xml://host/x', leaf,
+            {'odata': _WrapFactory('odata', order),
+             'xml': _WrapFactory('xml', order)})
+        self.assertEqual(['odata', 'xml'], order)
+        self.assertEqual('xml', result.name)
+
+    def test_empty_scheme_segment_raises(self):
+        r = resolver_mod._DrbFactoryResolver()
+        with self.assertRaises(DrbFactoryException):
+            r._DrbFactoryResolver__create_from_url('s3++xml://host/x')
+
+
+if __name__ == '__main__':
+    unittest.main()