rbbt-rest 1.8.32 → 1.8.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc8e0ad6d95947ae667ea5612d2e43426356d7fc
-  data.tar.gz: c3fb0452be95c7c364c0c7f4613599d109f41280
+  metadata.gz: aff555891484b75d38d4b59f6fa94aa7308bf824
+  data.tar.gz: f9207a7c427fd0382fa2fb886b1e6dc47fb73e2e
 SHA512:
-  metadata.gz: 7a39687837b66dd779aecb8d13f6e4f668141196b4eb1fac2b34474c5231244232943c2198caf31ec66ac21a49b2c4921a50ef9e12a16f85de41e4c202dc9ee2
-  data.tar.gz: d9722b304c146f4a9f16eb8f1779601d55b65d8a3cf018441e016e08b4b67f53895ec354ab6e502868e5d3fc9a7df1fde1f8f794572ae49998f83c46d2bcaab3
+  metadata.gz: de4e9a33eaebbe627dc1868ad942326c496f5a85ecf9373ad27294aa6f9d4a052e8f85506d62f05d2a69969101cfa6733fde3ad7af6ca2722f281d2e4efad468
+  data.tar.gz: 6ec43b3fe9076f12557731445113ab27634299e45fb9dc641fc6ae104de2de3a5447d26adce2a48ae6fe343f6930d2d11bfae721b386132fddb14fc0e27dd368

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

@@ -24,7 +24,16 @@ module WorkflowRESTHelpers
   end
 
   def complete_input_set(workflow, task, inputs)
-    (inputs.keys.sort - [:jobname]) === workflow.task_info(task.to_sym)[:inputs].sort
+    given = []
+    inputs.each do |key,value|
+      next if value.nil?
+      given << key.to_s
+    end
+    given = given.sort
+
+    taken = (workflow.task_info(task.to_sym)[:inputs].collect{|i| i.to_s} + ['jobname']).uniq.sort 
+
+    given === taken 
   end
 
   def type_of_export(workflow, task)
@@ -57,7 +66,8 @@ module WorkflowRESTHelpers
     task_inputs = {}
     inputs.each do |input|
       stream = input_options.include?(input) and input_options[input][:stream]
-      task_inputs[input] = prepare_input(params, input, input_types[input], stream)
+      value = prepare_input(params, input, input_types[input], stream)
+      task_inputs[input] = value
     end
 
     task_inputs
@@ -135,7 +145,16 @@ module WorkflowRESTHelpers
       job.path ? send_file(job.path) : halt(200, job.load.to_s)
     when :literal, :raw
       content_type "text/plain"
-      job.path ? send_file(job.path) : halt(200, job.load.to_s)
+      path = job.path
+      if job.path
+        if Open.remote? job.path
+          Open.open(job.path, :nocache => true)
+        else
+          send_file(job.path)
+        end
+      else
+        halt(200, job.load.to_s)
+      end
     when :binary
       content_type "application/octet-stream"
       job.path ? send_file(job.path) : halt(200, job.load.to_s)
@@ -203,9 +222,6 @@ module WorkflowRESTHelpers
       end
 
       begin
-        job_url = to(File.join("/", workflow.to_s, task, job.name)) 
-        job_url += "?_format=#{@format}" if @format
-
         if not job.started?
           job.run
           job.join
@@ -214,6 +230,8 @@ module WorkflowRESTHelpers
         if format == :jobname
           job.name
         else
+          job_url = job.respond_to?(:url)? job.url : to(File.join("/", workflow.to_s, task, job.name)) 
+          job_url += "?_format=#{@format}" if @format
           redirect job_url
         end
       rescue Exception
@@ -229,16 +247,14 @@ module WorkflowRESTHelpers
       begin
         job.fork(true) unless job.started?
 
-        job_url = to(File.join("/", workflow.to_s, task, job.name)) 
-        job_url += "?_format=#{@format}" if @format
         if format == :jobname
-          while not File.exists? job.info_file
-            sleep 1
-          end
+          job.soft_grace
           content_type :text
           job.name
         else
           job.soft_grace
+          job_url = job.respond_to?(:url)? job.url : to(File.join("/", workflow.to_s, task, job.name)) 
+          job_url += "?_format=#{@format}" if @format
           redirect job_url
         end
       rescue Exception

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

@@ -164,6 +164,10 @@ rbbt.job = function(workflow, task, inputs,json){
   return job.run(json)
 }
 
-rbbt_job = function(workflow, task, inputs, complete){
-  rbbt.job(workflow, task, inputs).then(complete)
+rbbt_job = function(workflow, task, inputs, json, complete){
+  if (undefined === complete && typeof json === 'function'){
+    complete = json 
+    json = undefined
+  }
+  rbbt.job(workflow, task, inputs, json).then(complete)
 }

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

@@ -143,6 +143,7 @@ rbbt.plots.graph.consolidate = function(graph_model){
   })
 
   var edges = []
+
   forHash(graph_model.associations, function(database, list){
     var list_edges = rbbt.plots.graph.consolidate_associations(list,database)
     for (i in list_edges) edges.push(list_edges[i])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.32
+  version: 1.8.34
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake