Merge pull request #5 from d-chris/develop

bugfix for clicktypes.url

Author: d-chris

.gitignore

@@ -1,4 +1,5 @@
 docs/public/
+.vscode/**
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

clicktypes/__init__.py

@@ -504,7 +504,9 @@ def url(
 
     Returns a `click.ParamType` instance which wraps `validators.url`.
     """
-    return click_validatortype(validators.url)(**locals())
+
+    params = {k: v for k, v in locals().items() if k != "kwargs"}
+    return click_validatortype(validators.url)(**params, **kwargs)
 
 
 def uuid() -> click.ParamType:

clicktypes/__main__.py

@@ -1,6 +1,9 @@
 import inspect
 from pathlib import Path
-from typing import Any, Callable, Dict, List
+from typing import Any
+from typing import Callable
+from typing import Dict
+from typing import List
 
 import black
 import jinja2

clicktypes/decorator.py

@@ -1,5 +1,6 @@
 import functools
-from typing import Callable, Type
+from typing import Callable
+from typing import Type
 
 import click
 

docs/__main__.py

@@ -34,7 +34,8 @@ def main() -> int:
 
     try:
         from pathlibutil import Path
-        from pdoc import pdoc, render
+        from pdoc import pdoc
+        from pdoc import render
 
         with Path(__file__).parent as cwd:
             print(f"\nrunning docs in {cwd=}...")

poetry.lock

@@ -13,7 +13,6 @@ exclude = [ "clicktypes/__main__.py" ]
 keywords = [ "click", "validators" ]
 license = "MIT"
 classifiers = [
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
@@ -62,6 +61,8 @@ priority = "explicit"
 
 [tool.isort]
 profile = "black"
+force_single_line = true
+line_length = 88
 
 [tool.pytest.ini_options]
 minversion = "6.0"

pyproject.toml

@@ -21,7 +21,12 @@ def {{ validator.name }}(
 
     Returns a `click.ParamType` instance which wraps `validators.{{ validator.name }}`.
     """
+    {% if "**kwargs" in validator.params %}
+    params = {k: v for k, v in locals().items() if k != "kwargs"}
+    return click_validatortype(validators.{{ validator.name }})(**params, **kwargs)
+    {% else -%}
     return click_validatortype(validators.{{ validator.name }})(**locals())
+    {% endif %}
 {% else %}
 def {{ validator.name }}() -> click.ParamType:
     """

templates/__init__.py.jinja2

@@ -1,6 +1,8 @@
+import ast
 import inspect
 import re
-from typing import Generator, Tuple
+from typing import Generator
+from typing import Tuple
 
 import validators
 
@@ -13,50 +15,35 @@ def docstrings() -> Generator[str, None, None]:
     yield from (
         inspect.getdoc(getattr(validators, validator)) or ""
         for validator in clicktypes.__all__
-        if validator not in ("base58", "country_code")
     )
 
 
 def testdata(doc: str) -> Generator[Tuple[str, str, int], None, None]:
 
+    if "ind_pan" in doc:
+        pass
+
+    def parse_call(s: str):
+        tree = ast.parse(s.strip(), mode="eval")
+        if not isinstance(tree.body, ast.Call):
+            raise ValueError("Not a function call")
+        func_name = (
+            ast.unparse(tree.body.func)
+            if hasattr(ast, "unparse")
+            else tree.body.func.id  # type: ignore[attr-defined]
+        )
+        args = [ast.literal_eval(arg) for arg in tree.body.args]
+        kwargs = {kw.arg: ast.literal_eval(kw.value) for kw in tree.body.keywords}
+        return func_name, tuple(args), kwargs
+
     for match in re.findall(
-        r">>> (\w+)\(\'(.*?)\'\)$\s+# \w+: (.*?)$",
+        r">>>\s*(\w+\(.*?\))$\s+(.*?)$",
         doc,
         re.MULTILINE,
     ):
-        yield (match[0], match[1], 0 if match[2] == "True" else 2)
+        yield (*parse_call(match[0]), 0 if match[1] == "True" else 2)
 
 
 def validator_data():
     for doc in docstrings():
-        for validator, value, expected in testdata(doc):
-            yield (validator, value, {}, expected)
-
-    for data, result in [
-        ("cUSECaVvAiV3srWbFRvVPzm5YzcXJwPSwZfE7veYPHoXmR9h6YMQ", 0),
-        ("18KToMF5ckjXBYt2HAj77qsG3GPeej3PZn", 0),
-        ("n4FFXRNNEW1aA2WPscSuzHTCjzjs4TVE2Z", 0),
-        ("38XzQ9dPGb1uqbZsjPtUajp7omy8aefjqj", 0),
-        ("ThisIsAReallyLongStringThatIsDefinitelyNotBase58Encoded", 2),
-        ("abcABC!@#", 2),
-        ("InvalidBase58!", 2),
-    ]:
-        yield ("base58", data, {}, result)
-
-    for data, kwarg, expected in [
-        ("ISR", "auto", 0),
-        ("US", "alpha2", 0),
-        ("USA", "alpha3", 0),
-        ("840", "numeric", 0),
-        ("", "auto", 2),
-        ("123456", "auto", 2),
-        ("XY", "alpha2", 2),
-        ("PPP", "alpha3", 2),
-        ("123", "numeric", 2),
-        ("us", "auto", 2),
-        ("uSa", "auto", 2),
-        ("US ", "auto", 2),
-        ("U.S", "auto", 2),
-        ("1ND", "unknown", 2),
-    ]:
-        yield ("country_code", data, {"iso_format": kwarg}, expected)
+        yield from testdata(doc)

tests/__init__.py

@@ -41,9 +41,10 @@ def test_none(validator):
     sorted(
         validator_data(),
     ),
+    ids=repr,
 )
 def test_dataset(validator, value, kwargs, expected):
 
     runner = CliRunner()
-    result = runner.invoke(cli(validator, **kwargs), [value])
+    result = runner.invoke(cli(validator, **kwargs), value)
     assert result.exit_code == expected