nimbu 0.2.8 → 0.2.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/nimbu/command/server.rb +3 -1
- data/lib/nimbu/server/base.rb +50 -8
- data/lib/nimbu/version.rb +1 -1
- metadata +21 -21
data/lib/nimbu/command/server.rb
CHANGED
|
@@ -91,7 +91,9 @@ class Nimbu::Command::Server < Nimbu::Command::Base
|
|
|
91
91
|
|
|
92
92
|
[:INT, :TERM].each do |sig|
|
|
93
93
|
trap(sig) do
|
|
94
|
-
puts
|
|
94
|
+
puts yellow("\n== Waiting for all processes to finish...")
|
|
95
|
+
Process.waitall
|
|
96
|
+
puts green("== Nimbu has ended its work " + bold("(crowd applauds!)\n"))
|
|
95
97
|
end
|
|
96
98
|
end
|
|
97
99
|
|
data/lib/nimbu/server/base.rb
CHANGED
|
@@ -40,6 +40,7 @@ module Nimbu
|
|
|
40
40
|
end
|
|
41
41
|
|
|
42
42
|
get '*' do
|
|
43
|
+
# First get the template name and necessary subtemplates
|
|
43
44
|
puts green("Getting template for #{request.fullpath}")
|
|
44
45
|
path = request.path == "/" ? request.path : request.path.gsub(/\/$/,'')
|
|
45
46
|
result = json_decode(nimbu.get_template({:path => path, :extra => params}))
|
|
@@ -51,13 +52,18 @@ module Nimbu
|
|
|
51
52
|
raise Sinatra::NotFound
|
|
52
53
|
end
|
|
53
54
|
template = result["template"].gsub(/buddha$/,'liquid')
|
|
55
|
+
# Then render everything
|
|
54
56
|
puts green("Uploading assets for template '#{template}'")
|
|
55
57
|
# Read the template file
|
|
56
58
|
template_file = File.join(Dir.pwd,'templates',template)
|
|
57
59
|
if File.exists?(template_file)
|
|
58
60
|
template_code = IO.read(template_file)
|
|
59
61
|
else
|
|
60
|
-
return
|
|
62
|
+
return render_missing_template(File.join('templates',template))
|
|
63
|
+
end
|
|
64
|
+
|
|
65
|
+
if template_code=~ /You have an Error in your HAML code/
|
|
66
|
+
return template_code
|
|
61
67
|
end
|
|
62
68
|
|
|
63
69
|
# Parse template file for a special layout
|
|
@@ -78,12 +84,51 @@ module Nimbu
|
|
|
78
84
|
return "Layout file '#{layout_file}' is missing..."
|
|
79
85
|
end
|
|
80
86
|
|
|
81
|
-
puts red("logged_in") if session[:logged_in]
|
|
82
|
-
|
|
83
87
|
# Send the templates to the browser
|
|
84
|
-
|
|
88
|
+
begin
|
|
89
|
+
response = nimbu.get_request({:path => path, :template => template_code, :layout => layout_code, :extra => params, :logged_in => session[:logged_in]})
|
|
90
|
+
results = json_decode(response)
|
|
91
|
+
return "#{results["result"]}"
|
|
92
|
+
rescue RestClient::Exception => error
|
|
93
|
+
return error.http_body
|
|
94
|
+
end
|
|
85
95
|
|
|
86
|
-
|
|
96
|
+
|
|
97
|
+
end
|
|
98
|
+
|
|
99
|
+
error 404 do
|
|
100
|
+
render_404(request.path)
|
|
101
|
+
end
|
|
102
|
+
|
|
103
|
+
protected
|
|
104
|
+
|
|
105
|
+
def render_missing_template(template)
|
|
106
|
+
@messag = ""
|
|
107
|
+
@messag += "<h1>A template file is missing!</h1>"
|
|
108
|
+
@messag += "<p>Template location: <strong>#{template}</strong></p>"
|
|
109
|
+
return render_error(@messag)
|
|
110
|
+
end
|
|
111
|
+
|
|
112
|
+
def render_404(path)
|
|
113
|
+
@messag = ""
|
|
114
|
+
@messag += "<h1>This page does not exist!</h1>"
|
|
115
|
+
@messag += "<p>Current path: <strong>#{path}</strong></p>"
|
|
116
|
+
return render_error(@messag)
|
|
117
|
+
end
|
|
118
|
+
|
|
119
|
+
def render_error(content)
|
|
120
|
+
@messag = ""
|
|
121
|
+
#@messag += "<html><head><title>ERROR IN CODE</title>"
|
|
122
|
+
#CSS for error styling.
|
|
123
|
+
@messag += "<style type = \"text/css\">"
|
|
124
|
+
@messag +="body { background-color: #fff; margin: 40px; font-family: Lucida Grande, Verdana, Sans-serif; font-size: 12px; color: #000;}"
|
|
125
|
+
@messag +="#content { border: #999 1px solid; background-color: #fff; padding: 20px 20px 12px 20px;}"
|
|
126
|
+
@messag +="h1 { font-weight: normal; font-size: 14px; color: #990000; margin: 0 0 4px 0; }"
|
|
127
|
+
@messag += "</style>"
|
|
128
|
+
@messag += "<div id=\"content\">"
|
|
129
|
+
@messag += content
|
|
130
|
+
@messag += "</div>"
|
|
131
|
+
return @messag
|
|
87
132
|
end
|
|
88
133
|
|
|
89
134
|
def json_encode(object)
|
|
@@ -102,9 +147,6 @@ module Nimbu
|
|
|
102
147
|
Nimbu::Auth.client
|
|
103
148
|
end
|
|
104
149
|
|
|
105
|
-
error 404 do
|
|
106
|
-
'This page does not exist.'
|
|
107
|
-
end
|
|
108
150
|
end
|
|
109
151
|
end
|
|
110
152
|
end
|
data/lib/nimbu/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: nimbu
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.
|
|
4
|
+
version: 0.2.9
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -13,7 +13,7 @@ date: 2012-03-16 00:00:00.000000000 Z
|
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: term-ansicolor
|
|
16
|
-
requirement: &
|
|
16
|
+
requirement: &70345210152760 !ruby/object:Gem::Requirement
|
|
17
17
|
none: false
|
|
18
18
|
requirements:
|
|
19
19
|
- - ~>
|
|
@@ -21,10 +21,10 @@ dependencies:
|
|
|
21
21
|
version: 1.0.5
|
|
22
22
|
type: :runtime
|
|
23
23
|
prerelease: false
|
|
24
|
-
version_requirements: *
|
|
24
|
+
version_requirements: *70345210152760
|
|
25
25
|
- !ruby/object:Gem::Dependency
|
|
26
26
|
name: rest-client
|
|
27
|
-
requirement: &
|
|
27
|
+
requirement: &70345210148320 !ruby/object:Gem::Requirement
|
|
28
28
|
none: false
|
|
29
29
|
requirements:
|
|
30
30
|
- - ~>
|
|
@@ -32,10 +32,10 @@ dependencies:
|
|
|
32
32
|
version: 1.6.1
|
|
33
33
|
type: :runtime
|
|
34
34
|
prerelease: false
|
|
35
|
-
version_requirements: *
|
|
35
|
+
version_requirements: *70345210148320
|
|
36
36
|
- !ruby/object:Gem::Dependency
|
|
37
37
|
name: launchy
|
|
38
|
-
requirement: &
|
|
38
|
+
requirement: &70345210143660 !ruby/object:Gem::Requirement
|
|
39
39
|
none: false
|
|
40
40
|
requirements:
|
|
41
41
|
- - ! '>='
|
|
@@ -43,10 +43,10 @@ dependencies:
|
|
|
43
43
|
version: 0.3.2
|
|
44
44
|
type: :runtime
|
|
45
45
|
prerelease: false
|
|
46
|
-
version_requirements: *
|
|
46
|
+
version_requirements: *70345210143660
|
|
47
47
|
- !ruby/object:Gem::Dependency
|
|
48
48
|
name: rubyzip
|
|
49
|
-
requirement: &
|
|
49
|
+
requirement: &70345210095020 !ruby/object:Gem::Requirement
|
|
50
50
|
none: false
|
|
51
51
|
requirements:
|
|
52
52
|
- - ! '>='
|
|
@@ -54,10 +54,10 @@ dependencies:
|
|
|
54
54
|
version: '0'
|
|
55
55
|
type: :runtime
|
|
56
56
|
prerelease: false
|
|
57
|
-
version_requirements: *
|
|
57
|
+
version_requirements: *70345210095020
|
|
58
58
|
- !ruby/object:Gem::Dependency
|
|
59
59
|
name: sinatra
|
|
60
|
-
requirement: &
|
|
60
|
+
requirement: &70345210090660 !ruby/object:Gem::Requirement
|
|
61
61
|
none: false
|
|
62
62
|
requirements:
|
|
63
63
|
- - ! '>='
|
|
@@ -65,10 +65,10 @@ dependencies:
|
|
|
65
65
|
version: '0'
|
|
66
66
|
type: :runtime
|
|
67
67
|
prerelease: false
|
|
68
|
-
version_requirements: *
|
|
68
|
+
version_requirements: *70345210090660
|
|
69
69
|
- !ruby/object:Gem::Dependency
|
|
70
70
|
name: sinatra-contrib
|
|
71
|
-
requirement: &
|
|
71
|
+
requirement: &70345210073100 !ruby/object:Gem::Requirement
|
|
72
72
|
none: false
|
|
73
73
|
requirements:
|
|
74
74
|
- - ! '>='
|
|
@@ -76,10 +76,10 @@ dependencies:
|
|
|
76
76
|
version: '0'
|
|
77
77
|
type: :runtime
|
|
78
78
|
prerelease: false
|
|
79
|
-
version_requirements: *
|
|
79
|
+
version_requirements: *70345210073100
|
|
80
80
|
- !ruby/object:Gem::Dependency
|
|
81
81
|
name: compass
|
|
82
|
-
requirement: &
|
|
82
|
+
requirement: &70345210069800 !ruby/object:Gem::Requirement
|
|
83
83
|
none: false
|
|
84
84
|
requirements:
|
|
85
85
|
- - ! '>='
|
|
@@ -87,10 +87,10 @@ dependencies:
|
|
|
87
87
|
version: '0'
|
|
88
88
|
type: :runtime
|
|
89
89
|
prerelease: false
|
|
90
|
-
version_requirements: *
|
|
90
|
+
version_requirements: *70345210069800
|
|
91
91
|
- !ruby/object:Gem::Dependency
|
|
92
92
|
name: haml
|
|
93
|
-
requirement: &
|
|
93
|
+
requirement: &70345210067160 !ruby/object:Gem::Requirement
|
|
94
94
|
none: false
|
|
95
95
|
requirements:
|
|
96
96
|
- - ! '>='
|
|
@@ -98,10 +98,10 @@ dependencies:
|
|
|
98
98
|
version: '0'
|
|
99
99
|
type: :runtime
|
|
100
100
|
prerelease: false
|
|
101
|
-
version_requirements: *
|
|
101
|
+
version_requirements: *70345210067160
|
|
102
102
|
- !ruby/object:Gem::Dependency
|
|
103
103
|
name: fssm
|
|
104
|
-
requirement: &
|
|
104
|
+
requirement: &70345214459200 !ruby/object:Gem::Requirement
|
|
105
105
|
none: false
|
|
106
106
|
requirements:
|
|
107
107
|
- - ! '>='
|
|
@@ -109,10 +109,10 @@ dependencies:
|
|
|
109
109
|
version: '0'
|
|
110
110
|
type: :runtime
|
|
111
111
|
prerelease: false
|
|
112
|
-
version_requirements: *
|
|
112
|
+
version_requirements: *70345214459200
|
|
113
113
|
- !ruby/object:Gem::Dependency
|
|
114
114
|
name: thin
|
|
115
|
-
requirement: &
|
|
115
|
+
requirement: &70345214456780 !ruby/object:Gem::Requirement
|
|
116
116
|
none: false
|
|
117
117
|
requirements:
|
|
118
118
|
- - ! '>='
|
|
@@ -120,7 +120,7 @@ dependencies:
|
|
|
120
120
|
version: '0'
|
|
121
121
|
type: :runtime
|
|
122
122
|
prerelease: false
|
|
123
|
-
version_requirements: *
|
|
123
|
+
version_requirements: *70345214456780
|
|
124
124
|
description: Client library and command-line tool to design and manage websites on
|
|
125
125
|
the Nimbu platform.
|
|
126
126
|
email:
|