to_complex improvements

Signed-off-by: Matt Oswalt <oswaltm@brocade.com>

setup.cfg

@@ -16,7 +16,7 @@ mistral.expression.functions =
     regex_search = st2mistral.functions.regex:regex_search
     regex_substring = st2mistral.functions.regex:regex_substring
     st2kv = st2mistral.functions.stackstorm:st2kv_
-    to_complex = st2mistral.functions.complex_type:to_complex
+    to_complex = st2mistral.functions.data:to_complex
     to_human_time_from_seconds = st2mistral.functions.time:to_human_time_from_seconds
     to_json_string = st2mistral.functions.data:to_json_string
     to_yaml_string = st2mistral.functions.data:to_yaml_string

st2mistral/functions/data.py

@@ -17,11 +17,16 @@
 import yaml
 
 __all__ = [
+    'to_complex',
     'to_json_string',
-    'to_yaml_string',
+    'to_yaml_string'
 ]
 
 
+def to_complex(value):
+    return json.dumps(value)
+
+
 def to_json_string(value, indent=4, sort_keys=False, separators=(',', ':')):
     return json.dumps(value, indent=indent, separators=separators,
                       sort_keys=sort_keys)

st2mistral/tests/unit/test_function_base.py

@@ -20,7 +20,6 @@
 
 
 def get_functions():
-    from st2mistral.functions import complex_type
     from st2mistral.functions import data
     from st2mistral.functions import json_escape
     from st2mistral.functions import regex
@@ -34,7 +33,7 @@ def get_functions():
         'regex_replace': regex.regex_replace,
         'regex_search': regex.regex_search,
         'regex_substring': regex.regex_substring,
-        'to_complex': complex_type.to_complex,
+        'to_complex': data.to_complex,
         'to_human_time_from_seconds': time.to_human_time_from_seconds,
         'to_json_string': data.to_json_string,
         'to_yaml_string': data.to_yaml_string,

st2mistral/tests/unit/test_jinja_render_data.py

@@ -21,6 +21,16 @@
 
 class JinjaUtilsDataFunctionTestCase(base.JinjaFunctionTestCase):
 
+    def test_function_to_complex(self):
+        env = self.get_jinja_environment()
+        obj = {'a': 'b', 'c': {'d': 'e', 'f': 1, 'g': True}}
+
+        template = '{{k1 | to_complex}}'
+
+        obj_json_str = env.from_string(template).render({'k1': obj})
+        actual_obj = json.loads(obj_json_str)
+        self.assertDictEqual(obj, actual_obj)
+
     def test_function_to_json_string(self):
         env = self.get_jinja_environment()
         obj = {'a': 'b', 'c': {'d': 'e', 'f': 1, 'g': True}}