Adds decorator to apply rewrite rules

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>

speasy/core/http.py

@@ -12,7 +12,7 @@
 
 from speasy import __version__
 from speasy.config import core as core_config
-from .url_utils import host_and_port, apply_rewrite_rules
+from .url_utils import host_and_port, ApplyRewriteRules
 
 log = logging.getLogger(__name__)
 
@@ -90,28 +90,29 @@ def __init__(self, verb):
         # self._http.mount("http://", self._adapter)
         self._verb = partial(pool.request, method=verb, retries=retry_strategy)
 
+    @ApplyRewriteRules()
     def __call__(self, url, headers: dict = None, params: dict = None, timeout: int = DEFAULT_TIMEOUT):
         # self._adapter.timeout = timeout
         headers = headers or {}
         headers['User-Agent'] = USER_AGENT
-        url = apply_rewrite_rules(url)
         return Response(self._verb(url=url, headers=headers, fields=params, timeout=timeout))
 
 
 get = _HttpVerb("GET")
 head = _HttpVerb("HEAD")
 
 
+@ApplyRewriteRules()
 def urlopen(url, timeout: int = DEFAULT_TIMEOUT, headers: dict = None):
     headers = {} if headers is None else headers
     headers['User-Agent'] = USER_AGENT
-    url = apply_rewrite_rules(url)
     return Response(pool.urlopen(method="GET", url=url, headers=headers, timeout=timeout))
 
 
-def is_server_up(url: Optional[str] = None, host: Optional[str] = None, port: Optional[int] = None,
-                 timeout: int = 5, retries=5) -> bool:
-    """Checks if a server is up and running.
+@ApplyRewriteRules()
+def is_server_up(url: Optional[str] = None, host: Optional[str] = None, port: Optional[int] = None, timeout: int = 5,
+                 retries=5) -> bool:
+    """Checks if a server is up and running. If url is provided, host and port are ignored.
 
     Parameters
     ----------
@@ -135,7 +136,6 @@ def is_server_up(url: Optional[str] = None, host: Optional[str] = None, port: Op
         If neither url nor host and port are provided
     """
     if url is not None:
-        url = apply_rewrite_rules(url)
         host, port = host_and_port(url)
     elif host is None or port is None:
         raise ValueError("Either url or host and port must be provided")

speasy/core/url_utils.py

@@ -1,5 +1,7 @@
-from typing import Dict, Tuple
+from typing import Dict, Tuple, Callable
 from urllib.parse import urlparse, urlencode
+from functools import wraps
+
 from speasy.config import core as core_config
 
 _REWRITE_RULES_ = core_config.http_rewrite_rules.get()
@@ -98,6 +100,13 @@ def apply_rewrite_rules(url: str) -> str:
             return _REWRITE_RULES_[base_url] + url[len(base_url):]
     return url
 
+class ApplyRewriteRules:
+    def __call__(self, f:Callable):
+        @wraps(f)
+        def wrapper(url:str, *args, **kwargs):
+            if url is not None:
+                return f(apply_rewrite_rules(url), *args, **kwargs)
+            return f(url, *args, **kwargs)
 
 def extract_path(url: str) -> str:
     return urlparse(url).path