rbbt-rest 1.8.97 → 1.8.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6c9bc522c1da20b8383d2096839c3114832bba3
-  data.tar.gz: 6974f5eba8ffe5e5e9572326bfe8a2b6b2bad1e5
+  metadata.gz: 488f00d56c825fadf507fad95868e0449e21ade5
+  data.tar.gz: b34f3f91597655fbff842e6a8b911216cf667f8b
 SHA512:
-  metadata.gz: a48924091212132a9a75f042937100eb432b9c43b49c5e2329af69154dd0b403cacdd7c06454a596e3a1aba4ca6cb8abbed489201c9c5f04eafd7669d08bffc0
-  data.tar.gz: effb02baf732cfe5ed9b3ffad5977d675cf0a37bbb86915e9cb2c39399c5ecbc861f45d7b4bcfafb9eedb5eb81ab5589555e2cfa060be181dc9d6dff84559fb1
+  metadata.gz: dc358f0408509bb5ad34fd95e8fcb0d0cee793089923e8d7d87e309bb24f8581827c61a4f4d54a1194cb1f622a5a1bf75406122331195c5f135fc41a6c30ca43
+  data.tar.gz: 2deef1ee1b5c50794855f27a62338019254097446dde4efaf1a042ea0a1c0e36d9fe3835dc474042d29825b52af07f0839bd3ac0ffd814997e8a4f7e3ba766f1

data/lib/rbbt/rest/workflow/jobs.rb

@@ -67,6 +67,7 @@ module WorkflowRESTHelpers
     inputs.each do |input|
       stream = input_options.include?(input) && input_options[input][:stream]
       value = prepare_input(params, input, input_types[input], stream)
+      next if value.nil?
       task_inputs[input] = value
     end
 

data/share/views/public/js/rbbt.job.js

@@ -9,6 +9,46 @@ rbbt.Job = function(workflow, task, inputs){
   this.result = m.prop()
   this.info = m.prop()
 
+  this.dependencies = function(){
+    var deferred = m.deferred()
+
+    this.get_info().then(function(info){
+      var dependencies = info.dependencies
+
+      if (dependencies === undefined || dependencies.length == 0){
+        deferred.resolve([])
+      }else{
+        var deps = [];
+        forArray(dependencies, function(elem){
+          var path = elem[2];
+          var dep = rbbt.path_job(path)
+          deps.push(dep)
+        })
+        deferred.resolve(deps)
+      }
+
+    }.bind(this))
+
+    return deferred.promise
+  }
+
+  this.files = function(){
+    var url = this.jobURL() + '/files?_format=json';
+
+    var params = {
+      url: url, 
+      method: 'GET', 
+      serialize: function(data) {return data},
+      deserialize: function(data){return JSON.parse(data)}
+    }
+
+    return rbbt.insist_request(params)
+  }
+
+  this.file = function(file){
+    return(this.jobURL() + '/file/' + file);
+  }
+
   this.exec = function(json){
     var deferred = m.deferred()
     
@@ -66,7 +106,7 @@ rbbt.Job = function(workflow, task, inputs){
       deserialize: function(value) {return value},
     }
 
-    return rbbt.insist_request(params, deferred).then(this.jobname)
+    return rbbt.insist_request(params).then(this.jobname).then(deferred.resolve, deferred.reject)
   }.bind(this)
 
   this.load = function(json){
@@ -149,6 +189,16 @@ rbbt.Job = function(workflow, task, inputs){
     return deferred.promise
   }.bind(this)
 
+  this.produce = function(){
+    var deferred = m.deferred()
+
+    this.issue().then(function(){
+      this.join().then(deferred.resolve, deferred.reject)
+    }.bind(this))
+
+    return deferred.promise
+  }.bind(this)
+
   this.success = function(callback){
     return this.run()
   }.bind(this)
@@ -171,3 +221,16 @@ rbbt_job = function(workflow, task, inputs, json, complete){
   }
   rbbt.job(workflow, task, inputs, json).then(complete)
 }
+
+rbbt.path_job = function(path){
+  var parts = path.split("/")
+
+  var workflow = parts[parts.length-3];
+  var task = parts[parts.length-2];
+  var name = parts[parts.length-1];
+
+  var dep = new rbbt.Job(workflow, task, {});
+  dep.jobname(name);
+
+  return(dep);
+}

data/share/views/public/js/rbbt.js

@@ -37,7 +37,7 @@ rbbt.mount = function(obj, component){
 }
 
 rbbt.mrender = function(mobj){
-  return render(mobj)
+  return m.render(mobj)
 }
 
 // From: https://www.sitepoint.com/currying-in-functional-javascript/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.97
+  version: 1.8.98
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake