clear-skies 1.16.8__py3-none-any.whl → 1.16.10__py3-none-any.whl

{clear_skies-1.16.8.dist-info → clear_skies-1.16.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clear-skies
-Version: 1.16.8
+Version: 1.16.10
 Summary: A framework for building backends in the cloud
 Home-page: https://github.com/cmancone/clearskies
 License: MIT

{clear_skies-1.16.8.dist-info → clear_skies-1.16.10.dist-info}/RECORD

@@ -129,19 +129,19 @@ clearskies/handlers/exceptions/authorization.py,sha256=14JuU5zLEf2sv82VNxsJt7dGS
 clearskies/handlers/exceptions/client_error.py,sha256=o1OGnjlXT5zZ1Vb2LTRPYIio0YAnXPpXDGuqSLQP9_Y,39
 clearskies/handlers/exceptions/input_error.py,sha256=kmEVv9LNIalLKD9GF-olsD39Z94abHGkB54NskOG6g4,136
 clearskies/handlers/exceptions/not_found.py,sha256=xThOXiMfyYBaI2bhfOhpVoZ_vdw1hU8A_HxHenPqHzo,96
-clearskies/handlers/get.py,sha256=iHwI4qCdxQpqHTUH7HGaFhl5fHaT5qGe7hi6OvRrBrU,6544
+clearskies/handlers/get.py,sha256=_5aPwwgSTWKIPk1E5C6fr1hq0WJz0yrNl4Dtnt4e4sk,6629
 clearskies/handlers/health_check.py,sha256=m6H3psUql-I7hZao3fsxjrZnCjFJZ1ROTF-41g8Syww,2078
 clearskies/handlers/input_processing.py,sha256=3CurzTyOsOqfmBZPWm5Sa5UjH7Bl7PkxP6obRieigGs,3250
 clearskies/handlers/list.py,sha256=bA1NG799Ru5QKoGzpsKZIjb5YwD5ZyJUv1rJL3uU-PA,22942
 clearskies/handlers/mygrations.py,sha256=4iKpJKooqgNtAURwMl_FgsXUt8OYOaG_TY1OV1llQxY,2759
 clearskies/handlers/request_method_routing.py,sha256=DgPEz3tgbaUkXHsOriPbIctfSf4Gm4NxfRdVulH91Kg,1636
-clearskies/handlers/restful_api.py,sha256=cD5zY-3XGhSMRlBercodxg7JHypCvfsK_ynCrbEblTU,8287
+clearskies/handlers/restful_api.py,sha256=-AJRf134VJUba1Wb7yGG4Y0Hvi5UJwmiDzLbglcxGg8,8624
 clearskies/handlers/routing.py,sha256=tHJHNbszas2txUZiKl0xi2kB2x3Sjx6H8lLouoAWp4Y,3078
 clearskies/handlers/schema_helper.py,sha256=62644USvFlZu_6tT7rb-k6t_5J3Q0uZsJwP5KREk_WM,4961
 clearskies/handlers/simple_routing.py,sha256=8T4eKLIurZO3ZdIPgi-0pypQp_X4BKkbet_Ymba5br4,9332
-clearskies/handlers/simple_routing_route.py,sha256=QyBwZoC74fFpNPgdUT5pexwBOnFv2aQq0vEVXDDUEWc,7312
+clearskies/handlers/simple_routing_route.py,sha256=0WPKrneXjbI98UOsDaZgf-OUvEd4D6gG-oIiMiiCp-k,7312
 clearskies/handlers/simple_search.py,sha256=19dOZyPXx_PMrlUCe-hoY8y3h9BNfAjAkVoxsjUl7gw,3965
-clearskies/handlers/update.py,sha256=cnWd2uOm2NgmLDc4Rvcujq9r9P6U2gH_vF-aaxPVEGQ,3376
+clearskies/handlers/update.py,sha256=sU91QLvtQL8qfLQZWHep6oAChxvZ6EIP-YQfEPNxtG0,3585
 clearskies/handlers/write.py,sha256=VduGtjnFMQOvo3l0t-tUP4PExPJ9JEpuziHsquF08rE,9344
 clearskies/input_outputs/__init__.py,sha256=mQWL-u41FRTrPGuHe8FhLmcHjAEaUxjFwUf7RgDcbAs,182
 clearskies/input_outputs/cli.py,sha256=AOCXpjjFM7F9PJiW_UOI8fTU0gswO0Lul5xSo7ujRPs,6203
@@ -183,7 +183,7 @@ clearskies/tests/simple_api/models/__init__.py,sha256=nUA0W6fgXw_Bxa9CudkaDkC80t
 clearskies/tests/simple_api/models/status.py,sha256=PEhPbaQh5qdUNHp8O0gz91LOLENAEBtqSaHxUPXchaM,699
 clearskies/tests/simple_api/models/user.py,sha256=5_P4Tp1tTdX7PkMJ__epPM5MA7JAeVYGas69vcWloLc,819
 clearskies/tests/simple_api/users_api.py,sha256=KYXCgEofDxHeRdQK67txN5oYUPvxxmB8JTku7L-apk4,2344
-clear_skies-1.16.8.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.16.8.dist-info/METADATA,sha256=WWm9zstPQ0X-BV1JP4P1Yn424ST_i8C_ACoeQiHEJl8,1366
-clear_skies-1.16.8.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-clear_skies-1.16.8.dist-info/RECORD,,
+clear_skies-1.16.10.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.16.10.dist-info/METADATA,sha256=Q-PsjMRYiUkWRc-WQ9bs24RQkyJu3bDydWFxSBB9Iqw,1367
+clear_skies-1.16.10.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+clear_skies-1.16.10.dist-info/RECORD,,

clearskies/handlers/get.py

@@ -27,9 +27,12 @@ class Get(Base):
 
     def fetch_model(self, input_output):
         routing_data = input_output.routing_data()
-        if self.id_column_name not in routing_data:
+        if self.id_column_name in routing_data:
+            id = routing_data[self.id_column_name]
+        elif "id" in routing_data:
+            id = routing_data["id"]
+        else:
             raise ValueError("I didn't receive the ID in my routing data.  I am probably misconfigured.")
-        id = routing_data[self.id_column_name]
         models = self._model.where(f"{self.id_column_name}={id}")
         for where in self.configuration("where"):
             if type(where) == str:

clearskies/handlers/restful_api.py

@@ -125,6 +125,12 @@ class RestfulAPI(Routing):
             self._cached_handlers[cache_key] = self.build_handler(handler_class)
         return self._cached_handlers[cache_key]
 
+    def build_handler(self, handler_class, configuration=None):
+        if not configuration and handler_class == self.configuration("update_handler"):
+            configuration = self._configuration
+            configuration["include_id_in_path"] = True
+        return super().build_handler(handler_class, configuration=configuration)
+
     def _get_handler_class_for_route(self, input_output):
         try:
             [is_search, resource_id] = self._parse_url(input_output)

clearskies/handlers/simple_routing_route.py

@@ -124,7 +124,7 @@ class SimpleRoutingRoute:
             return None
         for index in range(path_length):
             if index in resource_paths:
-                if resource_paths[index] == self._path_parameter_with_slashes:
+                if resource_paths[index] in self._path_parameter_with_slashes:
                     route_data[resource_paths[index]] = "/".join(requested_parts[index:])
                 else:
                     route_data[resource_paths[index]] = requested_parts[index]

clearskies/handlers/update.py

@@ -16,14 +16,18 @@ class Update(Write):
         "readable_columns": None,
         "where": [],
         "input_error_callable": None,
+        "include_id_in_path": False,
     }
 
     def handle(self, input_output):
         input_data = self.request_data(input_output)
-        external_id_column_name = self.auto_case_internal_column_name("id")
-        if "id" not in input_data:
-            return self.error(input_output, f"Missing '{external_id_column_name}' in request body", 404)
-        model_id = input_data["id"]
+        routing_data = input_output.routing_data()
+        if self.id_column_name in routing_data:
+            model_id = routing_data[self.id_column_name]
+        elif "id" in routing_data:
+            model_id = routing_data["id"]
+        else:
+            raise ValueError("I didn't receive the ID in my routing data.  I am probably misconfigured.")
         id_column_name = self.id_column_name
         models = self._model.where(f"{id_column_name}={model_id}")
         for where in self.configuration("where"):
@@ -39,7 +43,8 @@ class Update(Write):
         model = models.first()
         if not model.exists:
             return self.error(input_output, "Not Found", 404)
-        del input_data["id"]
+        if "id" in input_data:
+            del input_data["id"]
 
         input_errors = {
             **self._extra_column_errors(input_data),
@@ -74,5 +79,5 @@ class Update(Write):
         return self._documentation(
             description="Update the " + nice_model + " with an " + id_label + " of {" + id_label + "}",
             response_description=f"The updated {nice_model}",
-            include_id_in_path=True,
+            include_id_in_path=self.configuration("include_id_in_path"),
         )