drun 2.3.2__tar.gz → 2.3.4__tar.gz

{drun-2.3.2 → drun-2.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drun
-Version: 2.3.2
+Version: 2.3.4
 Summary: Minimal HTTP API test runner (MVP)
 Author: Drun Team
 Requires-Python: >=3.10

{drun-2.3.2 → drun-2.3.4}/drun/__init__.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "2.3.2"
+__version__ = "2.3.3"

{drun-2.3.2 → drun-2.3.4}/drun/templating/engine.py

@@ -142,25 +142,24 @@ class TemplateEngine:
                 dyn_funcs: Dict[str, Callable[..., Any]] = {"ENV": ENV}
                 ctx: Dict[str, Any] = {**BUILTINS, **dyn_funcs, **(functions or {}), **variables}
 
-                # If the whole string is a single ${...} token, evaluate and return the value with its native type
-                single_token_match = re.fullmatch(r"\$\{([^{}]+)\}", text)
-                if single_token_match:
-                    expr = single_token_match.group(1).strip()
-                    try:
-                        node = ast.parse(expr, mode="eval")
-                        return _safe_eval(node, ctx)
-                    except Exception:
-                        # Fall through to string rendering if evaluation fails
-                        pass
-
-                # multi-pass to resolve nested tokens inside strings, always producing a string
                 cur = text
-                for _ in range(3):
+                for _ in range(5):
+                    single_token_match = re.fullmatch(r"\$\{([^{}]+)\}", cur)
+                    if single_token_match:
+                        expr = single_token_match.group(1).strip()
+                        try:
+                            node = ast.parse(expr, mode="eval")
+                            return _safe_eval(node, ctx)
+                        except Exception:
+                            # Fall through and continue resolving nested tokens if evaluation fails
+                            pass
                     nxt = _render_text_without_jinja(cur, ctx)
-                    if nxt == cur or "${" not in nxt:
-                        cur = nxt
+                    if nxt == cur:
                         break
                     cur = nxt
+                    if "${" not in cur:
+                        break
+                # If we weren't able to evaluate to a native type, return the rendered string
                 return cur
             except Exception:
                 return value

{drun-2.3.2 → drun-2.3.4}/drun.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drun
-Version: 2.3.2
+Version: 2.3.4
 Summary: Minimal HTTP API test runner (MVP)
 Author: Drun Team
 Requires-Python: >=3.10

{drun-2.3.2 → drun-2.3.4}/drun.egg-info/SOURCES.txt

@@ -56,4 +56,5 @@ drun/utils/curl.py
 drun/utils/errors.py
 drun/utils/logging.py
 drun/utils/mask.py
-drun/utils/timeit.py
+drun/utils/timeit.py
+tests/test_templating.py

{drun-2.3.2 → drun-2.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "drun"
-version = "2.3.2"
+version = "2.3.4"
 description = "Minimal HTTP API test runner (MVP)"
 requires-python = ">=3.10"
 authors = [{ name = "Drun Team" }]

drun-2.3.4/tests/test_templating.py

@@ -0,0 +1,40 @@
+from __future__ import annotations
+
+import unittest
+
+from drun.templating.engine import TemplateEngine
+
+
+class TemplateEngineHookTests(unittest.TestCase):
+    def setUp(self) -> None:
+        self.templater = TemplateEngine()
+
+    def test_nested_hook_calls_preserve_native_types(self) -> None:
+        funcs = {
+            "double": lambda x: x * 2,
+            "increment": lambda val: int(val) + 1,
+        }
+
+        base_vars = self.templater.render_value({"start": "${double(2)}"}, {}, funcs)
+        self.assertEqual(base_vars["start"], 4)
+        self.assertIsInstance(base_vars["start"], int)
+
+        step_vars = self.templater.render_value(
+            {"payload": "${double($start)}"},
+            {**base_vars},
+            funcs,
+        )
+        self.assertEqual(step_vars["payload"], 8)
+        self.assertIsInstance(step_vars["payload"], int)
+
+        expect_value = self.templater.render_value(
+            "${increment($payload)}",
+            {**base_vars, **step_vars},
+            funcs,
+        )
+        self.assertEqual(expect_value, 9)
+        self.assertIsInstance(expect_value, int)
+
+
+if __name__ == "__main__":
+    unittest.main()