rbbt-rest 1.2.13 → 1.2.14

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- NzBjNjUwZWNhNzcxNWIyOWY0MjNkZDExMTM3NTNlYzAyYzA2NDU3MQ==
4
+ MDE2OGM1YjU2Y2NkMDgzODEyNWUzZmNjZTQ2MmU2YjY5ZjMxM2YzZA==
5
5
  data.tar.gz: !binary |-
6
- NDU0OTM4YTZhNjE4NzU4NGFlNTdlN2JkMGEzOTMxNzNmOWU5ZTNjYw==
6
+ ODVkMzAzN2Q5Y2YxY2UzMTI4ZjMyMWQ1NGZiNjcyNTE4ZDVjZGIwMA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- NjQ4YWExYWQyNzVmYmY1ZmZkMTU1ODliMmRiMGE2MzE4NDBkZDcyMzdlYWYz
10
- ZDUwMmNjNDEyMmJkMzVmOWI4MGY0MmFkNTRiMzg5ZDRhOTljOTBjYzEwOTdj
11
- N2FlZDMzYmYwMzNkMDEwMThkZWUwNzE5ZGNiMmRiOWZlNjViMWI=
9
+ MDc0MjgzNzlmZDM5NGM2M2MxNWEyYTNjMGFlYWU0MDUyYzhiYzc5MjgzNTFj
10
+ ZmM2ZGNmZjhjYzIxNmY4OGViMWEzNGJhYTA3MWUyYzMwMWVlNTc2YTRhMjVm
11
+ NmVmZWZlZTVhMjUzNGJkM2Q4MmMxOGUwOWVkNjRjMDUxNTI0OTQ=
12
12
  data.tar.gz: !binary |-
13
- ZWRmN2Y4NTIxYmI4MTEyNTE0MmQ5YzZiMDMwMzBjYWI0M2NlMjNjYjgzYzVl
14
- MDhkZTNiNDdkYjBmYmMzOTZhODkzMmNhYmI4MGZmNDBjMTlmNjdiYWRmNmY1
15
- NWZjN2E4NjA5OGYzZTc0MWY1Mzg1YTIxMDE5Y2FmMzlhYmVlNTI=
13
+ MDM5NDc3ZjYwZmViMGE4NDAzZDQ1YTg1OWM5MjFjNTA3YjY1OGIyNTViZTAy
14
+ ZDliNzAxYTIxMTdjMDU2M2UwZTlhZmZhYzczYWNmYmU4N2NiMWMzYWEyODgy
15
+ NDk4MzgzNjlkYTVkMWM1YjdkNGFlODFmMmIyY2NmOWQyZTUzZjE=
@@ -22,19 +22,19 @@ class WorkflowRESTClient
22
22
  end
23
23
 
24
24
  def self.get_raw(url, params = {})
25
- Log.debug("RestClient get_raw #{}: #{ url } - #{params.inspect}")
25
+ Log.debug{ "RestClient get_raw: #{ url } - #{Misc.fingerprint params}" }
26
26
  params = params.merge({ :_format => 'raw' })
27
27
  RestClient.get(url, :params => params)
28
28
  end
29
29
 
30
30
  def self.post_jobname(url, params = {})
31
- Log.debug("RestClient post_jobname #{}: #{ url } - #{params.inspect}")
31
+ Log.debug{ "RestClient post_jobname: #{ url } - #{Mis.fingerprint params}" }
32
32
  params = params.merge({ :_format => 'jobname' })
33
33
  RestClient.post(url, params)
34
34
  end
35
35
 
36
36
  def self.get_json(url, params = {})
37
- Log.debug("RestClient get_json #{}: #{ url } - #{params.inspect}")
37
+ Log.debug{ "RestClient get_json: #{ url } - #{Misc.fingerprint params }" }
38
38
  params = params.merge({ :_format => 'json' })
39
39
  begin
40
40
  res = RestClient.get(url, :params => params)
@@ -174,7 +174,7 @@ class WorkflowRESTClient
174
174
  attr_accessor :url, :name, :exec_exports, :asynchronous_exports, :synchronous_exports
175
175
 
176
176
  def initialize(url, name)
177
- Log.debug("Loading remote workflow #{ name }: #{ url }")
177
+ Log.debug{ "Loading remote workflow #{ name }: #{ url }" }
178
178
  @url, @name = url, name
179
179
  init_remote_tasks
180
180
  end
@@ -50,6 +50,11 @@ module RbbtRESTHelpers
50
50
  when "tsv"
51
51
  content_type "text/tab-separated-values"
52
52
  halt 200, tsv_process(load_tsv(fragment_file).first).to_s
53
+ when "values"
54
+ tsv = tsv_process(load_tsv(fragment_file).first)
55
+ list = tsv.values.flatten
56
+ content_type "application/json"
57
+ halt 200, list.compact.to_json
53
58
  when "entities"
54
59
  tsv = tsv_process(load_tsv(fragment_file).first)
55
60
  list = tsv.values.flatten
@@ -134,6 +134,8 @@ module RbbtRESTHelpers
134
134
  if filter and filter.to_s != "false"
135
135
  filter.split(";;").each do |f|
136
136
  key, value = f.split("~")
137
+ next if value.nil? or value.empty?
138
+ value = Entity::REST.restore_element(value)
137
139
 
138
140
  #invert
139
141
  if value =~ /^!\s*(.*)/
@@ -11,8 +11,9 @@
11
11
  %li.favourites.hide(hide-title="Favs")
12
12
  = partial_render('layout/top_menu/favourites')
13
13
 
14
- %li.find.hide(hide-title="Find")
15
- = partial_render('layout/top_menu/finder')
14
+ - if settings.finder.instances.any?
15
+ %li.find.hide(hide-title="Find")
16
+ = partial_render('layout/top_menu/finder')
16
17
 
17
18
  %li.user.hide(hide-title="User")
18
19
  = partial_render('layout/top_menu/user')
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.2.13
4
+ version: 1.2.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-11-08 00:00:00.000000000 Z
11
+ date: 2013-11-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake