clear-skies 1.19.2__py3-none-any.whl → 1.19.4__py3-none-any.whl

{clear_skies-1.19.2.dist-info → clear_skies-1.19.4.dist-info}/METADATA

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

{clear_skies-1.19.2.dist-info → clear_skies-1.19.4.dist-info}/RECORD

@@ -138,7 +138,7 @@ 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=GHXlhXiuewu9E54RsCo7BPyFXQ7m5tCyiAPHIgb8Qok,6820
+clearskies/handlers/get.py,sha256=x9SogDd2ZvIYwv2UkNa_FUmmKMNd9XPadkbnBKbyTGo,6892
 clearskies/handlers/health_check.py,sha256=m6H3psUql-I7hZao3fsxjrZnCjFJZ1ROTF-41g8Syww,2078
 clearskies/handlers/input_processing.py,sha256=edtG6NQJZCte0Nq-j7SUMzp6vxgIIbLxeUGscWOALAs,3814
 clearskies/handlers/list.py,sha256=Liil791oF9-NjofRV40bNVbhbzF4sM74_efvoDHenqg,25384
@@ -148,7 +148,7 @@ clearskies/handlers/restful_api.py,sha256=1rJ2REX1sTAdbqaRuCclP375agrho4zNNQx6hX
 clearskies/handlers/routing.py,sha256=uWKWcEaiHVqfDebPkQVuG9AS8pOixW31wW0yIQ-25Aw,3079
 clearskies/handlers/schema_helper.py,sha256=62644USvFlZu_6tT7rb-k6t_5J3Q0uZsJwP5KREk_WM,4961
 clearskies/handlers/simple_routing.py,sha256=KpOSQK2_tTwrPblDmxAUpX-Fqts_Or_MLWGKOOkJnoo,9403
-clearskies/handlers/simple_routing_route.py,sha256=kDoplYQW54WvROgHOAq5yLqloIMHnIIWZHCnkmzT_G0,8924
+clearskies/handlers/simple_routing_route.py,sha256=3U3dixEKuf-Xo88RQGH_grm1x79-px6idt1-xaLUSiY,8953
 clearskies/handlers/simple_search.py,sha256=bSfq8rzdqkBj-dTGUBSZ1EkfjzUWHID7mKD2xEf8VzQ,6165
 clearskies/handlers/update.py,sha256=VCZkoID7i5VHq78fkIpjbRdXQ4Z3IuXEE5dfC8z4RZI,4088
 clearskies/handlers/write.py,sha256=VduGtjnFMQOvo3l0t-tUP4PExPJ9JEpuziHsquF08rE,9344
@@ -192,7 +192,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.19.2.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.19.2.dist-info/METADATA,sha256=oViYadXM8eLgTlXMKz7jhbRDUbWB2gBwxtztzicv9ZA,1366
-clear_skies-1.19.2.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-clear_skies-1.19.2.dist-info/RECORD,,
+clear_skies-1.19.4.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.19.4.dist-info/METADATA,sha256=ENNaUE9Oz_QG5vluGMK4uK81tcBAVLrwCrQ1BBErEfM,1366
+clear_skies-1.19.4.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+clear_skies-1.19.4.dist-info/RECORD,,

clearskies/handlers/get.py

@@ -25,14 +25,16 @@ class Get(Base):
             return self.error(input_output, model, 404)
         return self.success(input_output, self._model_as_json(model, input_output))
 
-    def fetch_model(self, input_output):
+    def get_model_id(self, input_output):
         routing_data = input_output.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.")
+            return routing_data[self.id_column_name]
+        if "id" in routing_data:
+            return routing_data["id"]
+        raise ValueError("I didn't receive the ID in my routing data.  I am probably misconfigured.")
+
+    def fetch_model(self, input_output):
+        id = self.get_model_id(input_output)
         models = self._model.where(f"{self.id_column_name}={id}")
         for where in self.configuration("where"):
             if type(where) == str:

clearskies/handlers/simple_routing_route.py

@@ -98,7 +98,7 @@ class SimpleRoutingRoute:
         to understand if there was no route match at all.
         """
         # if we're routing to a simple router then defer to it
-        incoming = f"Incoming request: [{request_method}] {full_path}.  Check against route with url '{self._path}' "
+        incoming = f"Incoming request: [{request_method}] {full_path}.  Check against route with url '{self._path}'.  Results: "
         if not self._methods:
             incoming += " configured for any method except OPTIONS"
         elif isinstance(self._methods, str):
@@ -136,7 +136,7 @@ class SimpleRoutingRoute:
                 return None
             # make sure we don't get confused by partial matches.  `user` should match `user/` and `user/5`,
             # but it shouldn't match `users/`
-            if full_path_length > my_path_length and full_path[my_path_length] != "/":
+            if full_path_length > my_path_length and full_path[my_path_length] != "/" and my_path != "":
                 logger.debug(f"{incoming} Not a match.  I only partially matched the URL but not as a sub-directory.")
                 return None
         logger.debug(f"{incoming} Match!")