rbbt-rest 1.2.31 → 1.2.32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/lib/rbbt/rest/common/cache.rb +12 -5
- data/lib/rbbt/rest/common/misc.rb +1 -0
- data/lib/rbbt/rest/common/render.rb +9 -4
- data/lib/rbbt/rest/workflow.rb +1 -1
- data/share/views/compass/entity_card.sass +2 -4
- data/share/views/compass/rbbt/menu.sass +1 -0
- data/share/views/error.haml +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
NzEzMGEwYjRiMWZmZDBmMjVkNjFmYmQyMTBlNTVkMTNjZDJmODk1Ng==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
ZGJhN2RjODFmNjEzMzg4ODc5YTUyODM2NDhlZTFmZTJmMDE3MWU1ZQ==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
ODkzOGU0NGY3ZjgyODNmNWQ4OTAxM2EyY2RlODk1MWRhNzc3MGNlYjAzNGNk
|
10
|
+
ZjYwMWQ2MTA5ZDQ5ZGY4M2U1NzA4YjQ2MTEyNGEyYzIwNTc5MDY1MTQxZWUx
|
11
|
+
Y2UzNWE1OGE5ZDdkY2E2MjAyNzRlNTNhZjA3MDgwZDVhOWZhYzQ=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
MjM1ZDA3OWVhMTg3OGNjNGFmZTYwN2QyMTYwNzFjMjU5ZWYzNDg1NjlkOWNk
|
14
|
+
NzEzNDAyOGExM2FhYWNhNTU0MGE0MWYyODY4NzEzNmM4ZGE0YTU0YWNiMDE0
|
15
|
+
ZmU0NTNjYTQzY2NhZWIxNTA1ZWZlNjgxZGRmNWE1YjQyODQ5MGY=
|
@@ -37,6 +37,10 @@ module RbbtRESTHelpers
|
|
37
37
|
|
38
38
|
self.instance_variable_set("@step", step)
|
39
39
|
|
40
|
+
if @file
|
41
|
+
send_file step.file(@file), :filename => @file
|
42
|
+
end
|
43
|
+
|
40
44
|
# Return fragment
|
41
45
|
|
42
46
|
if @fragment
|
@@ -108,6 +112,13 @@ module RbbtRESTHelpers
|
|
108
112
|
step.clean
|
109
113
|
end
|
110
114
|
|
115
|
+
clean_url = request.url
|
116
|
+
clean_url = remove_GET_param(clean_url, :_update)
|
117
|
+
clean_url = remove_GET_param(clean_url, :_)
|
118
|
+
|
119
|
+
class << step; def url; @url; end; end
|
120
|
+
step.instance_variable_set(:@url, clean_url)
|
121
|
+
|
111
122
|
# Issue
|
112
123
|
if not step.started?
|
113
124
|
if cache_type == :synchronous or cache_type == :sync
|
@@ -117,12 +128,8 @@ module RbbtRESTHelpers
|
|
117
128
|
end
|
118
129
|
end
|
119
130
|
|
120
|
-
|
121
131
|
if update == :reload
|
122
|
-
|
123
|
-
url = remove_GET_param(url, :_update)
|
124
|
-
url = remove_GET_param(url, :_)
|
125
|
-
redirect to(url)
|
132
|
+
redirect to(clean_url)
|
126
133
|
end
|
127
134
|
|
128
135
|
# Monitor
|
@@ -1,5 +1,6 @@
|
|
1
1
|
require 'rbbt/util/misc'
|
2
2
|
require 'rbbt/rest/common/cache'
|
3
|
+
require 'tilt'
|
3
4
|
|
4
5
|
module RbbtRESTHelpers
|
5
6
|
def error_for(job, layout = nil)
|
@@ -38,16 +39,19 @@ module RbbtRESTHelpers
|
|
38
39
|
layout_file = layout_file.find if layout_file.respond_to? :find
|
39
40
|
template_file = template_file.find if layout_file.respond_to? :find
|
40
41
|
if layout_file
|
41
|
-
Haml::Engine.new(Open.read(layout_file), :filename => layout_file, :ugly => production?).render(self, locals) do
|
42
|
+
#Haml::Engine.new(Open.read(layout_file), :filename => layout_file, :ugly => production?).render(self, locals) do
|
43
|
+
Tilt::HamlTemplate.new(layout_file, :filename => layout_file, :ugly => production?).render(self, locals) do
|
42
44
|
cache(cache, locals.merge(:_template_file => template_file, :user => user).merge(cache_options)) do
|
43
45
|
Log.debug{ "Rendering #{template_file} with layout" }
|
44
|
-
Haml::Engine.new(Open.read(template_file), :filename => template_file, :ugly => production?).render(self, locals)
|
46
|
+
#Haml::Engine.new(Open.read(template_file), :filename => template_file, :ugly => production?).render(self, locals)
|
47
|
+
Tilt::HamlTemplate.new(template_file, :filename => template_file, :ugly => production?).render(self, locals)
|
45
48
|
end
|
46
49
|
end
|
47
50
|
else
|
48
51
|
cache(cache, locals.merge(:_template_file => template_file, :user => user).merge(cache_options)) do
|
49
52
|
Log.debug{ "Rendering #{template_file} without layout" }
|
50
|
-
Haml::Engine.new(Open.read(template_file), :filename => template_file, :ugly => production?).render(self, locals)
|
53
|
+
#Haml::Engine.new(Open.read(template_file), :filename => template_file, :ugly => production?).render(self, locals)
|
54
|
+
Tilt::HamlTemplate.new(template_file, :filename => template_file, :ugly => production?).render(self, locals)
|
51
55
|
end
|
52
56
|
end
|
53
57
|
end
|
@@ -82,7 +86,8 @@ module RbbtRESTHelpers
|
|
82
86
|
rescue Exception
|
83
87
|
Open.write(fragment_file + '.error', $!.message)
|
84
88
|
Open.write(fragment_file + '.backtrace', $!.backtrace * "\n") if $!.backtrace
|
85
|
-
|
89
|
+
Log.error("Error in fragment: #{ fragment_file }")
|
90
|
+
raise $!
|
86
91
|
end
|
87
92
|
}
|
88
93
|
|
data/lib/rbbt/rest/workflow.rb
CHANGED
@@ -32,7 +32,7 @@ module Sinatra
|
|
32
32
|
end
|
33
33
|
|
34
34
|
def add_workflow(workflow, add_resource = false)
|
35
|
-
raise "Provided workflow is not of type Workflow" unless Workflow === workflow
|
35
|
+
raise "Provided workflow is not of type Workflow" unless Workflow === workflow
|
36
36
|
RbbtRESTWorkflow::WORKFLOWS.push workflow unless RbbtRESTWorkflow::WORKFLOWS.include? workflow
|
37
37
|
|
38
38
|
add_workflow_resource(workflow) if add_resource
|
@@ -147,6 +147,7 @@
|
|
147
147
|
|
148
148
|
=rbbt_accordion($color_bg: $color_menu_bg, $color_text: $color_menu_text, $color_item_bg: $color_menu_item_bg, $color_item_text: $color_menu_item_text, $color_content_bg: lighten($color_menu_content_bg, 55), $color_content_text: $color_menu_content_text, $z-index: $z-index_menu_content)
|
149
149
|
+clearfix
|
150
|
+
clear: both
|
150
151
|
margin: 0
|
151
152
|
background-color: $color_bg
|
152
153
|
& > dt
|
data/share/views/error.haml
CHANGED
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.
|
4
|
+
version: 1.2.32
|
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-12-
|
11
|
+
date: 2013-12-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|