rbbt-rest 1.2.2 → 1.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjJlNWNkNzk5Y2Q2NDIyNDI0MjNhYjcxYTQ4OTY4ZTYxYWQyNzkwYw==
+    NTFiNGIxZjQ5YjRiNWQ0MjA2NGYyODc4NzBlNWJjNjA2Mjg0YmI1OQ==
   data.tar.gz: !binary |-
-    YjllNzlmNDdmYTM4M2ViOTE3MThjM2NhNTViZWY1Y2IzZTMwZmFkNA==
+    MTgyM2I1ZTQ5YmIwMzQ5M2ZiZjBhMDhkZDA4YTA2ZGFkYmM0ODA4Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTRkYjEwOWM1YzczNjI5MTZiZWUyYTcwYjlhOTkyNjYwYTI5NDA4YzljOTE3
-    NWFmZDAyM2Y0ODk0Yzc5NjJlYWU5Yjg1YjkxOWQ2MDNhY2I5N2JkYzY3ZjEx
-    ODViNzRlODQ3NDQ1OTYzYzExZDhmMmRmY2ExODRlNTU3MWFiNjY=
+    NmRjNjhmYjNhNDY0MzkzMmEzMzU2YWIyMDQ0MGZkOTc2ZDdiYjE1OTdjZDZj
+    NDliYTBiM2Y0MTRhZTlmYjA1Nzg3MDVkNmIzZGRiMGUxNTY5ODdkMmVlYjQ0
+    OTNhOTE5NDZlMGFlNTAwNmY2NGIwYmM1MWY3ZmIxODhjNjYwZWI=
   data.tar.gz: !binary |-
-    MjA0ZDMwNzk1OGYxMjUxYzg2YmQ2ZmUyZWY3YzQ3NmVmYjVlNzkxMTExOWIx
-    MjIxYWQ1NGM1MTNiZmM3YjkxNWY4MTk0NTcyNGI5ODMyZTk3NWFiZTBmZjY5
-    NGE0MzliNGIxYTdjZWNkZjUwYWQ3ZDQ0NTgyOTJlZTM3NWY0ZGU=
+    YmFjMDkyMDJlYTFkMWY2ZDJlYzI5ZjYwZTQ0MDBjNGUyNTU0ZTFlZGM4YzM5
+    ZjY1Y2EzZTE4NjA5NjZkNTJjZmY1ZmY1ZDY3YzkwMTE2NzZhOGJiZjE3ZmQ4
+    ZjlhNzJkODExZjU2NDNkOWYzMzRmMzRlMTBiYTYyMWE5NDkwNTE=

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

@@ -35,6 +35,21 @@ module KnowledgeBaseRESTHelpers
     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))
+
+                                 kb.syndicate Genomics.knowledge_base, :genomics
+
+                                 user_studies[user].each do |study|
+                                   kb.syndicate study.knowledge_base, study
+                                 end
+
+                                 kb
+                               end
+  end
+
   def get_knowledge_base(name, namespace = nil)
     @knowledge_bases ||= IndiferentHash.setup({})
     @knowledge_bases[name] ||= begin
@@ -47,6 +62,8 @@ module KnowledgeBaseRESTHelpers
                                         KnowledgeBase.registry[name]
                                       when Study.studies.include?(name)
                                         Study.setup(name).knowledge_base
+                                      when name.to_s == "user"
+                                        user_kb(user)
                                       else
                                         KnowledgeBase.new File.join(KnowledgeBaseRESTHelpers.knowledge_base_dir, name)
                                       end
@@ -54,4 +71,5 @@ module KnowledgeBaseRESTHelpers
                                  namespace ? kb.version(namespace) : kb
                                end
   end
+
 end

data/lib/rbbt/rest/main.rb

@@ -51,7 +51,7 @@ module Sinatra
         end
 
         after do
-          Log.info("#{request.request_method} #{request.ip}: " << request.path_info << ". Params: " << Misc.fingerprint(params) << "[#{response.status}]")
+          Log.info("#{request.request_method} #{request.ip}: " << request.path_info << ". Status: " << response.status.to_s)
 
           if profile
             result = RubyProf.stop

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake