rbbt-rest 1.3.30 → 1.3.31

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 70eadc019665982b6532c66001097037f05aa48f
4
- data.tar.gz: 714e805b544731a3bbd8131cd89afe359f3cfcf1
3
+ metadata.gz: 0208f7fc3e2046cb4ddd0124670584543dddf184
4
+ data.tar.gz: feb9543f611a596b3dc4ffef0d0148b7184640aa
5
5
  SHA512:
6
- metadata.gz: c0e871bebff8a59fbedcebd28719f17cdca4a1be53a3db53a505419f4c363f0bb8951cef0fabe9b28d583992259cd8cba1c0ccf0682deb2e0b102cdccce4c546
7
- data.tar.gz: f3b3b9168038e51817a6dec862686aa42917a6a6f087c3350d180336774356edd7db22f1c11c03e317c3c3056fac989c64231d9bb1cac58205e82f6b0ca29638
6
+ metadata.gz: 18c475e2ff1394fe4e3fb36619e546ab28be15db6d2581286381217e3201e0353e905997f51f3afc9c757fa1aaa9e5b28df322a4dabacaf08bde3d1a389388e5
7
+ data.tar.gz: 0e7ebfce95a3c73df346d73e3969c885c1ec6bff560a2c6c5d676945788adc0526cf2778f7426bd58b9d87fb89cc4524b12adbe74ae0218e833fd79a3ba837be
@@ -44,14 +44,16 @@ module KnowledgeBaseRESTHelpers
44
44
 
45
45
  kb.syndicate Genomics.knowledge_base, :genomics
46
46
 
47
- TSV.traverse user_studies[user], :cpus => 10 do |study|
48
- Study.setup(study)
49
- study.sample_genes if study.has_genotypes?
50
- end
47
+ if defined? user_studies
48
+ TSV.traverse user_studies[user], :cpus => 10 do |study|
49
+ Study.setup(study)
50
+ study.sample_genes if study.has_genotypes?
51
+ end
51
52
 
52
- user_studies[user].each do |study|
53
- Study.setup(study)
54
- kb.syndicate study.knowledge_base, study
53
+ user_studies[user].each do |study|
54
+ Study.setup(study)
55
+ kb.syndicate study.knowledge_base, study
56
+ end
55
57
  end
56
58
 
57
59
  kb
@@ -100,7 +100,7 @@ module Sinatra
100
100
 
101
101
  get '/files/:filename' do
102
102
  cache_control :public, :max_age => 360000 if production?
103
- file = File.join(settings.file_dir, params[:filename])
103
+ file = settings.file_dir[params[:filename]].find
104
104
  send_file file
105
105
  end
106
106
 
@@ -156,7 +156,7 @@ module Sinatra
156
156
  content_type "text/html"
157
157
  layout_file = locate_template('layout')
158
158
  Haml::Engine.new(Open.read(layout_file), :filename => layout_file).render(self) do
159
- Open.read(File.join(settings.permalink_dir, params[:id]))
159
+ settings.permalink_dir[params[:id]].read
160
160
  end
161
161
  end
162
162
 
@@ -11,7 +11,7 @@
11
11
  %li.favourites.hide(hide-title="Favs")
12
12
  = partial_render('layout/top_menu/favourites')
13
13
 
14
- - if settings.finder and settings.finder.instances.any?
14
+ - if settings.respond_to?(:finder) and settings.finder and settings.finder.instances.any?
15
15
  %li.find.hide(hide-title="Find")
16
16
  = partial_render('layout/top_menu/finder')
17
17
 
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.3.30
4
+ version: 1.3.31
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-08-26 00:00:00.000000000 Z
11
+ date: 2014-08-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake