rbbt-rest 1.2.4 → 1.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWNkNTZiYWU3YzIxODE2YjhiNWIwNzY1M2IxOGExZDIyMWY2MTQ3OQ==
+    ZDE0NjcyMTdiNWZhZDU5OWUyOTdhODI5NTg4ZmYzZDQwNzNkN2FmNw==
   data.tar.gz: !binary |-
-    Y2UxZGU1MDQyMjMwN2FkNTBlMjQxNmY5MzI0NGE1ZDQxYjNkZjJjMA==
+    MjNmOThiNmMyNGRmYjkwNTBiNjcwNjI1YmNhMjE1MThlNzI0NGNhOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWI2NzZjN2UyMjkyNGVkZmU2NjMzNzZjMjM2MjljYWQwZGEzNDdkZWQzZTYy
-    NDFhMDMwZjRiNmNhOWRhNGQxMzM4M2Y5OGZhMzk2Yjk5OTVhMjQ5NjZmY2M1
-    ZmU2OWEyZGE4YzkwZTM2YzhkN2I2MWEzNWI4NjQ0ODE3NzM5MDg=
+    NjgwMjBhMzgyYzVmZDc1ODc0NzE5MmUzNGUyODI4MzYzMGFjMDA5NTI0NzNl
+    ODJiZjA5ODU4MDFmNzhmNTdlODdiNjgwNDA0ZDVlYzNjYjY1ZjUxZjUxYjRl
+    MmE5ZGQ1ZTQ4ZDdjNzcyNDc0YjhlZWIwOWYyNDM1MWFiMzc1ZTc=
   data.tar.gz: !binary |-
-    ODg3ODliYmUwYzlmZmVjMThhMWFhNTk1YjI0ZTg1YjRjODhjYWM1Nzc4Yzdi
-    YmQyZDU4MTkwNzRiZmQ0YzMzOTUwOWJiMTNiNjM2OGIzNzI1NGI0ZjEwNzdj
-    YWY4YTUwMmExMWEwNTRmZjUxODNjN2Y5YzJiOTM3M2NkMTE0MjU=
+    ZjBhYWUzNzZkZmQzYTllN2E4MDUzZTM0NDc2YTg4N2FlODNiYmI4Mjg0OGEx
+    ZDU5ZjZjODhkZTllNjVkNDZmYzE2ZGFjNjc1NDk0MjU3MzU0YTQyZjRmOGE5
+    YjMyYjlhNjhhOGRmOWE2ZjdlZDYxNzkzMDNhZmE2ZGE2YjI4YWM=

data/lib/rbbt/rest/common/cache.rb

@@ -78,7 +78,6 @@ module RbbtRESTHelpers
           tsv.excel(excel_file, :name => @excel_use_name,:sort_by => @excel_sort_by, :sort_by_cast => @excel_sort_by_cast)
           send_file excel_file, :type => 'application/vnd.ms-excel', :filename => 'table.xls'
         else
-          cache_control :public, :max_age => 360000 if production?
           send_file fragment_file
         end
       else
@@ -128,7 +127,6 @@ module RbbtRESTHelpers
         when send_file
           send_file step.path
         else
-          cache_control :public, :max_age => 360000 if production?
           step.load
         end
       else

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

@@ -26,33 +26,35 @@ module KnowledgeBaseRESTHelpers
   end
 
   def get_kb(name)
-    @knowledge_bases ||= IndiferentHash.setup({})
+    @@knowledge_bases ||= IndiferentHash.setup({})
     case name
     when :genomics, "genomics"
-      @knowledge_bases[name] ||= Genomics.knowledge_base
+      @@knowledge_bases[name] ||= Genomics.knowledge_base
     else
-      @knowledge_bases[name] ||= KnowledgeBase.new File.join(KnowledgeBaseRESTHelpers.knowledge_base_dir, name)
+      @@knowledge_bases[name] ||= KnowledgeBase.new File.join(KnowledgeBaseRESTHelpers.knowledge_base_dir, name)
     end
   end
 
   def user_kb(user)
-    @user_knowledge_bases ||= IndiferentHash.setup({})
-    @user_knowledge_bases[user] ||= begin
-                                 kb = KnowledgeBase.new File.join(KnowledgeBaseRESTHelpers.knowledge_base_dir, File.join('user', user))
+    @@user_knowledge_bases ||= IndiferentHash.setup({})
+    @@user_knowledge_bases[user] ||= begin
+                                       kb = KnowledgeBase.new File.join(KnowledgeBaseRESTHelpers.knowledge_base_dir, File.join('user', user)), "Hsa/jan2013"
+                                       kb.format["Gene"] = "Ensembl Gene ID"
 
-                                 kb.syndicate Genomics.knowledge_base, :genomics
+                                       kb.syndicate Genomics.knowledge_base, :genomics
 
-                                 user_studies[user].each do |study|
-                                   kb.syndicate study.knowledge_base, study
-                                 end
+                                       user_studies[user].each do |study|
+                                         next if study.all_mutations.length > 50_000
+                                         kb.syndicate study.knowledge_base, study
+                                       end
 
-                                 kb
-                               end
+                                       kb
+                                     end
   end
 
   def get_knowledge_base(name, namespace = nil)
-    @knowledge_bases ||= IndiferentHash.setup({})
-    @knowledge_bases[name] ||= begin
+    @@knowledge_bases ||= IndiferentHash.setup({})
+    @@knowledge_bases[name] ||= begin
                                  kb = case 
                                       when [:genomics, "genomics"].include?(name)
                                         Genomics.knowledge_base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Miguel Vazquez