rbbt-rest 1.2.2 → 1.2.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- YjJlNWNkNzk5Y2Q2NDIyNDI0MjNhYjcxYTQ4OTY4ZTYxYWQyNzkwYw==
4
+ NTFiNGIxZjQ5YjRiNWQ0MjA2NGYyODc4NzBlNWJjNjA2Mjg0YmI1OQ==
5
5
  data.tar.gz: !binary |-
6
- YjllNzlmNDdmYTM4M2ViOTE3MThjM2NhNTViZWY1Y2IzZTMwZmFkNA==
6
+ MTgyM2I1ZTQ5YmIwMzQ5M2ZiZjBhMDhkZDA4YTA2ZGFkYmM0ODA4Zg==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- MTRkYjEwOWM1YzczNjI5MTZiZWUyYTcwYjlhOTkyNjYwYTI5NDA4YzljOTE3
10
- NWFmZDAyM2Y0ODk0Yzc5NjJlYWU5Yjg1YjkxOWQ2MDNhY2I5N2JkYzY3ZjEx
11
- ODViNzRlODQ3NDQ1OTYzYzExZDhmMmRmY2ExODRlNTU3MWFiNjY=
9
+ NmRjNjhmYjNhNDY0MzkzMmEzMzU2YWIyMDQ0MGZkOTc2ZDdiYjE1OTdjZDZj
10
+ NDliYTBiM2Y0MTRhZTlmYjA1Nzg3MDVkNmIzZGRiMGUxNTY5ODdkMmVlYjQ0
11
+ OTNhOTE5NDZlMGFlNTAwNmY2NGIwYmM1MWY3ZmIxODhjNjYwZWI=
12
12
  data.tar.gz: !binary |-
13
- MjA0ZDMwNzk1OGYxMjUxYzg2YmQ2ZmUyZWY3YzQ3NmVmYjVlNzkxMTExOWIx
14
- MjIxYWQ1NGM1MTNiZmM3YjkxNWY4MTk0NTcyNGI5ODMyZTk3NWFiZTBmZjY5
15
- NGE0MzliNGIxYTdjZWNkZjUwYWQ3ZDQ0NTgyOTJlZTM3NWY0ZGU=
13
+ YmFjMDkyMDJlYTFkMWY2ZDJlYzI5ZjYwZTQ0MDBjNGUyNTU0ZTFlZGM4YzM5
14
+ ZjY1Y2EzZTE4NjA5NjZkNTJjZmY1ZmY1ZDY3YzkwMTE2NzZhOGJiZjE3ZmQ4
15
+ ZjlhNzJkODExZjU2NDNkOWYzMzRmMzRlMTBiYTYyMWE5NDkwNTE=
@@ -35,6 +35,21 @@ module KnowledgeBaseRESTHelpers
35
35
  end
36
36
  end
37
37
 
38
+ def user_kb(user)
39
+ @user_knowledge_bases ||= IndiferentHash.setup({})
40
+ @user_knowledge_bases[user] ||= begin
41
+ kb = KnowledgeBase.new File.join(KnowledgeBaseRESTHelpers.knowledge_base_dir, File.join('user', user))
42
+
43
+ kb.syndicate Genomics.knowledge_base, :genomics
44
+
45
+ user_studies[user].each do |study|
46
+ kb.syndicate study.knowledge_base, study
47
+ end
48
+
49
+ kb
50
+ end
51
+ end
52
+
38
53
  def get_knowledge_base(name, namespace = nil)
39
54
  @knowledge_bases ||= IndiferentHash.setup({})
40
55
  @knowledge_bases[name] ||= begin
@@ -47,6 +62,8 @@ module KnowledgeBaseRESTHelpers
47
62
  KnowledgeBase.registry[name]
48
63
  when Study.studies.include?(name)
49
64
  Study.setup(name).knowledge_base
65
+ when name.to_s == "user"
66
+ user_kb(user)
50
67
  else
51
68
  KnowledgeBase.new File.join(KnowledgeBaseRESTHelpers.knowledge_base_dir, name)
52
69
  end
@@ -54,4 +71,5 @@ module KnowledgeBaseRESTHelpers
54
71
  namespace ? kb.version(namespace) : kb
55
72
  end
56
73
  end
74
+
57
75
  end
@@ -51,7 +51,7 @@ module Sinatra
51
51
  end
52
52
 
53
53
  after do
54
- Log.info("#{request.request_method} #{request.ip}: " << request.path_info << ". Params: " << Misc.fingerprint(params) << "[#{response.status}]")
54
+ Log.info("#{request.request_method} #{request.ip}: " << request.path_info << ". Status: " << response.status.to_s)
55
55
 
56
56
  if profile
57
57
  result = RubyProf.stop
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.2.2
4
+ version: 1.2.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-10-28 00:00:00.000000000 Z
11
+ date: 2013-10-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake