RubyApp 0.0.68 → 0.0.69
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile.lock +2 -2
- data/lib/ruby_app/mixins/render_mixin.rb +19 -23
- data/lib/ruby_app/mixins/template_mixin.rb +11 -2
- data/lib/ruby_app/version.rb +1 -1
- metadata +71 -71
data/Gemfile.lock
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
RubyApp (0.0.
|
|
4
|
+
RubyApp (0.0.69)
|
|
5
5
|
BlueCloth
|
|
6
6
|
chronic
|
|
7
7
|
chronic_duration
|
|
@@ -75,7 +75,7 @@ GEM
|
|
|
75
75
|
ruby-openid (2.1.8)
|
|
76
76
|
rubyzip (0.9.5)
|
|
77
77
|
sass (3.1.12)
|
|
78
|
-
selenium-webdriver (2.
|
|
78
|
+
selenium-webdriver (2.17.0)
|
|
79
79
|
childprocess (>= 0.2.5)
|
|
80
80
|
ffi (~> 1.0.9)
|
|
81
81
|
multi_json (~> 1.0.4)
|
|
@@ -34,34 +34,30 @@ module RubyApp
|
|
|
34
34
|
end
|
|
35
35
|
|
|
36
36
|
def render(format)
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
content = Haml::Engine.new(File.read(template), :filename => template).render(self) do |*arguments|
|
|
47
|
-
if arguments.empty?
|
|
48
|
-
index == 0 ? nil : self.content_for(templates[index - 1])
|
|
49
|
-
else
|
|
50
|
-
_content = self.content_for(arguments[0])
|
|
51
|
-
if self.block_is_haml?(_content)
|
|
52
|
-
self.capture_haml(arguments, &_content)
|
|
37
|
+
templates = self.is_a?(Class) ? self.get_templates(format) : self.class.get_templates(format)
|
|
38
|
+
unless templates.empty?
|
|
39
|
+
self.init_haml_helpers
|
|
40
|
+
begin
|
|
41
|
+
yield(self) if block_given?
|
|
42
|
+
templates.each_with_index do |template, index|
|
|
43
|
+
content = Haml::Engine.new(File.read(template), :filename => template).render(self) do |*arguments|
|
|
44
|
+
if arguments.empty?
|
|
45
|
+
index == 0 ? nil : self.content_for(templates[index - 1])
|
|
53
46
|
else
|
|
54
|
-
_content
|
|
47
|
+
_content = self.content_for(arguments[0])
|
|
48
|
+
if self.block_is_haml?(_content)
|
|
49
|
+
self.capture_haml(arguments, &_content)
|
|
50
|
+
else
|
|
51
|
+
_content
|
|
52
|
+
end
|
|
55
53
|
end
|
|
56
54
|
end
|
|
55
|
+
self.content_for(template, content)
|
|
57
56
|
end
|
|
58
|
-
self.content_for(
|
|
57
|
+
return self.content_for(templates.last)
|
|
58
|
+
ensure
|
|
59
|
+
self.clear_content_for
|
|
59
60
|
end
|
|
60
|
-
|
|
61
|
-
self.content_for(templates.last)
|
|
62
|
-
|
|
63
|
-
ensure
|
|
64
|
-
self.clear_content_for
|
|
65
61
|
end
|
|
66
62
|
|
|
67
63
|
end
|
|
@@ -26,9 +26,18 @@ module RubyApp
|
|
|
26
26
|
@_exclude_parent_template_formats = formats
|
|
27
27
|
end
|
|
28
28
|
|
|
29
|
+
def get_template(format)
|
|
30
|
+
(@_template_path[format] || @_template_path[:all]).gsub(/\*/,format.to_s)
|
|
31
|
+
end
|
|
32
|
+
|
|
33
|
+
def get_cache(format)
|
|
34
|
+
template = self.get_template(format)
|
|
35
|
+
File.join(File.dirname(template), '.cache', File.basename(template))
|
|
36
|
+
end
|
|
37
|
+
|
|
29
38
|
def get_templates(format)
|
|
30
|
-
|
|
31
|
-
(
|
|
39
|
+
template = self.get_template(format)
|
|
40
|
+
(File.exists?(template) ? [template] : []).concat((!self.exclude_parent_template?(format) && self.superclass.respond_to?(:get_templates) ) ? self.superclass.get_templates(format) : [])
|
|
32
41
|
end
|
|
33
42
|
|
|
34
43
|
end
|
data/lib/ruby_app/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: RubyApp
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 149
|
|
5
5
|
prerelease:
|
|
6
6
|
segments:
|
|
7
7
|
- 0
|
|
8
8
|
- 0
|
|
9
|
-
-
|
|
10
|
-
version: 0.0.
|
|
9
|
+
- 69
|
|
10
|
+
version: 0.0.69
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Frank G. Ficnar
|
|
@@ -15,9 +15,11 @@ autorequire:
|
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
17
|
|
|
18
|
-
date: 2012-01-
|
|
18
|
+
date: 2012-01-17 00:00:00 Z
|
|
19
19
|
dependencies:
|
|
20
20
|
- !ruby/object:Gem::Dependency
|
|
21
|
+
prerelease: false
|
|
22
|
+
name: BlueCloth
|
|
21
23
|
version_requirements: &id001 !ruby/object:Gem::Requirement
|
|
22
24
|
none: false
|
|
23
25
|
requirements:
|
|
@@ -27,11 +29,11 @@ dependencies:
|
|
|
27
29
|
segments:
|
|
28
30
|
- 0
|
|
29
31
|
version: "0"
|
|
30
|
-
requirement: *id001
|
|
31
32
|
type: :runtime
|
|
32
|
-
|
|
33
|
-
name: BlueCloth
|
|
33
|
+
requirement: *id001
|
|
34
34
|
- !ruby/object:Gem::Dependency
|
|
35
|
+
prerelease: false
|
|
36
|
+
name: chronic
|
|
35
37
|
version_requirements: &id002 !ruby/object:Gem::Requirement
|
|
36
38
|
none: false
|
|
37
39
|
requirements:
|
|
@@ -41,11 +43,11 @@ dependencies:
|
|
|
41
43
|
segments:
|
|
42
44
|
- 0
|
|
43
45
|
version: "0"
|
|
44
|
-
requirement: *id002
|
|
45
46
|
type: :runtime
|
|
46
|
-
|
|
47
|
-
name: chronic
|
|
47
|
+
requirement: *id002
|
|
48
48
|
- !ruby/object:Gem::Dependency
|
|
49
|
+
prerelease: false
|
|
50
|
+
name: chronic_duration
|
|
49
51
|
version_requirements: &id003 !ruby/object:Gem::Requirement
|
|
50
52
|
none: false
|
|
51
53
|
requirements:
|
|
@@ -55,11 +57,11 @@ dependencies:
|
|
|
55
57
|
segments:
|
|
56
58
|
- 0
|
|
57
59
|
version: "0"
|
|
58
|
-
requirement: *id003
|
|
59
60
|
type: :runtime
|
|
60
|
-
|
|
61
|
-
name: chronic_duration
|
|
61
|
+
requirement: *id003
|
|
62
62
|
- !ruby/object:Gem::Dependency
|
|
63
|
+
prerelease: false
|
|
64
|
+
name: facets
|
|
63
65
|
version_requirements: &id004 !ruby/object:Gem::Requirement
|
|
64
66
|
none: false
|
|
65
67
|
requirements:
|
|
@@ -69,11 +71,11 @@ dependencies:
|
|
|
69
71
|
segments:
|
|
70
72
|
- 0
|
|
71
73
|
version: "0"
|
|
72
|
-
requirement: *id004
|
|
73
74
|
type: :runtime
|
|
74
|
-
|
|
75
|
-
name: facets
|
|
75
|
+
requirement: *id004
|
|
76
76
|
- !ruby/object:Gem::Dependency
|
|
77
|
+
prerelease: false
|
|
78
|
+
name: fileutils
|
|
77
79
|
version_requirements: &id005 !ruby/object:Gem::Requirement
|
|
78
80
|
none: false
|
|
79
81
|
requirements:
|
|
@@ -83,11 +85,11 @@ dependencies:
|
|
|
83
85
|
segments:
|
|
84
86
|
- 0
|
|
85
87
|
version: "0"
|
|
86
|
-
requirement: *id005
|
|
87
88
|
type: :runtime
|
|
88
|
-
|
|
89
|
-
name: fileutils
|
|
89
|
+
requirement: *id005
|
|
90
90
|
- !ruby/object:Gem::Dependency
|
|
91
|
+
prerelease: false
|
|
92
|
+
name: haml
|
|
91
93
|
version_requirements: &id006 !ruby/object:Gem::Requirement
|
|
92
94
|
none: false
|
|
93
95
|
requirements:
|
|
@@ -97,11 +99,11 @@ dependencies:
|
|
|
97
99
|
segments:
|
|
98
100
|
- 0
|
|
99
101
|
version: "0"
|
|
100
|
-
requirement: *id006
|
|
101
102
|
type: :runtime
|
|
102
|
-
|
|
103
|
-
name: haml
|
|
103
|
+
requirement: *id006
|
|
104
104
|
- !ruby/object:Gem::Dependency
|
|
105
|
+
prerelease: false
|
|
106
|
+
name: json
|
|
105
107
|
version_requirements: &id007 !ruby/object:Gem::Requirement
|
|
106
108
|
none: false
|
|
107
109
|
requirements:
|
|
@@ -111,11 +113,11 @@ dependencies:
|
|
|
111
113
|
segments:
|
|
112
114
|
- 0
|
|
113
115
|
version: "0"
|
|
114
|
-
requirement: *id007
|
|
115
116
|
type: :runtime
|
|
116
|
-
|
|
117
|
-
name: json
|
|
117
|
+
requirement: *id007
|
|
118
118
|
- !ruby/object:Gem::Dependency
|
|
119
|
+
prerelease: false
|
|
120
|
+
name: mime-types
|
|
119
121
|
version_requirements: &id008 !ruby/object:Gem::Requirement
|
|
120
122
|
none: false
|
|
121
123
|
requirements:
|
|
@@ -125,11 +127,11 @@ dependencies:
|
|
|
125
127
|
segments:
|
|
126
128
|
- 0
|
|
127
129
|
version: "0"
|
|
128
|
-
requirement: *id008
|
|
129
130
|
type: :runtime
|
|
130
|
-
|
|
131
|
-
name: mime-types
|
|
131
|
+
requirement: *id008
|
|
132
132
|
- !ruby/object:Gem::Dependency
|
|
133
|
+
prerelease: false
|
|
134
|
+
name: r18n-core
|
|
133
135
|
version_requirements: &id009 !ruby/object:Gem::Requirement
|
|
134
136
|
none: false
|
|
135
137
|
requirements:
|
|
@@ -139,11 +141,11 @@ dependencies:
|
|
|
139
141
|
segments:
|
|
140
142
|
- 0
|
|
141
143
|
version: "0"
|
|
142
|
-
requirement: *id009
|
|
143
144
|
type: :runtime
|
|
144
|
-
|
|
145
|
-
name: r18n-core
|
|
145
|
+
requirement: *id009
|
|
146
146
|
- !ruby/object:Gem::Dependency
|
|
147
|
+
prerelease: false
|
|
148
|
+
name: rack
|
|
147
149
|
version_requirements: &id010 !ruby/object:Gem::Requirement
|
|
148
150
|
none: false
|
|
149
151
|
requirements:
|
|
@@ -153,11 +155,11 @@ dependencies:
|
|
|
153
155
|
segments:
|
|
154
156
|
- 0
|
|
155
157
|
version: "0"
|
|
156
|
-
requirement: *id010
|
|
157
158
|
type: :runtime
|
|
158
|
-
|
|
159
|
-
name: rack
|
|
159
|
+
requirement: *id010
|
|
160
160
|
- !ruby/object:Gem::Dependency
|
|
161
|
+
prerelease: false
|
|
162
|
+
name: ruby-event
|
|
161
163
|
version_requirements: &id011 !ruby/object:Gem::Requirement
|
|
162
164
|
none: false
|
|
163
165
|
requirements:
|
|
@@ -167,11 +169,11 @@ dependencies:
|
|
|
167
169
|
segments:
|
|
168
170
|
- 0
|
|
169
171
|
version: "0"
|
|
170
|
-
requirement: *id011
|
|
171
172
|
type: :runtime
|
|
172
|
-
|
|
173
|
-
name: ruby-event
|
|
173
|
+
requirement: *id011
|
|
174
174
|
- !ruby/object:Gem::Dependency
|
|
175
|
+
prerelease: false
|
|
176
|
+
name: ruby-openid
|
|
175
177
|
version_requirements: &id012 !ruby/object:Gem::Requirement
|
|
176
178
|
none: false
|
|
177
179
|
requirements:
|
|
@@ -181,11 +183,11 @@ dependencies:
|
|
|
181
183
|
segments:
|
|
182
184
|
- 0
|
|
183
185
|
version: "0"
|
|
184
|
-
requirement: *id012
|
|
185
186
|
type: :runtime
|
|
186
|
-
|
|
187
|
-
name: ruby-openid
|
|
187
|
+
requirement: *id012
|
|
188
188
|
- !ruby/object:Gem::Dependency
|
|
189
|
+
prerelease: false
|
|
190
|
+
name: sass
|
|
189
191
|
version_requirements: &id013 !ruby/object:Gem::Requirement
|
|
190
192
|
none: false
|
|
191
193
|
requirements:
|
|
@@ -195,11 +197,11 @@ dependencies:
|
|
|
195
197
|
segments:
|
|
196
198
|
- 0
|
|
197
199
|
version: "0"
|
|
198
|
-
requirement: *id013
|
|
199
200
|
type: :runtime
|
|
200
|
-
|
|
201
|
-
name: sass
|
|
201
|
+
requirement: *id013
|
|
202
202
|
- !ruby/object:Gem::Dependency
|
|
203
|
+
prerelease: false
|
|
204
|
+
name: term-ansicolor
|
|
203
205
|
version_requirements: &id014 !ruby/object:Gem::Requirement
|
|
204
206
|
none: false
|
|
205
207
|
requirements:
|
|
@@ -209,11 +211,11 @@ dependencies:
|
|
|
209
211
|
segments:
|
|
210
212
|
- 0
|
|
211
213
|
version: "0"
|
|
212
|
-
requirement: *id014
|
|
213
214
|
type: :runtime
|
|
214
|
-
|
|
215
|
-
name: term-ansicolor
|
|
215
|
+
requirement: *id014
|
|
216
216
|
- !ruby/object:Gem::Dependency
|
|
217
|
+
prerelease: false
|
|
218
|
+
name: yajl-ruby
|
|
217
219
|
version_requirements: &id015 !ruby/object:Gem::Requirement
|
|
218
220
|
none: false
|
|
219
221
|
requirements:
|
|
@@ -223,11 +225,11 @@ dependencies:
|
|
|
223
225
|
segments:
|
|
224
226
|
- 0
|
|
225
227
|
version: "0"
|
|
226
|
-
requirement: *id015
|
|
227
228
|
type: :runtime
|
|
228
|
-
|
|
229
|
-
name: yajl-ruby
|
|
229
|
+
requirement: *id015
|
|
230
230
|
- !ruby/object:Gem::Dependency
|
|
231
|
+
prerelease: false
|
|
232
|
+
name: capybara
|
|
231
233
|
version_requirements: &id016 !ruby/object:Gem::Requirement
|
|
232
234
|
none: false
|
|
233
235
|
requirements:
|
|
@@ -237,11 +239,11 @@ dependencies:
|
|
|
237
239
|
segments:
|
|
238
240
|
- 0
|
|
239
241
|
version: "0"
|
|
240
|
-
requirement: *id016
|
|
241
242
|
type: :development
|
|
242
|
-
|
|
243
|
-
name: capybara
|
|
243
|
+
requirement: *id016
|
|
244
244
|
- !ruby/object:Gem::Dependency
|
|
245
|
+
prerelease: false
|
|
246
|
+
name: cucumber
|
|
245
247
|
version_requirements: &id017 !ruby/object:Gem::Requirement
|
|
246
248
|
none: false
|
|
247
249
|
requirements:
|
|
@@ -251,11 +253,11 @@ dependencies:
|
|
|
251
253
|
segments:
|
|
252
254
|
- 0
|
|
253
255
|
version: "0"
|
|
254
|
-
requirement: *id017
|
|
255
256
|
type: :development
|
|
256
|
-
|
|
257
|
-
name: cucumber
|
|
257
|
+
requirement: *id017
|
|
258
258
|
- !ruby/object:Gem::Dependency
|
|
259
|
+
prerelease: false
|
|
260
|
+
name: launchy
|
|
259
261
|
version_requirements: &id018 !ruby/object:Gem::Requirement
|
|
260
262
|
none: false
|
|
261
263
|
requirements:
|
|
@@ -265,11 +267,11 @@ dependencies:
|
|
|
265
267
|
segments:
|
|
266
268
|
- 0
|
|
267
269
|
version: "0"
|
|
268
|
-
requirement: *id018
|
|
269
270
|
type: :development
|
|
270
|
-
|
|
271
|
-
name: launchy
|
|
271
|
+
requirement: *id018
|
|
272
272
|
- !ruby/object:Gem::Dependency
|
|
273
|
+
prerelease: false
|
|
274
|
+
name: rake
|
|
273
275
|
version_requirements: &id019 !ruby/object:Gem::Requirement
|
|
274
276
|
none: false
|
|
275
277
|
requirements:
|
|
@@ -279,11 +281,11 @@ dependencies:
|
|
|
279
281
|
segments:
|
|
280
282
|
- 0
|
|
281
283
|
version: "0"
|
|
282
|
-
requirement: *id019
|
|
283
284
|
type: :development
|
|
284
|
-
|
|
285
|
-
name: rake
|
|
285
|
+
requirement: *id019
|
|
286
286
|
- !ruby/object:Gem::Dependency
|
|
287
|
+
prerelease: false
|
|
288
|
+
name: rspec
|
|
287
289
|
version_requirements: &id020 !ruby/object:Gem::Requirement
|
|
288
290
|
none: false
|
|
289
291
|
requirements:
|
|
@@ -293,11 +295,11 @@ dependencies:
|
|
|
293
295
|
segments:
|
|
294
296
|
- 0
|
|
295
297
|
version: "0"
|
|
296
|
-
requirement: *id020
|
|
297
298
|
type: :development
|
|
298
|
-
|
|
299
|
-
name: rspec
|
|
299
|
+
requirement: *id020
|
|
300
300
|
- !ruby/object:Gem::Dependency
|
|
301
|
+
prerelease: false
|
|
302
|
+
name: rspec-mocks
|
|
301
303
|
version_requirements: &id021 !ruby/object:Gem::Requirement
|
|
302
304
|
none: false
|
|
303
305
|
requirements:
|
|
@@ -307,11 +309,11 @@ dependencies:
|
|
|
307
309
|
segments:
|
|
308
310
|
- 0
|
|
309
311
|
version: "0"
|
|
310
|
-
requirement: *id021
|
|
311
312
|
type: :development
|
|
312
|
-
|
|
313
|
-
name: rspec-mocks
|
|
313
|
+
requirement: *id021
|
|
314
314
|
- !ruby/object:Gem::Dependency
|
|
315
|
+
prerelease: false
|
|
316
|
+
name: ya2yaml
|
|
315
317
|
version_requirements: &id022 !ruby/object:Gem::Requirement
|
|
316
318
|
none: false
|
|
317
319
|
requirements:
|
|
@@ -321,10 +323,8 @@ dependencies:
|
|
|
321
323
|
segments:
|
|
322
324
|
- 0
|
|
323
325
|
version: "0"
|
|
324
|
-
requirement: *id022
|
|
325
326
|
type: :development
|
|
326
|
-
|
|
327
|
-
name: ya2yaml
|
|
327
|
+
requirement: *id022
|
|
328
328
|
description: A web application framework in Ruby
|
|
329
329
|
email:
|
|
330
330
|
- frank.ficnar@gmail.com
|
|
@@ -627,7 +627,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
627
627
|
requirements: []
|
|
628
628
|
|
|
629
629
|
rubyforge_project:
|
|
630
|
-
rubygems_version: 1.8.
|
|
630
|
+
rubygems_version: 1.8.13
|
|
631
631
|
signing_key:
|
|
632
632
|
specification_version: 3
|
|
633
633
|
summary: A web application framework in Ruby
|