rbbt-rest 1.3.30 → 1.3.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70eadc019665982b6532c66001097037f05aa48f
-  data.tar.gz: 714e805b544731a3bbd8131cd89afe359f3cfcf1
+  metadata.gz: 0208f7fc3e2046cb4ddd0124670584543dddf184
+  data.tar.gz: feb9543f611a596b3dc4ffef0d0148b7184640aa
 SHA512:
-  metadata.gz: c0e871bebff8a59fbedcebd28719f17cdca4a1be53a3db53a505419f4c363f0bb8951cef0fabe9b28d583992259cd8cba1c0ccf0682deb2e0b102cdccce4c546
-  data.tar.gz: f3b3b9168038e51817a6dec862686aa42917a6a6f087c3350d180336774356edd7db22f1c11c03e317c3c3056fac989c64231d9bb1cac58205e82f6b0ca29638
+  metadata.gz: 18c475e2ff1394fe4e3fb36619e546ab28be15db6d2581286381217e3201e0353e905997f51f3afc9c757fa1aaa9e5b28df322a4dabacaf08bde3d1a389388e5
+  data.tar.gz: 0e7ebfce95a3c73df346d73e3969c885c1ec6bff560a2c6c5d676945788adc0526cf2778f7426bd58b9d87fb89cc4524b12adbe74ae0218e833fd79a3ba837be

data/lib/rbbt/rest/knowledge_base/helpers.rb

@@ -44,14 +44,16 @@ module KnowledgeBaseRESTHelpers
 
                                        kb.syndicate Genomics.knowledge_base, :genomics
 
-                                       TSV.traverse user_studies[user], :cpus => 10 do |study|
-                                         Study.setup(study)
-                                         study.sample_genes if study.has_genotypes?
-                                       end 
+                                       if defined? user_studies
+                                         TSV.traverse user_studies[user], :cpus => 10 do |study|
+                                           Study.setup(study)
+                                           study.sample_genes if study.has_genotypes?
+                                         end 
 
-                                       user_studies[user].each do |study|
-                                         Study.setup(study)
-                                         kb.syndicate study.knowledge_base, study
+                                         user_studies[user].each do |study|
+                                           Study.setup(study)
+                                           kb.syndicate study.knowledge_base, study
+                                         end
                                        end
 
                                        kb

data/lib/rbbt/rest/main.rb

@@ -100,7 +100,7 @@ module Sinatra
 
         get '/files/:filename' do
           cache_control :public, :max_age => 360000 if production?
-          file = File.join(settings.file_dir, params[:filename])
+          file = settings.file_dir[params[:filename]].find
           send_file file
         end
 
@@ -156,7 +156,7 @@ module Sinatra
           content_type "text/html"
           layout_file = locate_template('layout')
           Haml::Engine.new(Open.read(layout_file), :filename => layout_file).render(self) do
-            Open.read(File.join(settings.permalink_dir, params[:id]))
+            settings.permalink_dir[params[:id]].read
           end
         end
 

data/share/views/layout/top_menu.haml

@@ -11,7 +11,7 @@
     %li.favourites.hide(hide-title="Favs")
       = partial_render('layout/top_menu/favourites')
 
-  - if settings.finder and settings.finder.instances.any?
+  - if settings.respond_to?(:finder) and settings.finder and settings.finder.instances.any?
     %li.find.hide(hide-title="Find")
       = partial_render('layout/top_menu/finder')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.3.30
+  version: 1.3.31
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake