rbbt-rest 1.8.21 → 1.8.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 185572829398c880b3d6cb1e2a6d4dea0ae6ca9f
-  data.tar.gz: bb37ea54b1cefc0c4802b3d8c45d0ad350ad8cde
+  metadata.gz: 82ab99a5133a3eba0aaf98b8a879731a1a7c02bb
+  data.tar.gz: ed7dc36bca321757748453f5762f7cedd6cf7ceb
 SHA512:
-  metadata.gz: fafe374d7bbc2f9100c39d7a9981ae89bd855c29262696c25fc325eadc157a17e443aa2cab0f448f8211d6cefca7ae0115f24607ed4fc32fe4b14325f05c7a92
-  data.tar.gz: 3ded826d68949dbb5e61b9690825ffec277ccbbd488f3dbbbad35a5166c454ecb24ae6198e445d8257ee4235e86937de2f045d3f154ba48f0d781745a90c022c
+  metadata.gz: 8bc2a80796fce8d40a78d4bb84e552a6c58d080916c89abe16f626483692f54856bcd712cfd00c865c44d166afa0a9d1696dc65b66c712190e695b6df47fff39
+  data.tar.gz: 6b74f5496ff80d8279daa74cfb39d13cb9420cfbaf9331561a7b86e7d1302b250bae6b0a7bef40f798503727345038104f619cf91c336d74f5229e29953908d2

data/lib/rbbt/rest/common/table.rb

@@ -236,7 +236,9 @@ module RbbtRESTHelpers
         if length
           old_tsv = tsv
           tsv = tsv.reorder(:key, key).add_field "LENGTH" do |k,values|
-            NamedArray === values ? values[key].length.to_s : values.length.to_s
+            NamedArray === values ? 
+              (values[key] ? values[key].length.to_s : "0") : 
+              values.length.to_s
           end
           key = "LENGTH"
         end

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

@@ -2,7 +2,7 @@ module WorkflowRESTHelpers
   attr_accessor :workflow_resources
 
   def self.workflow_resources
-    @workflow_resources ||= [Rbbt.share.views.find(:lib)]
+    @@workflow_resources ||= [Rbbt.share.views.find(:lib)]
   end
 
   def workflow_resources

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

@@ -25,7 +25,10 @@ module WorkflowRESTHelpers
       locals[:job] = job 
       @step = job
       cache_type = execution_type(workflow, task)
-      cache_file = job.file('html')
+      server_key = $app_name
+      html_dir = job.file('html')
+      FileUtils.mkdir_p html_dir.find unless File.exists? html_dir.find
+      cache_file = html_dir[server_key]
       render(template_file, locals, layout_file, [task,workflow,job.name] * "-", :cache_type => cache_type, :cache_file => cache_file)
     else
       render(template_file, locals, layout_file, [workflow, task, template_file].compact * "-", :cache_type => :async )

data/share/views/job_result/job_control.haml

@@ -7,6 +7,8 @@
       %a.ui.small.button(href="/#{[workflow.to_s, task, jobname] * "/"}?_format=raw") get raw result file
 
   - files = job.files - ["html", "html.files", "html.info", "html.pid"]
+  - files.reject!{|f| File.basename(File.dirname(f)) == "html"}
+
   - if files.any?
     %dt.ui.header Files
     %dd.job_files

metadata

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