Merge pull request #18 from jmespath-community/fix/root-reference

Fix #17 - root node reference

Author: springcomp

jmespath.test

@@ -211,7 +211,7 @@ def visit_current(self, node, value):
 
     def visit_root(self, *args, **kwargs):
         if 'scopes' in kwargs:
-            return kwargs['scopes'].getValue('$')
+            return kwargs['scopes'].getRoot()
         return None
 
     def visit_expref(self, node, value):
@@ -397,8 +397,9 @@ def _visit(self, node, current):
 
 @with_str_method
 class Scopes:
-    def __init__(self):
+    def __init__(self, root):
         self._scopes = []
+        self._root = root
 
     def pushScope(self, scope):
         self._scopes.append(scope)
@@ -413,17 +414,19 @@ def getValue(self, identifier):
                 return scope[identifier]
         return None
 
+    def getRoot(self):
+        return self._root
+
     def __str__(self):
         return '{}'.format(self._scopes)
 
 
 class ScopedInterpreter(TreeInterpreter):
     def __init__(self, options = None):
         super().__init__(options)
-        self._scopes = Scopes()
 
     def evaluate(self, ast, root_scope):
-        self._scopes.pushScope({'$': root_scope})
+        self._scopes = Scopes(root_scope)
         return self.visit(ast, root_scope)
 
     def visit(self, node, *args, **kwargs):

jmespath/visitor.py

@@ -6,16 +6,15 @@
 
 class TestScope(unittest.TestCase):
     def setUp(self):
-        self._scopes = Scopes()
+        self._scopes = Scopes('root')
 
     def test_Scope_missing(self):
         value = self._scopes.getValue('foo')
         self.assertEqual(None, value)
 
     def test_Scope_root(self):
-        self._scopes.pushScope({'foo': 'bar'})
-        value = self._scopes.getValue('foo')
-        self.assertEqual('bar', value)
+        value = self._scopes.getRoot()
+        self.assertEqual('root', value)
 
     def test_Scope_nested(self):
         self._scopes.pushScope({'foo': 'bar'})