Merge pull request #15 from JJ11teen/dev

Wrapper arg fix

Author: JJ11teen

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = cloud-mappings
-version = 1.2.0
+version = 1.2.1
 author = Lucas Sargent
 author_email = lucas.sargent@outlook.com
 description = MutableMapping interfaces for common cloud storage providers

src/cloudmappings/wrappers.py

@@ -1,14 +1,18 @@
+import inspect
+
 from .cloudstoragemapping import CloudMapping
 
 
 def _parse_cloud_mapping_kwargs(kwargs: dict):
-    cloud_mapping_kwargs = dict(
-        sync_initially=kwargs.pop("sync_initially", True),
-        read_blindly=kwargs.pop("read_blindly", False),
-        read_blindly_default=kwargs.pop("read_blindly_default", None),
-        ordered_dumps_funcs=kwargs.pop("ordered_dumps_funcs", None),
-        ordered_loads_funcs=kwargs.pop("ordered_loads_funcs", None),
-    )
+    # We inspect the CloudMapping.__init__ function to determine what kwargs
+    # it understands, and pull those out. The remaining kwargs are then passed
+    # to the storage provider.
+    cloud_mapping_kwargs = {
+        n: kwargs.pop(n) if n in kwargs else p.default
+        for n, p in inspect.signature(CloudMapping.__init__).parameters.items()
+        if n not in ["self", "storage_provider"]
+    }
+    print(cloud_mapping_kwargs)
     return cloud_mapping_kwargs, kwargs
 
 

tests/tests/5_wrappers.py

@@ -13,6 +13,8 @@ def test_azure_blob_mapping(self, azure_blob_storage_account_url, test_container
             container_name=test_container_name,
             sync_initially=False,
             read_blindly=True,
+            read_blindly_error=False,
+            read_blindly_default=None,
         )
         assert len(cm.etags) == 0
         assert cm.read_blindly == True
@@ -32,6 +34,8 @@ def test_azure_table_mapping(self, azure_table_storage_connection_string, test_c
             table_name=test_container_name,
             sync_initially=False,
             read_blindly=True,
+            read_blindly_error=False,
+            read_blindly_default=None,
         )
         assert len(cm.etags) == 0
         assert cm.read_blindly == True
@@ -51,6 +55,8 @@ def test_gcp_storage_mapping(self, gcp_storage_project, test_container_name):
             bucket_name=test_container_name,
             sync_initially=False,
             read_blindly=True,
+            read_blindly_error=False,
+            read_blindly_default=None,
         )
         assert len(cm.etags) == 0
         assert cm.read_blindly == True
@@ -69,6 +75,8 @@ def test_aws_s3_mapping(self, test_container_name):
             bucket_name=test_container_name,
             sync_initially=False,
             read_blindly=True,
+            read_blindly_error=False,
+            read_blindly_default=None,
         )
         assert len(cm.etags) == 0
         assert cm.read_blindly == True