clear-skies 1.16.8__tar.gz → 1.16.10__tar.gz

{clear_skies-1.16.8 → clear_skies-1.16.10}/PKG-INFO

@@ -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 → clear_skies-1.16.10}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [tool.poetry]
 name = "clear-skies"
-version = "1.16.8"
+version = "1.16.10"
 description = "A framework for building backends in the cloud"
 authors = [
     "Conor Mancone <cmancone@gmail.com>",

{clear_skies-1.16.8 → clear_skies-1.16.10}/src/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:

{clear_skies-1.16.8 → clear_skies-1.16.10}/src/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)

{clear_skies-1.16.8 → clear_skies-1.16.10}/src/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]

{clear_skies-1.16.8 → clear_skies-1.16.10}/src/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"),
         )