dyngle 1.2.0__py3-none-any.whl → 1.3.1__py3-none-any.whl

dyngle/model/expression.py

@@ -130,8 +130,11 @@ def expression(text: str) -> Callable[[dict], str]:
     def definition(live_data: LiveData | dict | None = None) -> str:
         """The expression function itself"""
 
-        # Allow for blankness and testability
-        live_data = LiveData(live_data)
+        # We only work if passed some data to use - also we don't know our name
+        # so can't report it.
+
+        if live_data is None:
+            raise DyngleError('Expression called with no argument')
 
         # Translate names to underscore-separated instead of hyphen-separated
         # so they work within the Python namespace.
@@ -140,11 +143,17 @@ def expression(text: str) -> Callable[[dict], str]:
         locals = LiveData({k.replace('-', '_'): v for k, v in items})
 
         # Create a resolve function which allows references using the hyphen
-        # syntax too
+        # syntax too - note it relies on the original live_data object (not the
+        # locals with the key replacement). We're converting it to LiveData in
+        # case for some reason we were passed a raw dict.
+
+        live_data = LiveData(live_data)
 
         def resolve(key):
             return live_data.resolve(key, str_only=False)
-        locals = locals | {'resolve': resolve}
+
+        # Passing the live_data in again allows function(data) in expressions
+        locals = locals | {'resolve': resolve, 'data': live_data}
 
         # Perform the Python eval, expanded above
         return _evaluate(text, locals)

dyngle/model/live_data.py

@@ -5,6 +5,7 @@ from numbers import Number
 from yaml import safe_dump
 
 from dyngle.error import DyngleError
+from dyngle.model.safe_path import SafePath
 
 
 class LiveData(UserDict):
@@ -27,7 +28,7 @@ class LiveData(UserDict):
 def _stringify(value) -> str:
     if isinstance(value, bool):
         return '.' if value is True else ''
-    elif isinstance(value, (Number, str, date, timedelta)):
+    elif isinstance(value, (Number, str, date, timedelta, SafePath)):
         return str(value)
     elif isinstance(value, (list, dict, tuple)):
         return safe_dump(value)

{dyngle-1.2.0.dist-info → dyngle-1.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dyngle
-Version: 1.2.0
+Version: 1.3.1
 Summary: Run lightweight local workflows
 License: MIT
 Author: Steampunk Wizard

{dyngle-1.2.0.dist-info → dyngle-1.3.1.dist-info}/RECORD

@@ -4,12 +4,12 @@ dyngle/command/__init__.py,sha256=1S86gbef8MYvG-TWD5JRIWzFg7qV5xKhp9QXx9zEx5c,94
 dyngle/command/run_command.py,sha256=gYTQjATRMu_81HLP-hrMz7GNw9Lcz2VjuhP7h_qYLcE,1514
 dyngle/error.py,sha256=CGcTa8L4O1qsHEYnzp_JBbkvntJTv2Qz46wj_TI8NLk,39
 dyngle/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dyngle/model/expression.py,sha256=9nwfahjOHtScjdDzjwWIleo60lJjtXGrPGfroCbslvg,4431
-dyngle/model/live_data.py,sha256=yWiTgb9w9KaJ2yynGEudfu89Z3hOoHcLdUXfEJRtZG4,1197
+dyngle/model/expression.py,sha256=XvHlWqnN-4gkN4ck5iTuwP3OqXXbRzTwIRTX0lzJAdY,4889
+dyngle/model/live_data.py,sha256=FxbMjfaiBIUorEbhRx5I0o-WAFFWdjYaqzw_zhFq86w,1251
 dyngle/model/operation.py,sha256=nSz-8Eh03xAvQlc6Wzn56t-dMArp9uJWY_8XJJZEIwc,1743
 dyngle/model/safe_path.py,sha256=Hk2AhP6e3yKGh3kKrLLwhvAlMNx-j2jObBYJL-_doAU,3339
 dyngle/model/template.py,sha256=MeXu--ZNtj_ujABU1GjjcQ1Ea_o_M-50LocuXFeOLRE,887
-dyngle-1.2.0.dist-info/METADATA,sha256=0jg6HNybNbzJZZRr6-hEUDDMhHJVDNVrLdBZ3m8P7kA,9710
-dyngle-1.2.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-dyngle-1.2.0.dist-info/entry_points.txt,sha256=rekiGhtweiHKm9g1jdGb3FhzqDrk1kigJDeSNollZSA,48
-dyngle-1.2.0.dist-info/RECORD,,
+dyngle-1.3.1.dist-info/METADATA,sha256=4LWgQs_wTqwVRx-xPyNh8M3I8K2I6lRPUHiuR0t0qLw,9710
+dyngle-1.3.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+dyngle-1.3.1.dist-info/entry_points.txt,sha256=rekiGhtweiHKm9g1jdGb3FhzqDrk1kigJDeSNollZSA,48
+dyngle-1.3.1.dist-info/RECORD,,