rbbt-rest 1.8.152 → 1.8.155

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
  SHA256:
3
- metadata.gz: e27cf7773d763ae330e2be0ca5f07661f18998bf86c09249b7c5d33fc233b8d5
4
- data.tar.gz: 8cab349ccfb9525341d7779f208505b57890889706c211737d0a29538f887c69
3
+ metadata.gz: 7705afb013db60791458191ace43b542ef70882de5945fd9d18cdcc1503523b6
4
+ data.tar.gz: 235e86b1dd5ec07f84904f335e0c6bc91aceca0c7e389d12e80c346499f45320
5
5
  SHA512:
6
- metadata.gz: f3bbe0d5a8aee0611f7c780cab3b6c27fead82bef56ddd58d3c587b84e35aaeecf00cea6d722a7ea9bb8de012016779b0d2dbb52f86b904cb1f8617ed626505f
7
- data.tar.gz: 23060fe4f7650865a13034ce9e84232b74b59b37cfe1a59f747728d33b5150bf4ee77b4de87761ff49129f671fe0116a2b781cf8e04d59eac735f835c908e20e
6
+ metadata.gz: 1a5aae796d5ae2ab6bac153c609fca60f66ad66ae7491ee33b6e999b22a91d538d90ee951b3372050b833995bef654c67991888bc5a7664c20bac288a472bf9a
7
+ data.tar.gz: 572754ed9fe6f785988447c278825a02df57d9f06313016d0ab22bd2af79a86f5593d460206f7562c8c498f4a0733d99e6d8b5b24e1f63cce271e454fa894006
data/Rakefile CHANGED
@@ -20,11 +20,10 @@ begin
20
20
  gem.add_dependency('sassc')
21
21
  gem.add_dependency('json')
22
22
  gem.add_dependency('haml')
23
- gem.add_dependency('rest-client')
24
- gem.add_dependency('therubyracer')
25
23
  gem.add_dependency('sinatra-authorization')
26
24
  gem.add_dependency('sinatra-cross_origin')
27
25
  gem.add_dependency('sinatra-contrib')
26
+ #gem.add_dependency('therubyracer')
28
27
 
29
28
  # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
30
29
  gem.license = "MIT"
@@ -280,6 +280,7 @@ module RbbtRESTHelpers
280
280
  end
281
281
 
282
282
  def add_GET_param(url, param, value)
283
+ url = remove_GET_param(url, param)
283
284
  if url =~ /\?.+=/
284
285
  url + "&#{ param }=#{ value }"
285
286
  else
@@ -317,7 +317,7 @@ module RbbtRESTHelpers
317
317
 
318
318
  entity_options = options[:entity_options]
319
319
 
320
- Misc.prepare_entity(value, type, entity_options) if Entity.formats[type] and not options[:unnamed]
320
+ value = Misc.prepare_entity(value, type, entity_options) if Entity.formats[type] and not options[:unnamed]
321
321
 
322
322
  orig_value = value
323
323
  value = value.link if value.respond_to? :link and not options[:unnamed]
@@ -3,7 +3,6 @@ require 'rbbt/rest/entity/list'
3
3
 
4
4
  module Entity
5
5
  module REST
6
- USE_ENSEMBL = true
7
6
 
8
7
  REST_ENTITIES = Set.new
9
8
 
@@ -177,7 +176,6 @@ module Entity
177
176
  end
178
177
 
179
178
  def list_link(text = nil, id = nil, options = {})
180
- options = Misc.add_defaults options, :ensembl => USE_ENSEMBL
181
179
  ensembl = Misc.process_options options, :ensembl
182
180
 
183
181
  if ensembl and self.respond_to? :ensembl and self.format !~ /^Ensembl /
@@ -15,7 +15,7 @@
15
15
  - dep_status = "done" if dep.path.exists?
16
16
 
17
17
  - dep_status ||= dep.status
18
- - if ! remote && dep.file(:progress).exists?
18
+ - if ! remote && ! dep_status == 'done' && dep.file(:progress).exists?
19
19
  - pgr = dep.file(:progress).yaml
20
20
  - if pgr and pgr[:last_percent]
21
21
  - start = pgr[:start]
@@ -63,7 +63,7 @@
63
63
  - elsif Module === dep_workflow
64
64
  - wf = dep_workflow
65
65
 
66
- - if Open.remote?(dep.path)
66
+ - if remote
67
67
  - url = dep.path.split("?").first
68
68
  %a(href=url) #{ name }
69
69
 
@@ -29,7 +29,12 @@ function contract_ellipsis(elem, max){
29
29
  var links = [];
30
30
  var head = elements.slice(0, max).removeClass('long');
31
31
  head.each(function(){ links.push(this.outerHTML)})
32
- new_content = links.join(" ");
32
+
33
+ if (elements.first().hasClass('lines'))
34
+ new_content = links.join(" ");
35
+ else
36
+ new_content = links.join(", ");
37
+
33
38
  elem.html(new_content);
34
39
  }
35
40
 
@@ -1 +1 @@
1
- share/views/public/plugins/cytoscapejs/cytoscape.umd.js
1
+ ./cytoscape.umd.js
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.152
4
+ version: 1.8.155
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-07-26 00:00:00.000000000 Z
11
+ date: 2023-03-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -108,34 +108,6 @@ dependencies:
108
108
  - - ">="
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
- - !ruby/object:Gem::Dependency
112
- name: rest-client
113
- requirement: !ruby/object:Gem::Requirement
114
- requirements:
115
- - - ">="
116
- - !ruby/object:Gem::Version
117
- version: '0'
118
- type: :runtime
119
- prerelease: false
120
- version_requirements: !ruby/object:Gem::Requirement
121
- requirements:
122
- - - ">="
123
- - !ruby/object:Gem::Version
124
- version: '0'
125
- - !ruby/object:Gem::Dependency
126
- name: therubyracer
127
- requirement: !ruby/object:Gem::Requirement
128
- requirements:
129
- - - ">="
130
- - !ruby/object:Gem::Version
131
- version: '0'
132
- type: :runtime
133
- prerelease: false
134
- version_requirements: !ruby/object:Gem::Requirement
135
- requirements:
136
- - - ">="
137
- - !ruby/object:Gem::Version
138
- version: '0'
139
111
  - !ruby/object:Gem::Dependency
140
112
  name: sinatra-authorization
141
113
  requirement: !ruby/object:Gem::Requirement