fix jq pub

yadage · Jan 12, 2018 · e175144 · e175144
1 parent f239e85
commit e175144
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/packtivity/handlers/publisher_handlers.py b/packtivity/handlers/publisher_handlers.py
@@ -53,7 +53,6 @@ def fromyaml_pub_handler(publisher,parameters,state):
 
 @publisher('fromparjq-pub')
 def fromparjq_pub(publisher,parameters,state):
-    inputjson = parameters
     result = parameters.jq(publisher['script'])
     for path,value in result.leafs():
         ## if the leaf value is not stringy or no state to operate on, ignore
@@ -78,9 +77,10 @@ def fromparjq_pub(publisher,parameters,state):
             globresult = glob2.glob(searchval)
             if globresult:
                 value = globresult
-        path.set(result,value)
+        result.replace(path, value)
     return result
 
+
 @publisher('fromglob-pub')
 def glob_pub_handler(publisher,parameters,state):
     workdir = state.readwrite[0]

diff --git a/packtivity/typedleafs.py b/packtivity/typedleafs.py
@@ -104,6 +104,8 @@ def _load_from_string(self,jsonstring, typed = True, idleafs = False):
     def _dump_to_string(self,data):
         return json.dumps(data, default = self._leafmodel.dumper)
 
+    def replace(self, path, value):
+        path.set(self.json(), value)
 
     ### representation methods
     def json(self):

diff --git a/tests/test_publishers.py b/tests/test_publishers.py
@@ -1,4 +1,5 @@
 from packtivity.handlers.publisher_handlers import handlers
+from packtivity.typedleafs import TypedLeafs
 
 def test_parpub(tmpdir,basic_localfs_state):
 	pub = {
@@ -79,6 +80,7 @@ def test_fromparjq_pub(tmpdir,basic_localfs_state):
 	pars = {
 		'mypar': 'myvalue'
 	}
+	pars = TypedLeafs(pars)
 	pubbed = handlers['fromparjq-pub']['default'](pub,pars,basic_localfs_state)
 	filelist = map(str,[tmpdir.join('hello_myvalue_1.txt'),tmpdir.join('hello_myvalue_2.txt')])
 	assert set(pubbed['hello']) == set(filelist)
@@ -96,8 +98,10 @@ def test_fromparjq_pub_relative(tmpdir,basic_localfs_state):
 	pars = {
 		'mypar': 'myvalue'
 	}
+	pars = TypedLeafs(pars)
 	pubbed = handlers['fromparjq-pub']['default'](pub,pars,basic_localfs_state)
 	filelist = map(str,[tmpdir.join('hello_myvalue_1.txt'),tmpdir.join('hello_myvalue_2.txt')])
+	assert set(pubbed['hello']) == set(filelist)
 
 
 def test_glob_pub(tmpdir,basic_localfs_state):