Simplify the YAQL expression context regexes

Copy the simpliciation for Jinja evaluator to the YAQL evaluator. Add more test cases to ensure correctness.

Author: m4dcoder

orquesta/expressions/jinja.py

@@ -54,14 +54,14 @@ class JinjaEvaluator(expr_base.Evaluator):
     _regex_pattern = '{{.*?}}'
     _regex_parser = re.compile(_regex_pattern)
 
-    _regex_reference_pattern = r'[][a-zA-Z0-9_\'"\.()]*'
+    _regex_ctx_ref_pattern = r'[][a-zA-Z0-9_\'"\.()]*'
     # match any of:
     #   word boundary ctx(*)
     #   word boundary ctx()*
     #   word boundary ctx().*
     #   word boundary ctx(*)*
     #   word boundary ctx(*).*
-    _regex_ctx_pattern = r'\bctx\([\'"]?{0}[\'"]?\)\.?{0}'.format(_regex_reference_pattern)
+    _regex_ctx_pattern = r'\bctx\([\'"]?{0}[\'"]?\)\.?{0}'.format(_regex_ctx_ref_pattern)
     _regex_ctx_var_parser = re.compile(_regex_ctx_pattern)
 
     _regex_var = r'[a-zA-Z0-9_-]+'

orquesta/expressions/yql.py

@@ -54,22 +54,22 @@ class YAQLEvaluator(expr_base.Evaluator):
     _regex_pattern = '<%.*?%>'
     _regex_parser = re.compile(_regex_pattern)
 
-    _regex_ctx_pattern = r'[a-zA-Z0-9_\'"\.\[\]\(\)]*'
-    _regex_ctx_patterns = [
-        r'^ctx\(\)\.%s' % _regex_ctx_pattern,                                # line start ctx().*
-        r'^ctx\([\'|"]?{0}[\'|"]?\)[\.{0}]?'.format(_regex_ctx_pattern),     # line start ctx(*).*
-        r'[\s]ctx\(\)\.%s' % _regex_ctx_pattern,                             # whitespace ctx().*
-        r'[\s]ctx\([\'|"]?{0}[\'|"]?\)[\.{0}]?'.format(_regex_ctx_pattern)   # whitespace ctx(*).*
-    ]
-    _regex_ctx_var = r'.*?(%s).*?' % '|'.join(_regex_ctx_patterns)
-    _regex_ctx_var_parser = re.compile(_regex_ctx_var)
-
-    _regex_var = r'[a-zA-Z0-9_\-]+'
+    _regex_ctx_ref_pattern = r'[][a-zA-Z0-9_\'"\.()]*'
+    # match any of:
+    #   word boundary ctx(*)
+    #   word boundary ctx()*
+    #   word boundary ctx().*
+    #   word boundary ctx(*)*
+    #   word boundary ctx(*).*
+    _regex_ctx_pattern = r'\bctx\([\'"]?{0}[\'"]?\)\.?{0}'.format(_regex_ctx_ref_pattern)
+    _regex_ctx_var_parser = re.compile(_regex_ctx_pattern)
+
+    _regex_var = r'[a-zA-Z0-9_-]+'
     _regex_var_extracts = [
-        r'(?<=^ctx\(\)\.)(\b%s\b)(?!\()\.?' % _regex_var,                   # extract x in ctx().x
-        r'(?<=^ctx\()(\b%s\b)(?=\))\.?' % _regex_var,                       # extract x in ctx(x)
-        r'(?<=^ctx\(\')(\b%s\b)(?=\'\))\.?' % _regex_var,                   # extract x in ctx('x')
-        r'(?<=^ctx\(")(\b%s\b)(?="\))\.?' % _regex_var                      # extract x in ctx("x")
+        r'(?<=\bctx\(\)\.)({})\b(?!\()\.?'.format(_regex_var),              # extract x in ctx().x
+        r'(?:\bctx\(({})\))'.format(_regex_var),                            # extract x in ctx(x)
+        r'(?:\bctx\(\'({})\'\))'.format(_regex_var),                        # extract x in ctx('x')
+        r'(?:\bctx\("({})"\))'.format(_regex_var)                           # extract x in ctx("x")
     ]
 
     _engine = yaql.language.factory.YaqlFactory().create()

orquesta/tests/unit/expressions/test_facade_jinja_ctx_by_dot_notation.py

@@ -20,8 +20,9 @@ class JinjaFacadeVariableExtractionTest(test_base.ExpressionFacadeEvaluatorTest)
 
     def test_empty_extraction(self):
         expr = (
-            '{{ just_text and _not_a_var and fooctx(foo) and fooctx("bar") and fooctx(\'fu\') '
-            'and ctx(). and ctx().() and ctx().-foobar and ctx().foobar() }}')
+            '{{ just_text and $not_a_var and notctx().bar and '
+            'ctx(). and ctx().() and ctx().-foobar and ctx().foobar() }}'
+        )
 
         self.assertListEqual([], expr_base.extract_vars(expr))
 

orquesta/tests/unit/expressions/test_facade_jinja_ctx_by_function_arg.py

@@ -23,7 +23,10 @@ def test_empty_extraction(self):
             '{{ just_text and $not_a_var and '
             'notctx(foo) and notctx("bar") and notctx(\'fu\') '
             'ctx("foo\') and ctx(\'foo") and ctx(foo") and '
-            'ctx("foo) and ctx(foo\') and ctx(\'foo) and ctx(-foobar) }}'
+            'ctx("foo) and ctx(foo\') and ctx(\'foo) and '
+            'ctx(-foo) and ctx("-bar") and ctx(\'-fu\') and '
+            'ctx(foo.bar) and ctx("foo.bar") and ctx(\'foo.bar\') and '
+            'ctx(foo()) and ctx("foo()") and ctx(\'foo()\') }}'
         )
 
         self.assertListEqual([], expr_base.extract_vars(expr))

orquesta/tests/unit/expressions/test_facade_yaql_ctx_by_dot_notation.py

@@ -19,7 +19,10 @@
 class YAQLFacadeVariableExtractionTest(test_base.ExpressionFacadeEvaluatorTest):
 
     def test_empty_extraction(self):
-        expr = '<% just_text and $not_a_var and fooctx(foo) and fooctx("bar") and fooctx(\'fu\') %>'
+        expr = (
+            '<% just_text and $not_a_var and notctx().bar and '
+            'ctx(). and ctx().() and ctx().-foobar and ctx().foobar() %>'
+        )
 
         self.assertListEqual([], expr_base.extract_vars(expr))
 

orquesta/tests/unit/expressions/test_facade_yaql_ctx_by_function_arg.py

@@ -23,7 +23,10 @@ def test_empty_extraction(self):
             '<% just_text and $not_a_var and '
             'notctx(foo) and notctx("bar") and notctx(\'fu\') '
             'ctx("foo\') and ctx(\'foo") and ctx(foo") and '
-            'ctx("foo) and ctx(foo\') and ctx(\'foo) %>'
+            'ctx("foo) and ctx(foo\') and ctx(\'foo) and '
+            'ctx(-foo) and ctx("-bar") and ctx(\'-fu\') and '
+            'ctx(foo.bar) and ctx("foo.bar") and ctx(\'foo.bar\') and '
+            'ctx(foo()) and ctx("foo()") and ctx(\'foo()\') %>'
         )
 
         self.assertListEqual([], expr_base.extract_vars(expr))

orquesta/tests/unit/expressions/test_jinja_ctx_by_dot_notation.py

@@ -23,7 +23,7 @@ def setUpClass(cls):
         super(JinjaVariableExtractionTest, cls).setUpClass()
 
     def test_empty_extraction(self):
-        expr = '{{ just_text and _not_a_var and fooctx().bar }}'
+        expr = '{{ just_text and $not_a_var and notctx().bar }}'
 
         self.assertListEqual([], self.evaluator.extract_vars(expr))
 

orquesta/tests/unit/expressions/test_jinja_ctx_by_function_arg.py

@@ -23,7 +23,7 @@ def setUpClass(cls):
         super(JinjaVariableExtractionTest, cls).setUpClass()
 
     def test_empty_extraction(self):
-        expr = '{{ just_text and _not_a_var and fooctx(foo) and fooctx("bar") and fooctx(\'fu\') }}'
+        expr = '{{ just_text and $not_a_var and notctx(foo) and notctx("bar") and notctx(\'fu\') }}'
 
         self.assertListEqual([], self.evaluator.extract_vars(expr))
 

orquesta/tests/unit/expressions/test_yaql_ctx_by_dot_notation.py

@@ -23,7 +23,7 @@ def setUpClass(cls):
         super(YAQLVariableExtractionTest, cls).setUpClass()
 
     def test_empty_extraction(self):
-        expr = '<% just_text and $not_a_var and fooctx().bar %>'
+        expr = '<% just_text and $not_a_var and notctx().bar %>'
 
         self.assertListEqual([], self.evaluator.extract_vars(expr))
 

orquesta/tests/unit/expressions/test_yaql_ctx_by_function_arg.py

@@ -23,7 +23,7 @@ def setUpClass(cls):
         super(YAQLVariableExtractionTest, cls).setUpClass()
 
     def test_empty_extraction(self):
-        expr = '<% just_text and $not_a_var and fooctx(foo) and fooctx("bar") and fooctx(\'fu\') %>'
+        expr = '<% just_text and $not_a_var and notctx(foo) and notctx("bar") and notctx(\'fu\') %>'
 
         self.assertListEqual([], self.evaluator.extract_vars(expr))