rbbt-rest 1.8.5 → 1.8.6

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: 3cf37f751208e4d5cbfc407fd164ae7e49022f17
4
- data.tar.gz: 773c970644b6f15df0ad6bfed8b0f1893d74362b
3
+ metadata.gz: 5b099c2c214bdd0b65d937b3bd511d74cdbdd497
4
+ data.tar.gz: 5c512ac86e663e5e92187384f1280e29d6022efe
5
5
  SHA512:
6
- metadata.gz: 1988193658bd442876356d325a0f1ac0e17aa69ee872d9f0600a18959dbffddf89761ed78c311be91298cca71c2596e03d567d3ccee58be0f7f34d499fc5abd4
7
- data.tar.gz: 00d4e4a8a07de772cbc0e2ef145b52609710011f902a769113d30f1fa043c5ca28ff60d632410ce22da17bd345204a1be5489030a079e33340032b03a5fb3d10
6
+ metadata.gz: ef988bc09d6802ebd9f935c10d4cc8cfd569207543dcf039f64b6f91af29db164aa5e65b69fbfded139fe622c97d6b09c833c0ad0c69e5422b3654fd977accb6
7
+ data.tar.gz: 05bcc8c4c36a13c0274f3cf8d0d8fa8cb22f755b0646e75a07bcdbffec6ce877f8ef55df6b23338f7c6c8f2e8ff4d2323750bd246cfbd5a1a5d644b1afb778ce
@@ -61,13 +61,13 @@ module RbbtRESTHelpers
61
61
  template_file = template_file.find if template_file.respond_to? :find
62
62
  if layout_file
63
63
  Tilt::HamlTemplate.new(layout_file, :filename => layout_file, :ugly => production?).render(self, locals) do
64
- Log.debug{ "Rendering #{template_file} with layout" }
64
+ Log.debug{ "Rendering #{template_file} with layout #{Misc.fingerprint cache_options}" }
65
65
  cache(cache, locals.merge(:_template_file => template_file, :user => user).merge(cache_options)) do
66
66
  Tilt::HamlTemplate.new(template_file, :filename => template_file, :ugly => production?).render(self, locals)
67
67
  end
68
68
  end
69
69
  else
70
- Log.debug{ "Rendering #{template_file} without layout" }
70
+ Log.debug{ "Rendering #{template_file} without layout #{Misc.fingerprint cache_options}" }
71
71
  cache(cache, locals.merge(:_template_file => template_file, :user => user).merge(cache_options)) do
72
72
  Tilt::HamlTemplate.new(template_file, :filename => template_file, :ugly => production?).render(self, locals)
73
73
  end
@@ -118,7 +118,7 @@ module Entity
118
118
 
119
119
  def link(text = nil, options = {})
120
120
  #return self.tap{|a| a.extend AnnotatedArray}.collect{|e| e.link(text, options) } if Array === self
121
- return self.collect{|e| e.link(text, options) } if Array === self
121
+ return self.collect{|e| e.nil? ? nil : e.link(text, options) } if Array === self
122
122
  return self.split(";").collect{|e| self.annotate(e).link(text, options) } * ", " if self.include? ";"
123
123
  return nil if self.empty?
124
124
 
@@ -48,8 +48,9 @@ module KnowledgeBaseRESTHelpers
48
48
  end if KnowledgeBaseRESTHelpers.syndications.any?
49
49
 
50
50
  user_studies[user].each do |study|
51
+ Study.setup(study)
51
52
  kb.syndicate study, study.knowledge_base
52
- end
53
+ end if defined? user_studies
53
54
 
54
55
  kb
55
56
  end
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.8.5
4
+ version: 1.8.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-04-15 00:00:00.000000000 Z
11
+ date: 2016-04-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake