apexdevkit 1.8.1__tar.gz → 1.8.3__tar.gz

{apexdevkit-1.8.1 → apexdevkit-1.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apexdevkit
-Version: 1.8.1
+Version: 1.8.3
 Summary: Apex Development Tools for python.
 Author: Apex Dev
 Author-email: dev@apex.ge

{apexdevkit-1.8.1 → apexdevkit-1.8.3}/apexdevkit/http/fake.py

@@ -48,6 +48,9 @@ class FakeHttp:
 
     _request: InterceptedRequest = field(init=False)
 
+    def with_endpoint(self, value: str) -> Self:  # pragma: no cover
+        raise NotImplementedError
+
     def with_header(self, key: str, value: str) -> Self:
         self.headers[key] = value
 
@@ -63,7 +66,7 @@ class FakeHttp:
 
         return self
 
-    def request(self, method: HttpMethod, endpoint: str) -> HttpResponse:
+    def request(self, method: HttpMethod, endpoint: str = "") -> HttpResponse:
         self._request = InterceptedRequest(method, endpoint)
 
         return self.response

{apexdevkit-1.8.1 → apexdevkit-1.8.3}/apexdevkit/http/fluent.py

@@ -8,6 +8,9 @@ from apexdevkit.http.json import JsonDict
 
 
 class Http(Protocol):  # pragma: no cover
+    def with_endpoint(self, value: str) -> Http:
+        pass
+
     def with_header(self, key: str, value: str) -> Http:
         pass
 
@@ -17,7 +20,7 @@ class Http(Protocol):  # pragma: no cover
     def with_json(self, value: JsonDict) -> Http:
         pass
 
-    def request(self, method: HttpMethod, endpoint: str) -> HttpResponse:
+    def request(self, method: HttpMethod, endpoint: str = "") -> HttpResponse:
         pass
 
 

{apexdevkit-1.8.1 → apexdevkit-1.8.3}/apexdevkit/http/httpx.py

@@ -24,6 +24,11 @@ class Httpx:
     def create_for(cls, url: str) -> Self:
         return cls(Client(base_url=url), HttpxConfig())
 
+    def with_endpoint(self, value: str) -> Httpx:
+        self.client.base_url = self.client.base_url.join(value)
+
+        return self
+
     def with_header(self, key: str, value: str) -> Httpx:
         return Httpx(self.client, self.config.with_header(key, value))
 
@@ -33,7 +38,7 @@ class Httpx:
     def with_json(self, value: JsonDict) -> Httpx:
         return Httpx(self.client, self.config.with_json(value))
 
-    def request(self, method: HttpMethod, endpoint: str) -> HttpResponse:
+    def request(self, method: HttpMethod, endpoint: str = "") -> HttpResponse:
         return _HttpxResponse(self.client.request(method.name, endpoint, **self.config))
 
 

{apexdevkit-1.8.1 → apexdevkit-1.8.3}/apexdevkit/testing/rest.py

@@ -6,7 +6,6 @@ from typing import Any, Iterable, Self
 
 from apexdevkit.http import Http, HttpUrl, JsonDict
 from apexdevkit.http.fluent import HttpMethod, HttpResponse
-from apexdevkit.http.httpx import Httpx
 
 
 @dataclass
@@ -17,86 +16,95 @@ class RestResource:
     def create_one(self) -> RestRequest:
         return RestRequest(
             self.name,
-            HttpRequest(HttpMethod.post, self.http).with_endpoint(self.name.plural),
+            HttpRequest(
+                HttpMethod.post,
+                self.http.with_endpoint(self.name.plural),
+            ),
         )
 
     def create_many(self) -> RestRequest:
         return RestRequest(
             self.name,
-            request=(
-                HttpRequest(HttpMethod.post, self.http)
-                .with_endpoint(self.name.plural)
-                .with_endpoint("batch")
+            HttpRequest(
+                HttpMethod.post,
+                self.http.with_endpoint(self.name.plural).with_endpoint("batch"),
             ),
         )
 
     def read_one(self) -> RestRequest:
         return RestRequest(
             self.name,
-            HttpRequest(HttpMethod.get, self.http).with_endpoint(self.name.plural),
+            HttpRequest(
+                HttpMethod.get,
+                self.http.with_endpoint(self.name.plural),
+            ),
         )
 
     def read_all(self) -> RestRequest:
         return RestRequest(
             self.name,
-            HttpRequest(HttpMethod.get, self.http).with_endpoint(self.name.plural),
+            HttpRequest(
+                HttpMethod.get,
+                self.http.with_endpoint(self.name.plural),
+            ),
         )
 
     def update_one(self) -> RestRequest:
         return RestRequest(
             self.name,
-            HttpRequest(HttpMethod.patch, self.http).with_endpoint(self.name.plural),
+            HttpRequest(
+                HttpMethod.patch,
+                self.http.with_endpoint(self.name.plural),
+            ),
         )
 
     def update_many(self) -> RestRequest:
         return RestRequest(
             self.name,
-            HttpRequest(HttpMethod.patch, self.http).with_endpoint(self.name.plural),
+            HttpRequest(
+                HttpMethod.patch,
+                self.http.with_endpoint(self.name.plural),
+            ),
         )
 
     def replace_one(self) -> RestRequest:
         return RestRequest(
             self.name,
-            HttpRequest(HttpMethod.put, self.http).with_endpoint(self.name.plural),
+            HttpRequest(
+                HttpMethod.put,
+                self.http.with_endpoint(self.name.plural),
+            ),
         )
 
     def replace_many(self) -> RestRequest:
         return RestRequest(
             self.name,
-            request=(
-                HttpRequest(HttpMethod.put, self.http)
-                .with_endpoint(self.name.plural)
-                .with_endpoint("batch")
+            HttpRequest(
+                HttpMethod.put,
+                self.http.with_endpoint(self.name.plural).with_endpoint("batch"),
             ),
         )
 
     def delete_one(self) -> RestRequest:
         return RestRequest(
             self.name,
-            HttpRequest(HttpMethod.delete, self.http).with_endpoint(self.name.plural),
+            HttpRequest(
+                HttpMethod.delete,
+                self.http.with_endpoint(self.name.plural),
+            ),
         )
 
 
 @dataclass
 class RestCollection(RestResource):
     def sub_resource(self, name: str) -> RestItem:
-        assert isinstance(self.http, Httpx), "sub resource only works with Httpx"
-
-        client = self.http.client
-        client.base_url = client.base_url.join(self.name.plural)
-
-        return RestItem(self.http, RestfulName(name))
+        return RestItem(self.http.with_endpoint(self.name.plural), RestfulName(name))
 
 
 @dataclass
 class RestItem(RestResource):
     def sub_resource(self, name: str) -> RestItem:
-        assert isinstance(self.http, Httpx), "sub resource only works with Httpx"
-
-        client = self.http.client
-        client.base_url = client.base_url.join(self.name.singular)
-
-        return RestItem(self.http, RestfulName(name))
+        return RestItem(self.http.with_endpoint(self.name.singular), RestfulName(name))
 
 
 @dataclass
@@ -113,20 +121,20 @@ class RestfulName:
 
 
 def as_plural(singular: str) -> str:
-    if singular.endswith("y"):
-        return singular[:-1] + "ies"
-
-    if singular.endswith("ch") or singular.endswith("sh") or singular.endswith("ss"):
-        return singular[:-2] + "es"
-
-    if singular.endswith("s") or singular.endswith("z") or singular.endswith("x"):
-        return singular[:-1] + "es"
-
-    if singular.endswith("fe"):
-        return singular[:-2] + "ves"
-
-    if singular.endswith("f"):
-        return singular[:-1] + "ves"
+    suffixes = {
+        "y": "ies",
+        "ch": "ches",
+        "sh": "shes",
+        "s": "ses",
+        "z": "zes",
+        "x": "xes",
+        "fe": "ves",
+        "f": "ves",
+    }
+
+    for singular_suffix, plural_suffix in suffixes.items():
+        if singular.endswith(singular_suffix):
+            return singular.removesuffix(singular_suffix) + plural_suffix
 
     return singular + "s"
 
@@ -136,10 +144,8 @@ class HttpRequest:
     method: HttpMethod
     http: Http
 
-    endpoint: str = ""
-
     def with_endpoint(self, value: Any) -> HttpRequest:
-        self.endpoint = HttpUrl(self.endpoint) + str(value)
+        self.http = self.http.with_endpoint(str(value))
 
         return self
 
@@ -154,7 +160,7 @@ class HttpRequest:
         return self
 
     def __call__(self) -> HttpResponse:
-        return self.http.request(method=self.method, endpoint=self.endpoint)
+        return self.http.request(self.method)
 
 
 @dataclass

{apexdevkit-1.8.1 → apexdevkit-1.8.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "apexdevkit"
-version = "1.8.1"
+version = "1.8.3"
 description = "Apex Development Tools for python."
 authors = ["Apex Dev <dev@apex.ge>"]
 readme = "README.md"