sinatra 1.0 → 1.1.a

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of sinatra might be problematic. Click here for more details.

Files changed (57) hide show
  1. data/CHANGES +108 -1
  2. data/LICENSE +1 -1
  3. data/README.de.rdoc +1024 -0
  4. data/README.es.rdoc +1047 -0
  5. data/README.fr.rdoc +1038 -0
  6. data/README.hu.rdoc +607 -0
  7. data/README.jp.rdoc +473 -15
  8. data/README.rdoc +429 -41
  9. data/Rakefile +17 -6
  10. data/lib/sinatra/base.rb +357 -158
  11. data/lib/sinatra/showexceptions.rb +9 -1
  12. data/sinatra.gemspec +52 -9
  13. data/test/builder_test.rb +25 -1
  14. data/test/coffee_test.rb +88 -0
  15. data/test/encoding_test.rb +18 -0
  16. data/test/filter_test.rb +61 -2
  17. data/test/hello.mab +1 -0
  18. data/test/helper.rb +1 -0
  19. data/test/helpers_test.rb +141 -37
  20. data/test/less_test.rb +26 -2
  21. data/test/liquid_test.rb +58 -0
  22. data/test/markaby_test.rb +58 -0
  23. data/test/markdown_test.rb +35 -0
  24. data/test/nokogiri_test.rb +69 -0
  25. data/test/radius_test.rb +59 -0
  26. data/test/rdoc_test.rb +34 -0
  27. data/test/request_test.rb +12 -0
  28. data/test/routing_test.rb +35 -1
  29. data/test/sass_test.rb +46 -16
  30. data/test/scss_test.rb +88 -0
  31. data/test/settings_test.rb +32 -0
  32. data/test/sinatra_test.rb +4 -0
  33. data/test/static_test.rb +64 -0
  34. data/test/templates_test.rb +55 -1
  35. data/test/textile_test.rb +34 -0
  36. data/test/views/ascii.haml +2 -0
  37. data/test/views/explicitly_nested.str +1 -0
  38. data/test/views/hello.coffee +1 -0
  39. data/test/views/hello.liquid +1 -0
  40. data/test/views/hello.mab +1 -0
  41. data/test/views/hello.md +1 -0
  42. data/test/views/hello.nokogiri +1 -0
  43. data/test/views/hello.radius +1 -0
  44. data/test/views/hello.rdoc +1 -0
  45. data/test/views/hello.sass +1 -1
  46. data/test/views/hello.scss +3 -0
  47. data/test/views/hello.str +1 -0
  48. data/test/views/hello.textile +1 -0
  49. data/test/views/layout2.liquid +2 -0
  50. data/test/views/layout2.mab +2 -0
  51. data/test/views/layout2.nokogiri +3 -0
  52. data/test/views/layout2.radius +2 -0
  53. data/test/views/layout2.str +2 -0
  54. data/test/views/nested.str +1 -0
  55. data/test/views/utf8.haml +2 -0
  56. metadata +240 -33
  57. data/lib/sinatra/tilt.rb +0 -746
data/test/views/ascii.haml ADDED
@@ -0,0 +1,2 @@
1
+ This file has no unicode in it!
2
+ = value
data/test/views/explicitly_nested.str ADDED
@@ -0,0 +1 @@
1
+ <content>#{render :str, :hello, :layout => :layout2}</content>
data/test/views/hello.coffee ADDED
@@ -0,0 +1 @@
1
+ alert "Aye!"
data/test/views/hello.liquid ADDED
@@ -0,0 +1 @@
1
+ <h1>Hello From Liquid</h1>
data/test/views/hello.mab ADDED
@@ -0,0 +1 @@
1
+ h1 "Hello From Markaby"
data/test/views/hello.md ADDED
@@ -0,0 +1 @@
1
+ # Hello From Markdown
data/test/views/hello.nokogiri ADDED
@@ -0,0 +1 @@
1
+ xml.exclaim "You're my boy, #{@name}!"
data/test/views/hello.radius ADDED
@@ -0,0 +1 @@
1
+ <h1>Hello From Radius</h1>
data/test/views/hello.rdoc ADDED
@@ -0,0 +1 @@
1
+ = Hello From RDoc
data/test/views/hello.sass CHANGED
@@ -1,2 +1,2 @@
1
1
  #sass
2
- :background-color #FFF
2
+ :background-color white
data/test/views/hello.scss ADDED
@@ -0,0 +1,3 @@
1
+ #scss {
2
+ background-color: white
3
+ }
data/test/views/hello.str ADDED
@@ -0,0 +1 @@
1
+ <h1>Hello From String</h1>
data/test/views/hello.textile ADDED
@@ -0,0 +1 @@
1
+ h1. Hello From Textile
data/test/views/layout2.liquid ADDED
@@ -0,0 +1,2 @@
1
+ <h1>Liquid Layout!</h1>
2
+ <p>{{ yield }}</p>
data/test/views/layout2.mab ADDED
@@ -0,0 +1,2 @@
1
+ h1 "Markaby Layout!"
2
+ p { yield }
data/test/views/layout2.nokogiri ADDED
@@ -0,0 +1,3 @@
1
+ xml.layout do
2
+ xml << yield
3
+ end
data/test/views/layout2.radius ADDED
@@ -0,0 +1,2 @@
1
+ <h1>Radius Layout!</h1>
2
+ <p><r:yield /></p>
data/test/views/layout2.str ADDED
@@ -0,0 +1,2 @@
1
+ <h1>String Layout!</h1>
2
+ #{yield}
data/test/views/nested.str ADDED
@@ -0,0 +1 @@
1
+ <content>#{render :str, :hello}</content>
data/test/views/utf8.haml ADDED
@@ -0,0 +1,2 @@
1
+ %h1= value
2
+ Ingen vill veta var du köpt din tröja.
metadata CHANGED
@@ -1,117 +1,270 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sinatra
3
3
  version: !ruby/object:Gem::Version
4
- prerelease: false
4
+ hash: 118
5
+ prerelease: true
5
6
  segments:
6
7
  - 1
7
- - 0
8
- version: "1.0"
8
+ - 1
9
+ - a
10
+ version: 1.1.a
9
11
  platform: ruby
10
12
  authors:
11
13
  - Blake Mizerany
12
14
  - Ryan Tomayko
13
15
  - Simon Rozet
16
+ - Konstantin Haase
14
17
  autorequire:
15
18
  bindir: bin
16
19
  cert_chain: []
17
20
 
18
- date: 2010-03-23 00:00:00 -07:00
21
+ date: 2010-10-19 00:00:00 +02:00
19
22
  default_executable:
20
23
  dependencies:
21
24
  - !ruby/object:Gem::Dependency
22
25
  name: rack
23
26
  prerelease: false
24
27
  requirement: &id001 !ruby/object:Gem::Requirement
28
+ none: false
25
29
  requirements:
26
- - - ">="
30
+ - - ~>
27
31
  - !ruby/object:Gem::Version
32
+ hash: 13
28
33
  segments:
29
34
  - 1
30
- - 0
31
- version: "1.0"
35
+ - 1
36
+ version: "1.1"
32
37
  type: :runtime
33
38
  version_requirements: *id001
34
39
  - !ruby/object:Gem::Dependency
35
- name: shotgun
40
+ name: tilt
36
41
  prerelease: false
37
42
  requirement: &id002 !ruby/object:Gem::Requirement
43
+ none: false
44
+ requirements:
45
+ - - ~>
46
+ - !ruby/object:Gem::Version
47
+ hash: 13
48
+ segments:
49
+ - 1
50
+ - 1
51
+ version: "1.1"
52
+ type: :runtime
53
+ version_requirements: *id002
54
+ - !ruby/object:Gem::Dependency
55
+ name: rake
56
+ prerelease: false
57
+ requirement: &id003 !ruby/object:Gem::Requirement
58
+ none: false
38
59
  requirements:
39
60
  - - ">="
40
61
  - !ruby/object:Gem::Version
62
+ hash: 3
41
63
  segments:
42
64
  - 0
43
- - 6
44
- version: "0.6"
45
- - - <
65
+ version: "0"
66
+ type: :development
67
+ version_requirements: *id003
68
+ - !ruby/object:Gem::Dependency
69
+ name: shotgun
70
+ prerelease: false
71
+ requirement: &id004 !ruby/object:Gem::Requirement
72
+ none: false
73
+ requirements:
74
+ - - ~>
46
75
  - !ruby/object:Gem::Version
76
+ hash: 7
47
77
  segments:
48
- - 1
49
78
  - 0
50
- version: "1.0"
79
+ - 6
80
+ version: "0.6"
51
81
  type: :development
52
- version_requirements: *id002
82
+ version_requirements: *id004
53
83
  - !ruby/object:Gem::Dependency
54
84
  name: rack-test
55
85
  prerelease: false
56
- requirement: &id003 !ruby/object:Gem::Requirement
86
+ requirement: &id005 !ruby/object:Gem::Requirement
87
+ none: false
57
88
  requirements:
58
89
  - - ">="
59
90
  - !ruby/object:Gem::Version
91
+ hash: 7
60
92
  segments:
61
93
  - 0
62
- - 3
63
- - 0
64
- version: 0.3.0
94
+ - 5
95
+ - 6
96
+ version: 0.5.6
65
97
  type: :development
66
- version_requirements: *id003
98
+ version_requirements: *id005
67
99
  - !ruby/object:Gem::Dependency
68
100
  name: haml
69
101
  prerelease: false
70
- requirement: &id004 !ruby/object:Gem::Requirement
102
+ requirement: &id006 !ruby/object:Gem::Requirement
103
+ none: false
71
104
  requirements:
72
105
  - - ">="
73
106
  - !ruby/object:Gem::Version
107
+ hash: 7
74
108
  segments:
109
+ - 3
75
110
  - 0
76
- version: "0"
111
+ version: "3.0"
77
112
  type: :development
78
- version_requirements: *id004
113
+ version_requirements: *id006
79
114
  - !ruby/object:Gem::Dependency
80
115
  name: builder
81
116
  prerelease: false
82
- requirement: &id005 !ruby/object:Gem::Requirement
117
+ requirement: &id007 !ruby/object:Gem::Requirement
118
+ none: false
83
119
  requirements:
84
120
  - - ">="
85
121
  - !ruby/object:Gem::Version
122
+ hash: 3
86
123
  segments:
87
124
  - 0
88
125
  version: "0"
89
126
  type: :development
90
- version_requirements: *id005
127
+ version_requirements: *id007
91
128
  - !ruby/object:Gem::Dependency
92
129
  name: erubis
93
130
  prerelease: false
94
- requirement: &id006 !ruby/object:Gem::Requirement
131
+ requirement: &id008 !ruby/object:Gem::Requirement
132
+ none: false
95
133
  requirements:
96
134
  - - ">="
97
135
  - !ruby/object:Gem::Version
136
+ hash: 3
98
137
  segments:
99
138
  - 0
100
139
  version: "0"
101
140
  type: :development
102
- version_requirements: *id006
141
+ version_requirements: *id008
103
142
  - !ruby/object:Gem::Dependency
104
143
  name: less
105
144
  prerelease: false
106
- requirement: &id007 !ruby/object:Gem::Requirement
145
+ requirement: &id009 !ruby/object:Gem::Requirement
146
+ none: false
107
147
  requirements:
108
148
  - - ">="
109
149
  - !ruby/object:Gem::Version
150
+ hash: 3
110
151
  segments:
111
152
  - 0
112
153
  version: "0"
113
154
  type: :development
114
- version_requirements: *id007
155
+ version_requirements: *id009
156
+ - !ruby/object:Gem::Dependency
157
+ name: liquid
158
+ prerelease: false
159
+ requirement: &id010 !ruby/object:Gem::Requirement
160
+ none: false
161
+ requirements:
162
+ - - ">="
163
+ - !ruby/object:Gem::Version
164
+ hash: 3
165
+ segments:
166
+ - 0
167
+ version: "0"
168
+ type: :development
169
+ version_requirements: *id010
170
+ - !ruby/object:Gem::Dependency
171
+ name: rdiscount
172
+ prerelease: false
173
+ requirement: &id011 !ruby/object:Gem::Requirement
174
+ none: false
175
+ requirements:
176
+ - - ">="
177
+ - !ruby/object:Gem::Version
178
+ hash: 3
179
+ segments:
180
+ - 0
181
+ version: "0"
182
+ type: :development
183
+ version_requirements: *id011
184
+ - !ruby/object:Gem::Dependency
185
+ name: RedCloth
186
+ prerelease: false
187
+ requirement: &id012 !ruby/object:Gem::Requirement
188
+ none: false
189
+ requirements:
190
+ - - ">="
191
+ - !ruby/object:Gem::Version
192
+ hash: 3
193
+ segments:
194
+ - 0
195
+ version: "0"
196
+ type: :development
197
+ version_requirements: *id012
198
+ - !ruby/object:Gem::Dependency
199
+ name: radius
200
+ prerelease: false
201
+ requirement: &id013 !ruby/object:Gem::Requirement
202
+ none: false
203
+ requirements:
204
+ - - ">="
205
+ - !ruby/object:Gem::Version
206
+ hash: 3
207
+ segments:
208
+ - 0
209
+ version: "0"
210
+ type: :development
211
+ version_requirements: *id013
212
+ - !ruby/object:Gem::Dependency
213
+ name: markaby
214
+ prerelease: false
215
+ requirement: &id014 !ruby/object:Gem::Requirement
216
+ none: false
217
+ requirements:
218
+ - - ">="
219
+ - !ruby/object:Gem::Version
220
+ hash: 3
221
+ segments:
222
+ - 0
223
+ version: "0"
224
+ type: :development
225
+ version_requirements: *id014
226
+ - !ruby/object:Gem::Dependency
227
+ name: coffee-script
228
+ prerelease: false
229
+ requirement: &id015 !ruby/object:Gem::Requirement
230
+ none: false
231
+ requirements:
232
+ - - ">="
233
+ - !ruby/object:Gem::Version
234
+ hash: 3
235
+ segments:
236
+ - 0
237
+ version: "0"
238
+ type: :development
239
+ version_requirements: *id015
240
+ - !ruby/object:Gem::Dependency
241
+ name: rdoc
242
+ prerelease: false
243
+ requirement: &id016 !ruby/object:Gem::Requirement
244
+ none: false
245
+ requirements:
246
+ - - ">="
247
+ - !ruby/object:Gem::Version
248
+ hash: 3
249
+ segments:
250
+ - 0
251
+ version: "0"
252
+ type: :development
253
+ version_requirements: *id016
254
+ - !ruby/object:Gem::Dependency
255
+ name: nokogiri
256
+ prerelease: false
257
+ requirement: &id017 !ruby/object:Gem::Requirement
258
+ none: false
259
+ requirements:
260
+ - - ">="
261
+ - !ruby/object:Gem::Version
262
+ hash: 3
263
+ segments:
264
+ - 0
265
+ version: "0"
266
+ type: :development
267
+ version_requirements: *id017
115
268
  description: Classy web-development dressed in a DSL
116
269
  email: sinatrarb@googlegroups.com
117
270
  executables: []
@@ -120,11 +273,20 @@ extensions: []
120
273
 
121
274
  extra_rdoc_files:
122
275
  - README.rdoc
276
+ - README.de.rdoc
277
+ - README.jp.rdoc
278
+ - README.fr.rdoc
279
+ - README.es.rdoc
280
+ - README.hu.rdoc
123
281
  - LICENSE
124
282
  files:
125
283
  - AUTHORS
126
284
  - CHANGES
127
285
  - LICENSE
286
+ - README.de.rdoc
287
+ - README.es.rdoc
288
+ - README.fr.rdoc
289
+ - README.hu.rdoc
128
290
  - README.jp.rdoc
129
291
  - README.rdoc
130
292
  - Rakefile
@@ -134,51 +296,80 @@ files:
134
296
  - lib/sinatra/images/500.png
135
297
  - lib/sinatra/main.rb
136
298
  - lib/sinatra/showexceptions.rb
137
- - lib/sinatra/tilt.rb
138
299
  - sinatra.gemspec
139
300
  - test/base_test.rb
140
301
  - test/builder_test.rb
302
+ - test/coffee_test.rb
141
303
  - test/contest.rb
304
+ - test/encoding_test.rb
142
305
  - test/erb_test.rb
143
306
  - test/erubis_test.rb
144
307
  - test/extensions_test.rb
145
308
  - test/filter_test.rb
146
309
  - test/haml_test.rb
310
+ - test/hello.mab
147
311
  - test/helper.rb
148
312
  - test/helpers_test.rb
149
313
  - test/less_test.rb
314
+ - test/liquid_test.rb
150
315
  - test/mapped_error_test.rb
316
+ - test/markaby_test.rb
317
+ - test/markdown_test.rb
151
318
  - test/middleware_test.rb
319
+ - test/nokogiri_test.rb
152
320
  - test/public/favicon.ico
321
+ - test/radius_test.rb
322
+ - test/rdoc_test.rb
153
323
  - test/request_test.rb
154
324
  - test/response_test.rb
155
325
  - test/result_test.rb
156
326
  - test/route_added_hook_test.rb
157
327
  - test/routing_test.rb
158
328
  - test/sass_test.rb
329
+ - test/scss_test.rb
159
330
  - test/server_test.rb
160
331
  - test/settings_test.rb
161
332
  - test/sinatra_test.rb
162
333
  - test/static_test.rb
163
334
  - test/templates_test.rb
335
+ - test/textile_test.rb
336
+ - test/views/ascii.haml
164
337
  - test/views/error.builder
165
338
  - test/views/error.erb
166
339
  - test/views/error.erubis
167
340
  - test/views/error.haml
168
341
  - test/views/error.sass
342
+ - test/views/explicitly_nested.str
169
343
  - test/views/foo/hello.test
170
344
  - test/views/hello.builder
345
+ - test/views/hello.coffee
171
346
  - test/views/hello.erb
172
347
  - test/views/hello.erubis
173
348
  - test/views/hello.haml
174
349
  - test/views/hello.less
350
+ - test/views/hello.liquid
351
+ - test/views/hello.mab
352
+ - test/views/hello.md
353
+ - test/views/hello.nokogiri
354
+ - test/views/hello.radius
355
+ - test/views/hello.rdoc
175
356
  - test/views/hello.sass
357
+ - test/views/hello.scss
358
+ - test/views/hello.str
176
359
  - test/views/hello.test
360
+ - test/views/hello.textile
177
361
  - test/views/layout2.builder
178
362
  - test/views/layout2.erb
179
363
  - test/views/layout2.erubis
180
364
  - test/views/layout2.haml
365
+ - test/views/layout2.liquid
366
+ - test/views/layout2.mab
367
+ - test/views/layout2.nokogiri
368
+ - test/views/layout2.radius
369
+ - test/views/layout2.str
181
370
  - test/views/layout2.test
371
+ - test/views/nested.str
372
+ - test/views/utf8.haml
182
373
  has_rdoc: true
183
374
  homepage: http://sinatra.rubyforge.org
184
375
  licenses: []
@@ -194,29 +385,37 @@ rdoc_options:
194
385
  require_paths:
195
386
  - lib
196
387
  required_ruby_version: !ruby/object:Gem::Requirement
388
+ none: false
197
389
  requirements:
198
390
  - - ">="
199
391
  - !ruby/object:Gem::Version
392
+ hash: 3
200
393
  segments:
201
394
  - 0
202
395
  version: "0"
203
396
  required_rubygems_version: !ruby/object:Gem::Requirement
397
+ none: false
204
398
  requirements:
205
- - - ">="
399
+ - - ">"
206
400
  - !ruby/object:Gem::Version
401
+ hash: 25
207
402
  segments:
208
- - 0
209
- version: "0"
403
+ - 1
404
+ - 3
405
+ - 1
406
+ version: 1.3.1
210
407
  requirements: []
211
408
 
212
409
  rubyforge_project: sinatra
213
- rubygems_version: 1.3.6
410
+ rubygems_version: 1.3.7
214
411
  signing_key:
215
412
  specification_version: 2
216
413
  summary: Classy web-development dressed in a DSL
217
414
  test_files:
218
415
  - test/base_test.rb
219
416
  - test/builder_test.rb
417
+ - test/coffee_test.rb
418
+ - test/encoding_test.rb
220
419
  - test/erb_test.rb
221
420
  - test/erubis_test.rb
222
421
  - test/extensions_test.rb
@@ -224,16 +423,24 @@ test_files:
224
423
  - test/haml_test.rb
225
424
  - test/helpers_test.rb
226
425
  - test/less_test.rb
426
+ - test/liquid_test.rb
227
427
  - test/mapped_error_test.rb
428
+ - test/markaby_test.rb
429
+ - test/markdown_test.rb
228
430
  - test/middleware_test.rb
431
+ - test/nokogiri_test.rb
432
+ - test/radius_test.rb
433
+ - test/rdoc_test.rb
229
434
  - test/request_test.rb
230
435
  - test/response_test.rb
231
436
  - test/result_test.rb
232
437
  - test/route_added_hook_test.rb
233
438
  - test/routing_test.rb
234
439
  - test/sass_test.rb
440
+ - test/scss_test.rb
235
441
  - test/server_test.rb
236
442
  - test/settings_test.rb
237
443
  - test/sinatra_test.rb
238
444
  - test/static_test.rb
239
445
  - test/templates_test.rb
446
+ - test/textile_test.rb