apexdevkit 1.8.2__tar.gz → 1.8.4__tar.gz

{apexdevkit-1.8.2 → apexdevkit-1.8.4}/PKG-INFO

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

{apexdevkit-1.8.2 → apexdevkit-1.8.4}/apexdevkit/http/httpx.py

@@ -8,6 +8,7 @@ from httpx import Client
 
 from apexdevkit.http.fluent import HttpMethod, HttpResponse
 from apexdevkit.http.json import JsonDict
+from apexdevkit.http.url import HttpUrl
 
 
 def default_config() -> HttpxConfig:
@@ -22,12 +23,10 @@ class Httpx:
 
     @classmethod
     def create_for(cls, url: str) -> Self:
-        return cls(Client(base_url=url), HttpxConfig())
+        return cls(Client(base_url=url))
 
     def with_endpoint(self, value: str) -> Httpx:
-        self.client.base_url = self.client.base_url.join(value)
-
-        return self
+        return Httpx(self.client, self.config.with_endpoint(value))
 
     def with_header(self, key: str, value: str) -> Httpx:
         return Httpx(self.client, self.config.with_header(key, value))
@@ -39,7 +38,12 @@ class Httpx:
         return Httpx(self.client, self.config.with_json(value))
 
     def request(self, method: HttpMethod, endpoint: str = "") -> HttpResponse:
-        return _HttpxResponse(self.client.request(method.name, endpoint, **self.config))
+        return _HttpxResponse(
+            self.client.request(
+                method.name,
+                **self.config.with_endpoint(endpoint),
+            )
+        )
 
 
 @dataclass
@@ -58,14 +62,22 @@ class _HttpxResponse:
 
 @dataclass(frozen=True)
 class HttpxConfig(Mapping[str, Any]):
-    timeout_s: int = 30
+    endpoint: str = ""
     headers: JsonDict = field(default_factory=JsonDict)
     params: JsonDict = field(default_factory=JsonDict)
     json: JsonDict = field(default_factory=JsonDict)
 
+    def with_endpoint(self, endpoint: str) -> HttpxConfig:
+        return HttpxConfig(
+            endpoint=HttpUrl(self.endpoint) + endpoint,
+            headers=self.headers,
+            params=self.params,
+            json=self.json,
+        )
+
     def with_header(self, key: str, value: str) -> HttpxConfig:
         return HttpxConfig(
-            timeout_s=self.timeout_s,
+            endpoint=self.endpoint,
             headers=self.headers.merge(JsonDict({key: value})),
             params=self.params,
             json=self.json,
@@ -73,7 +85,7 @@ class HttpxConfig(Mapping[str, Any]):
 
     def with_param(self, key: str, value: str) -> HttpxConfig:
         return HttpxConfig(
-            timeout_s=self.timeout_s,
+            endpoint=self.endpoint,
             headers=self.headers,
             params=self.params.merge(JsonDict({key: value})),
             json=self.json,
@@ -81,7 +93,7 @@ class HttpxConfig(Mapping[str, Any]):
 
     def with_json(self, value: JsonDict) -> HttpxConfig:
         return HttpxConfig(
-            timeout_s=self.timeout_s,
+            endpoint=self.endpoint,
             headers=self.headers,
             params=self.params,
             json=value,
@@ -89,7 +101,7 @@ class HttpxConfig(Mapping[str, Any]):
 
     def as_dict(self) -> dict[str, Any]:
         return {
-            "timeout": self.timeout_s,
+            "url": self.endpoint,
             "headers": dict(self.headers),
             "params": dict(self.params),
             "json": dict(self.json),

{apexdevkit-1.8.2 → apexdevkit-1.8.4}/apexdevkit/testing/rest.py

@@ -120,21 +120,21 @@ class RestfulName:
         return HttpUrl(self.plural) + other
 
 
-def as_plural(singular: str) -> str:  # pragma: no cover
-    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"
+def as_plural(singular: str) -> str:
+    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"
 

{apexdevkit-1.8.2 → apexdevkit-1.8.4}/pyproject.toml

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