rbbt-rest 1.8.89 → 1.8.90

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5820902c44bac061c51f34df2b5a55d39f0efebf
4
- data.tar.gz: 661ea3f59f39899f6a947eec590c63bde4a39a0e
3
+ metadata.gz: e16ca3f631d2b504a762372d13b12b90fc8073ea
4
+ data.tar.gz: 04fe4ec7d2f31df22edd1dc36fff131d831a3822
5
5
  SHA512:
6
- metadata.gz: 10e76e4069872cd0a17df81ced102b335efa294e0f3f16d293bef4b89613bb056b9b5be08a39c080ffae86884bc4e126d7c0fbb62356391dba9036a8cd3a16bd
7
- data.tar.gz: ebd8ee95d45ac227308c8ef806374da53ac3b537c6a64f528612a822ab70ffbc39a54acb21fc72aa6ea8acfec0fdc463a47d7f533a36dc396b84ee39a54f2720
6
+ metadata.gz: 02ec6c8cf370f99cad6ebb2d40a8eb89d8771091db200d901d16c20637430506d8119be64716528dfb5c3611a0295681f1a8e6a193ade205a31d65f01d50d2d6
7
+ data.tar.gz: 49c80952a708c20189b312c6e839925bf3c05a4ce4fda3472ff3fe81cdba1fdeab20040d96c88c14bc735eaeb4e9a503ec24d0d0b940f32c5b3fc1232a6f42b1
@@ -42,7 +42,7 @@ module RbbtRESTHelpers
42
42
  end
43
43
 
44
44
  def wait_on(job, layout = nil)
45
- 3.times do
45
+ 3.times do |rep|
46
46
  raise RbbtRESTHelpers::Retry if job.done? or job.error?
47
47
  sleep 1
48
48
  end
@@ -75,8 +75,8 @@ module RbbtRESTHelpers
75
75
  Tilt::HamlTemplate.new(layout_file, :filename => layout_file).render(self, locals) do
76
76
  Log.debug{ "Rendering #{template_file} with layout #{Misc.fingerprint cache_options}" }
77
77
  cache(cache, locals.merge(:_template_file => template_file, :user => user).merge(cache_options)) do
78
- if locals[:result].nil? && Step === locals[:job]
79
- res = locals[:job].load
78
+ if locals[:result] == :load && Step === locals[:job]
79
+ res = locals[:job].load
80
80
  locals[:result] = res
81
81
  end
82
82
  if Open.exists?(documentation_file)
@@ -116,7 +116,7 @@ module WorkflowRESTHelpers
116
116
 
117
117
  case format.to_sym
118
118
  when :html
119
- show_result_html nil, workflow, task, job.name, job, params
119
+ show_result_html :load, workflow, task, job.name, job, params
120
120
  when :table
121
121
  halt 200, tsv2html(job.path, :url => "/" << [workflow.to_s, task, job.name] * "/")
122
122
  when :entities
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbbt-rest
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.89
4
+ version: 1.8.90
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-01-25 00:00:00.000000000 Z
11
+ date: 2018-02-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake