rbbt-rest 1.8.89 → 1.8.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5820902c44bac061c51f34df2b5a55d39f0efebf
-  data.tar.gz: 661ea3f59f39899f6a947eec590c63bde4a39a0e
+  metadata.gz: e16ca3f631d2b504a762372d13b12b90fc8073ea
+  data.tar.gz: 04fe4ec7d2f31df22edd1dc36fff131d831a3822
 SHA512:
-  metadata.gz: 10e76e4069872cd0a17df81ced102b335efa294e0f3f16d293bef4b89613bb056b9b5be08a39c080ffae86884bc4e126d7c0fbb62356391dba9036a8cd3a16bd
-  data.tar.gz: ebd8ee95d45ac227308c8ef806374da53ac3b537c6a64f528612a822ab70ffbc39a54acb21fc72aa6ea8acfec0fdc463a47d7f533a36dc396b84ee39a54f2720
+  metadata.gz: 02ec6c8cf370f99cad6ebb2d40a8eb89d8771091db200d901d16c20637430506d8119be64716528dfb5c3611a0295681f1a8e6a193ade205a31d65f01d50d2d6
+  data.tar.gz: 49c80952a708c20189b312c6e839925bf3c05a4ce4fda3472ff3fe81cdba1fdeab20040d96c88c14bc735eaeb4e9a503ec24d0d0b940f32c5b3fc1232a6f42b1

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

@@ -42,7 +42,7 @@ module RbbtRESTHelpers
   end
 
   def wait_on(job, layout = nil)
-    3.times do
+    3.times do |rep|
       raise RbbtRESTHelpers::Retry if job.done? or job.error?
       sleep 1
     end
@@ -75,8 +75,8 @@ module RbbtRESTHelpers
       Tilt::HamlTemplate.new(layout_file, :filename => layout_file).render(self, locals) do
         Log.debug{ "Rendering #{template_file} with layout #{Misc.fingerprint cache_options}" }
         cache(cache, locals.merge(:_template_file => template_file, :user => user).merge(cache_options)) do
-          if locals[:result].nil? && Step === locals[:job]
-            res = locals[:job].load 
+          if locals[:result] == :load && Step === locals[:job]
+            res = locals[:job].load
             locals[:result] = res
           end
           if Open.exists?(documentation_file)

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

@@ -116,7 +116,7 @@ module WorkflowRESTHelpers
 
     case format.to_sym
     when :html
-      show_result_html nil, workflow, task, job.name, job, params
+      show_result_html :load, workflow, task, job.name, job, params
     when :table
       halt 200, tsv2html(job.path, :url => "/" << [workflow.to_s, task, job.name] * "/")
     when :entities

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.89
+  version: 1.8.90
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake