rbbt-rest 1.8.56 → 1.8.57
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/rbbt/rest/common/misc.rb +2 -0
- data/lib/rbbt/rest/common/render.rb +7 -7
- data/lib/rbbt/rest/entity.rb +1 -1
- data/lib/rbbt/rest/main.rb +0 -1
- data/lib/rbbt/rest/web_tool.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 670376b8fffcf1f42a9349e4d1c68b1c50a4ed99
|
4
|
+
data.tar.gz: c318aef5f05444056d9931be33c573f266c46b45
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a6a1f1f47c9a9ad952d47da514b6a542b716990093b39c386c9a98d629dd8521fb05a9bed4fd0f70b17ee47b154f04acfa6a92762daba08e0ca0eab8c4924870
|
7
|
+
data.tar.gz: 20e6265e6555d27f0922185c287666a10dce67495f9016e51ca6bb9ee9ff2076227acbc90e4b9b49ab519833808dce2ee5aa56575410b10662d2538fbed32e1f
|
@@ -308,6 +308,8 @@ module Haml::Filters::Documentation
|
|
308
308
|
include Haml::Filters::Base
|
309
309
|
|
310
310
|
def render(text)
|
311
|
+
text = "<br/>" if text.strip.empty?
|
312
|
+
|
311
313
|
doc_text =<<-EOF
|
312
314
|
%section.documentation#{ text.gsub(/\s/,'').length < 80 * 10 ? '.short' : ''}
|
313
315
|
:markdown
|
@@ -68,17 +68,17 @@ module RbbtRESTHelpers
|
|
68
68
|
end
|
69
69
|
|
70
70
|
if layout_file
|
71
|
-
Tilt::HamlTemplate.new(layout_file, :filename => layout_file
|
71
|
+
Tilt::HamlTemplate.new(layout_file, :filename => layout_file).render(self, locals) do
|
72
72
|
Log.debug{ "Rendering #{template_file} with layout #{Misc.fingerprint cache_options}" }
|
73
73
|
cache(cache, locals.merge(:_template_file => template_file, :user => user).merge(cache_options)) do
|
74
74
|
if Open.exists?(documentation_file)
|
75
75
|
documentation_layout_file = locate_template('documented_section').find
|
76
76
|
markdown = Open.read(documentation_file)
|
77
|
-
Tilt::HamlTemplate.new(documentation_layout_file, :filename => documentation_layout_file
|
78
|
-
Tilt::HamlTemplate.new(template_file, :filename => template_file
|
77
|
+
Tilt::HamlTemplate.new(documentation_layout_file, :filename => documentation_layout_file).render(self, :markdown => markdown) do
|
78
|
+
Tilt::HamlTemplate.new(template_file, :filename => template_file).render(self, locals)
|
79
79
|
end
|
80
80
|
else
|
81
|
-
Tilt::HamlTemplate.new(template_file, :filename => template_file
|
81
|
+
Tilt::HamlTemplate.new(template_file, :filename => template_file).render(self, locals)
|
82
82
|
end
|
83
83
|
end
|
84
84
|
end
|
@@ -88,11 +88,11 @@ module RbbtRESTHelpers
|
|
88
88
|
if Open.exists?(documentation_file)
|
89
89
|
markdown = Open.read(documentation_file)
|
90
90
|
documentation_layout_file = locate_template('documented_section').find
|
91
|
-
Tilt::HamlTemplate.new(documentation_layout_file, :filename => documentation_layout_file
|
92
|
-
Tilt::HamlTemplate.new(template_file, :filename => template_file
|
91
|
+
Tilt::HamlTemplate.new(documentation_layout_file, :filename => documentation_layout_file).render(self, :markdown => markdown) do
|
92
|
+
Tilt::HamlTemplate.new(template_file, :filename => template_file).render(self, locals)
|
93
93
|
end
|
94
94
|
else
|
95
|
-
Tilt::HamlTemplate.new(template_file, :filename => template_file
|
95
|
+
Tilt::HamlTemplate.new(template_file, :filename => template_file).render(self, locals)
|
96
96
|
end
|
97
97
|
end
|
98
98
|
end
|
data/lib/rbbt/rest/entity.rb
CHANGED
data/lib/rbbt/rest/main.rb
CHANGED
data/lib/rbbt/rest/web_tool.rb
CHANGED
@@ -6,7 +6,7 @@ module Sinatra
|
|
6
6
|
|
7
7
|
template_file = locate_template("tools/#{toolname}")
|
8
8
|
Log.debug "Loading tool #{toolname} from: #{template_file}"
|
9
|
-
content = Tilt::HamlTemplate.new(template_file, :filename => template_file
|
9
|
+
content = Tilt::HamlTemplate.new(template_file, :filename => template_file).render(self, options)
|
10
10
|
|
11
11
|
styles = begin
|
12
12
|
path = locate_sass("tools/#{toolname}")
|