Merge pull request #61 from con2/issue-59

fixes #59, closes #60

Author: japsu

emrichen/tags/hash.py

@@ -12,10 +12,15 @@ class _BaseHash(BaseTag):
     description: Hashes the given data using the {name} algorithm. If the data is not binary, it is converted to UTF-8 bytes.
     """
 
+    value_types = (
+        str,
+        object,
+    )
+
     hasher: Any = None  # TODO: what's the proper type for a hasher factory?
 
     def enrich(self, context: Context) -> str:
-        data = self.data
+        data = context.enrich(self.data)
         if not isinstance(data, bytes):
             if not isinstance(data, str):
                 data = str(data)

tests/test_hash.py

@@ -1,13 +1,22 @@
 import pytest
 
-from emrichen import Template
+from emrichen import Context, Template
 
 HASHES = {
     'MD5': '8b1a9953c4611296a827abf8c47804d7',
     'SHA1': 'f7ff9e8b7bb2e09b70935a5d785e0cc5d9d0abf0',
     'SHA256': '185f8db32271fe25f561a6fc938b2e264306ec304eda518007d1764826381969',
 }
 
+@pytest.mark.parametrize('h', sorted(HASHES.items()), ids=sorted(HASHES))
+def test_hash_variable(h):
+    algo, expected = h
+
+    VARIABLES = """
+    helloVar: Hello
+    """
+
+    assert Template.parse(f'!{algo},Var helloVar').enrich(Context(VARIABLES)) == [expected]
 
 @pytest.mark.parametrize('h', sorted(HASHES.items()), ids=sorted(HASHES))
 def test_hash(h):