sinatra-contrib 2.0.0.rc1 → 2.0.0.rc2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (69) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE +2 -1
  3. data/lib/sinatra/decompile.rb +5 -0
  4. data/lib/sinatra/runner.rb +155 -0
  5. data/lib/sinatra/webdav.rb +93 -0
  6. data/sinatra-contrib.gemspec +5 -199
  7. metadata +13 -175
  8. data/spec/capture_spec.rb +0 -100
  9. data/spec/config_file/key_value.yml +0 -7
  10. data/spec/config_file/key_value.yml.erb +0 -6
  11. data/spec/config_file/key_value_override.yml +0 -2
  12. data/spec/config_file/missing_env.yml +0 -4
  13. data/spec/config_file/with_envs.yml +0 -7
  14. data/spec/config_file/with_nested_envs.yml +0 -11
  15. data/spec/config_file_spec.rb +0 -76
  16. data/spec/content_for/different_key.erb +0 -1
  17. data/spec/content_for/different_key.erubis +0 -1
  18. data/spec/content_for/different_key.haml +0 -2
  19. data/spec/content_for/different_key.slim +0 -2
  20. data/spec/content_for/footer.erb +0 -3
  21. data/spec/content_for/footer.erubis +0 -3
  22. data/spec/content_for/footer.haml +0 -2
  23. data/spec/content_for/footer.slim +0 -2
  24. data/spec/content_for/layout.erb +0 -1
  25. data/spec/content_for/layout.erubis +0 -1
  26. data/spec/content_for/layout.haml +0 -1
  27. data/spec/content_for/layout.slim +0 -1
  28. data/spec/content_for/multiple_blocks.erb +0 -4
  29. data/spec/content_for/multiple_blocks.erubis +0 -4
  30. data/spec/content_for/multiple_blocks.haml +0 -8
  31. data/spec/content_for/multiple_blocks.slim +0 -8
  32. data/spec/content_for/multiple_yields.erb +0 -3
  33. data/spec/content_for/multiple_yields.erubis +0 -3
  34. data/spec/content_for/multiple_yields.haml +0 -3
  35. data/spec/content_for/multiple_yields.slim +0 -3
  36. data/spec/content_for/passes_values.erb +0 -1
  37. data/spec/content_for/passes_values.erubis +0 -1
  38. data/spec/content_for/passes_values.haml +0 -1
  39. data/spec/content_for/passes_values.slim +0 -1
  40. data/spec/content_for/same_key.erb +0 -1
  41. data/spec/content_for/same_key.erubis +0 -1
  42. data/spec/content_for/same_key.haml +0 -2
  43. data/spec/content_for/same_key.slim +0 -2
  44. data/spec/content_for/takes_values.erb +0 -1
  45. data/spec/content_for/takes_values.erubis +0 -1
  46. data/spec/content_for/takes_values.haml +0 -3
  47. data/spec/content_for/takes_values.slim +0 -3
  48. data/spec/content_for_spec.rb +0 -241
  49. data/spec/cookies_spec.rb +0 -826
  50. data/spec/custom_logger_spec.rb +0 -43
  51. data/spec/extension_spec.rb +0 -32
  52. data/spec/json_spec.rb +0 -115
  53. data/spec/link_header_spec.rb +0 -99
  54. data/spec/multi_route_spec.rb +0 -59
  55. data/spec/namespace/foo.erb +0 -1
  56. data/spec/namespace/nested/foo.erb +0 -1
  57. data/spec/namespace_spec.rb +0 -791
  58. data/spec/okjson.rb +0 -581
  59. data/spec/reloader/app.rb.erb +0 -40
  60. data/spec/reloader_spec.rb +0 -465
  61. data/spec/required_params_spec.rb +0 -68
  62. data/spec/respond_with/bar.erb +0 -1
  63. data/spec/respond_with/bar.json.erb +0 -1
  64. data/spec/respond_with/baz.yajl +0 -1
  65. data/spec/respond_with/foo.html.erb +0 -1
  66. data/spec/respond_with/not_html.sass +0 -2
  67. data/spec/respond_with_spec.rb +0 -317
  68. data/spec/spec_helper.rb +0 -7
  69. data/spec/streaming_spec.rb +0 -415
@@ -1,581 +0,0 @@
1
- # Copyright 2011 Keith Rarick
2
- #
3
- # Permission is hereby granted, free of charge, to any person obtaining a copy
4
- # of this software and associated documentation files (the "Software"), to deal
5
- # in the Software without restriction, including without limitation the rights
6
- # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7
- # copies of the Software, and to permit persons to whom the Software is
8
- # furnished to do so, subject to the following conditions:
9
- #
10
- # The above copyright notice and this permission notice shall be included in
11
- # all copies or substantial portions of the Software.
12
- #
13
- # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14
- # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15
- # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16
- # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17
- # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18
- # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19
- # THE SOFTWARE.
20
-
21
- # See https://github.com/kr/okjson for updates.
22
-
23
- require 'stringio'
24
-
25
- # Some parts adapted from
26
- # http://golang.org/src/pkg/json/decode.go and
27
- # http://golang.org/src/pkg/utf8/utf8.go
28
- module OkJson
29
- extend self
30
-
31
-
32
- # Decodes a json document in string s and
33
- # returns the corresponding ruby value.
34
- # String s must be valid UTF-8. If you have
35
- # a string in some other encoding, convert
36
- # it first.
37
- #
38
- # String values in the resulting structure
39
- # will be UTF-8.
40
- def decode(s)
41
- ts = lex(s)
42
- v, ts = textparse(ts)
43
- if ts.length > 0
44
- raise Error, 'trailing garbage'
45
- end
46
- v
47
- end
48
-
49
-
50
- # Parses a "json text" in the sense of RFC 4627.
51
- # Returns the parsed value and any trailing tokens.
52
- # Note: this is almost the same as valparse,
53
- # except that it does not accept atomic values.
54
- def textparse(ts)
55
- if ts.length < 0
56
- raise Error, 'empty'
57
- end
58
-
59
- typ, _, val = ts[0]
60
- case typ
61
- when '{' then objparse(ts)
62
- when '[' then arrparse(ts)
63
- else
64
- raise Error, "unexpected #{val.inspect}"
65
- end
66
- end
67
-
68
-
69
- # Parses a "value" in the sense of RFC 4627.
70
- # Returns the parsed value and any trailing tokens.
71
- def valparse(ts)
72
- if ts.length < 0
73
- raise Error, 'empty'
74
- end
75
-
76
- typ, _, val = ts[0]
77
- case typ
78
- when '{' then objparse(ts)
79
- when '[' then arrparse(ts)
80
- when :val,:str then [val, ts[1..-1]]
81
- else
82
- raise Error, "unexpected #{val.inspect}"
83
- end
84
- end
85
-
86
-
87
- # Parses an "object" in the sense of RFC 4627.
88
- # Returns the parsed value and any trailing tokens.
89
- def objparse(ts)
90
- ts = eat('{', ts)
91
- obj = {}
92
-
93
- if ts[0][0] == '}'
94
- return obj, ts[1..-1]
95
- end
96
-
97
- k, v, ts = pairparse(ts)
98
- obj[k] = v
99
-
100
- if ts[0][0] == '}'
101
- return obj, ts[1..-1]
102
- end
103
-
104
- loop do
105
- ts = eat(',', ts)
106
-
107
- k, v, ts = pairparse(ts)
108
- obj[k] = v
109
-
110
- if ts[0][0] == '}'
111
- return obj, ts[1..-1]
112
- end
113
- end
114
- end
115
-
116
-
117
- # Parses a "member" in the sense of RFC 4627.
118
- # Returns the parsed values and any trailing tokens.
119
- def pairparse(ts)
120
- (typ, _, k), ts = ts[0], ts[1..-1]
121
- if typ != :str
122
- raise Error, "unexpected #{k.inspect}"
123
- end
124
- ts = eat(':', ts)
125
- v, ts = valparse(ts)
126
- [k, v, ts]
127
- end
128
-
129
-
130
- # Parses an "array" in the sense of RFC 4627.
131
- # Returns the parsed value and any trailing tokens.
132
- def arrparse(ts)
133
- ts = eat('[', ts)
134
- arr = []
135
-
136
- if ts[0][0] == ']'
137
- return arr, ts[1..-1]
138
- end
139
-
140
- v, ts = valparse(ts)
141
- arr << v
142
-
143
- if ts[0][0] == ']'
144
- return arr, ts[1..-1]
145
- end
146
-
147
- loop do
148
- ts = eat(',', ts)
149
-
150
- v, ts = valparse(ts)
151
- arr << v
152
-
153
- if ts[0][0] == ']'
154
- return arr, ts[1..-1]
155
- end
156
- end
157
- end
158
-
159
-
160
- def eat(typ, ts)
161
- if ts[0][0] != typ
162
- raise Error, "expected #{typ} (got #{ts[0].inspect})"
163
- end
164
- ts[1..-1]
165
- end
166
-
167
-
168
- # Sans s and returns a list of json tokens,
169
- # excluding white space (as defined in RFC 4627).
170
- def lex(s)
171
- ts = []
172
- while s.length > 0
173
- typ, lexeme, val = tok(s)
174
- if typ == nil
175
- raise Error, "invalid character at #{s[0,10].inspect}"
176
- end
177
- if typ != :space
178
- ts << [typ, lexeme, val]
179
- end
180
- s = s[lexeme.length..-1]
181
- end
182
- ts
183
- end
184
-
185
-
186
- # Scans the first token in s and
187
- # returns a 3-element list, or nil
188
- # if no such token exists.
189
- #
190
- # The first list element is one of
191
- # '{', '}', ':', ',', '[', ']',
192
- # :val, :str, and :space.
193
- #
194
- # The second element is the lexeme.
195
- #
196
- # The third element is the value of the
197
- # token for :val and :str, otherwise
198
- # it is the lexeme.
199
- def tok(s)
200
- case s[0]
201
- when ?{ then ['{', s[0,1], s[0,1]]
202
- when ?} then ['}', s[0,1], s[0,1]]
203
- when ?: then [':', s[0,1], s[0,1]]
204
- when ?, then [',', s[0,1], s[0,1]]
205
- when ?[ then ['[', s[0,1], s[0,1]]
206
- when ?] then [']', s[0,1], s[0,1]]
207
- when ?n then nulltok(s)
208
- when ?t then truetok(s)
209
- when ?f then falsetok(s)
210
- when ?" then strtok(s)
211
- when Spc then [:space, s[0,1], s[0,1]]
212
- when ?\t then [:space, s[0,1], s[0,1]]
213
- when ?\n then [:space, s[0,1], s[0,1]]
214
- when ?\r then [:space, s[0,1], s[0,1]]
215
- else numtok(s)
216
- end
217
- end
218
-
219
-
220
- def nulltok(s); s[0,4] == 'null' && [:val, 'null', nil] end
221
- def truetok(s); s[0,4] == 'true' && [:val, 'true', true] end
222
- def falsetok(s); s[0,5] == 'false' && [:val, 'false', false] end
223
-
224
-
225
- def numtok(s)
226
- m = /-?([1-9][0-9]+|[0-9])([.][0-9]+)?([eE][+-]?[0-9]+)?/.match(s)
227
- if m && m.begin(0) == 0
228
- if m[3] && !m[2]
229
- [:val, m[0], Integer(m[1])*(10**Integer(m[3][1..-1]))]
230
- elsif m[2]
231
- [:val, m[0], Float(m[0])]
232
- else
233
- [:val, m[0], Integer(m[0])]
234
- end
235
- end
236
- end
237
-
238
-
239
- def strtok(s)
240
- m = /"([^"\\]|\\["\/\\bfnrt]|\\u[0-9a-fA-F]{4})*"/.match(s)
241
- if ! m
242
- raise Error, "invalid string literal at #{abbrev(s)}"
243
- end
244
- [:str, m[0], unquote(m[0])]
245
- end
246
-
247
-
248
- def abbrev(s)
249
- t = s[0,10]
250
- p = t['`']
251
- t = t[0,p] if p
252
- t = t + '...' if t.length < s.length
253
- '`' + t + '`'
254
- end
255
-
256
-
257
- # Converts a quoted json string literal q into a UTF-8-encoded string.
258
- # The rules are different than for Ruby, so we cannot use eval.
259
- # Unquote will raise an error if q contains control characters.
260
- def unquote(q)
261
- q = q[1...-1]
262
- a = q.dup # allocate a big enough string
263
- r, w = 0, 0
264
- while r < q.length
265
- c = q[r]
266
- case true
267
- when c == ?\\
268
- r += 1
269
- if r >= q.length
270
- raise Error, "string literal ends with a \"\\\": \"#{q}\""
271
- end
272
-
273
- case q[r]
274
- when ?",?\\,?/,?'
275
- a[w] = q[r]
276
- r += 1
277
- w += 1
278
- when ?b,?f,?n,?r,?t
279
- a[w] = Unesc[q[r]]
280
- r += 1
281
- w += 1
282
- when ?u
283
- r += 1
284
- uchar = begin
285
- hexdec4(q[r,4])
286
- rescue RuntimeError => e
287
- raise Error, "invalid escape sequence \\u#{q[r,4]}: #{e}"
288
- end
289
- r += 4
290
- if surrogate? uchar
291
- if q.length >= r+6
292
- uchar1 = hexdec4(q[r+2,4])
293
- uchar = subst(uchar, uchar1)
294
- if uchar != Ucharerr
295
- # A valid pair; consume.
296
- r += 6
297
- end
298
- end
299
- end
300
- w += ucharenc(a, w, uchar)
301
- else
302
- raise Error, "invalid escape char #{q[r]} in \"#{q}\""
303
- end
304
- when c == ?", c < Spc
305
- raise Error, "invalid character in string literal \"#{q}\""
306
- else
307
- # Copy anything else byte-for-byte.
308
- # Valid UTF-8 will remain valid UTF-8.
309
- # Invalid UTF-8 will remain invalid UTF-8.
310
- a[w] = c
311
- r += 1
312
- w += 1
313
- end
314
- end
315
- a[0,w]
316
- end
317
-
318
-
319
- # Encodes unicode character u as UTF-8
320
- # bytes in string a at position i.
321
- # Returns the number of bytes written.
322
- def ucharenc(a, i, u)
323
- case true
324
- when u <= Uchar1max
325
- a[i] = (u & 0xff).chr
326
- 1
327
- when u <= Uchar2max
328
- a[i+0] = (Utag2 | ((u>>6)&0xff)).chr
329
- a[i+1] = (Utagx | (u&Umaskx)).chr
330
- 2
331
- when u <= Uchar3max
332
- a[i+0] = (Utag3 | ((u>>12)&0xff)).chr
333
- a[i+1] = (Utagx | ((u>>6)&Umaskx)).chr
334
- a[i+2] = (Utagx | (u&Umaskx)).chr
335
- 3
336
- else
337
- a[i+0] = (Utag4 | ((u>>18)&0xff)).chr
338
- a[i+1] = (Utagx | ((u>>12)&Umaskx)).chr
339
- a[i+2] = (Utagx | ((u>>6)&Umaskx)).chr
340
- a[i+3] = (Utagx | (u&Umaskx)).chr
341
- 4
342
- end
343
- end
344
-
345
-
346
- def hexdec4(s)
347
- if s.length != 4
348
- raise Error, 'short'
349
- end
350
- (nibble(s[0])<<12) | (nibble(s[1])<<8) | (nibble(s[2])<<4) | nibble(s[3])
351
- end
352
-
353
-
354
- def subst(u1, u2)
355
- if Usurr1 <= u1 && u1 < Usurr2 && Usurr2 <= u2 && u2 < Usurr3
356
- return ((u1-Usurr1)<<10) | (u2-Usurr2) + Usurrself
357
- end
358
- return Ucharerr
359
- end
360
-
361
-
362
- def unsubst(u)
363
- if u < Usurrself || u > Umax || surrogate?(u)
364
- return Ucharerr, Ucharerr
365
- end
366
- u -= Usurrself
367
- [Usurr1 + ((u>>10)&0x3ff), Usurr2 + (u&0x3ff)]
368
- end
369
-
370
-
371
- def surrogate?(u)
372
- Usurr1 <= u && u < Usurr3
373
- end
374
-
375
-
376
- def nibble(c)
377
- case true
378
- when ?0 <= c && c <= ?9 then c.ord - ?0.ord
379
- when ?a <= c && c <= ?z then c.ord - ?a.ord + 10
380
- when ?A <= c && c <= ?Z then c.ord - ?A.ord + 10
381
- else
382
- raise Error, "invalid hex code #{c}"
383
- end
384
- end
385
-
386
-
387
- # Encodes x into a json text. It may contain only
388
- # Array, Hash, String, Numeric, true, false, nil.
389
- # (Note, this list excludes Symbol.)
390
- # X itself must be an Array or a Hash.
391
- # No other value can be encoded, and an error will
392
- # be raised if x contains any other value, such as
393
- # Nan, Infinity, Symbol, and Proc, or if a Hash key
394
- # is not a String.
395
- # Strings contained in x must be valid UTF-8.
396
- def encode(x)
397
- case x
398
- when Hash then objenc(x)
399
- when Array then arrenc(x)
400
- else
401
- raise Error, 'root value must be an Array or a Hash'
402
- end
403
- end
404
-
405
-
406
- def valenc(x)
407
- case x
408
- when Hash then objenc(x)
409
- when Array then arrenc(x)
410
- when String then strenc(x)
411
- when Numeric then numenc(x)
412
- when true then "true"
413
- when false then "false"
414
- when nil then "null"
415
- else
416
- raise Error, "cannot encode #{x.class}: #{x.inspect}"
417
- end
418
- end
419
-
420
-
421
- def objenc(x)
422
- '{' + x.map{|k,v| keyenc(k) + ':' + valenc(v)}.join(',') + '}'
423
- end
424
-
425
-
426
- def arrenc(a)
427
- '[' + a.map{|x| valenc(x)}.join(',') + ']'
428
- end
429
-
430
-
431
- def keyenc(k)
432
- case k
433
- when String then strenc(k)
434
- else
435
- raise Error, "Hash key is not a string: #{k.inspect}"
436
- end
437
- end
438
-
439
-
440
- def strenc(s)
441
- t = StringIO.new
442
- t.putc(?")
443
- r = 0
444
- while r < s.length
445
- case s[r]
446
- when ?" then t.print('\\"')
447
- when ?\\ then t.print('\\\\')
448
- when ?\b then t.print('\\b')
449
- when ?\f then t.print('\\f')
450
- when ?\n then t.print('\\n')
451
- when ?\r then t.print('\\r')
452
- when ?\t then t.print('\\t')
453
- else
454
- c = s[r]
455
- case true
456
- when Spc <= c && c <= ?~
457
- t.putc(c)
458
- when true
459
- u, size = uchardec(s, r)
460
- r += size - 1 # we add one more at the bottom of the loop
461
- if u < 0x10000
462
- t.print('\\u')
463
- hexenc4(t, u)
464
- else
465
- u1, u2 = unsubst(u)
466
- t.print('\\u')
467
- hexenc4(t, u1)
468
- t.print('\\u')
469
- hexenc4(t, u2)
470
- end
471
- else
472
- # invalid byte; skip it
473
- end
474
- end
475
- r += 1
476
- end
477
- t.putc(?")
478
- t.string
479
- end
480
-
481
-
482
- def hexenc4(t, u)
483
- t.putc(Hex[(u>>12)&0xf])
484
- t.putc(Hex[(u>>8)&0xf])
485
- t.putc(Hex[(u>>4)&0xf])
486
- t.putc(Hex[u&0xf])
487
- end
488
-
489
-
490
- def numenc(x)
491
- if x.nan? || x.infinite?
492
- return 'null'
493
- end rescue nil
494
- "#{x}"
495
- end
496
-
497
-
498
- # Decodes unicode character u from UTF-8
499
- # bytes in string s at position i.
500
- # Returns u and the number of bytes read.
501
- def uchardec(s, i)
502
- n = s.length - i
503
- return [Ucharerr, 1] if n < 1
504
-
505
- c0 = s[i].ord
506
-
507
- # 1-byte, 7-bit sequence?
508
- if c0 < Utagx
509
- return [c0, 1]
510
- end
511
-
512
- # unexpected continuation byte?
513
- return [Ucharerr, 1] if c0 < Utag2
514
-
515
- # need continuation byte
516
- return [Ucharerr, 1] if n < 2
517
- c1 = s[i+1].ord
518
- return [Ucharerr, 1] if c1 < Utagx || Utag2 <= c1
519
-
520
- # 2-byte, 11-bit sequence?
521
- if c0 < Utag3
522
- u = (c0&Umask2)<<6 | (c1&Umaskx)
523
- return [Ucharerr, 1] if u <= Uchar1max
524
- return [u, 2]
525
- end
526
-
527
- # need second continuation byte
528
- return [Ucharerr, 1] if n < 3
529
- c2 = s[i+2].ord
530
- return [Ucharerr, 1] if c2 < Utagx || Utag2 <= c2
531
-
532
- # 3-byte, 16-bit sequence?
533
- if c0 < Utag4
534
- u = (c0&Umask3)<<12 | (c1&Umaskx)<<6 | (c2&Umaskx)
535
- return [Ucharerr, 1] if u <= Uchar2max
536
- return [u, 3]
537
- end
538
-
539
- # need third continuation byte
540
- return [Ucharerr, 1] if n < 4
541
- c3 = s[i+3].ord
542
- return [Ucharerr, 1] if c3 < Utagx || Utag2 <= c3
543
-
544
- # 4-byte, 21-bit sequence?
545
- if c0 < Utag5
546
- u = (c0&Umask4)<<18 | (c1&Umaskx)<<12 | (c2&Umaskx)<<6 | (c3&Umaskx)
547
- return [Ucharerr, 1] if u <= Uchar3max
548
- return [u, 4]
549
- end
550
-
551
- return [Ucharerr, 1]
552
- end
553
-
554
-
555
- class Error < ::StandardError
556
- end
557
-
558
-
559
- Utagx = 0x80 # 1000 0000
560
- Utag2 = 0xc0 # 1100 0000
561
- Utag3 = 0xe0 # 1110 0000
562
- Utag4 = 0xf0 # 1111 0000
563
- Utag5 = 0xF8 # 1111 1000
564
- Umaskx = 0x3f # 0011 1111
565
- Umask2 = 0x1f # 0001 1111
566
- Umask3 = 0x0f # 0000 1111
567
- Umask4 = 0x07 # 0000 0111
568
- Uchar1max = (1<<7) - 1
569
- Uchar2max = (1<<11) - 1
570
- Uchar3max = (1<<16) - 1
571
- Ucharerr = 0xFFFD # unicode "replacement char"
572
- Usurrself = 0x10000
573
- Usurr1 = 0xd800
574
- Usurr2 = 0xdc00
575
- Usurr3 = 0xe000
576
- Umax = 0x10ffff
577
-
578
- Spc = ' '[0]
579
- Unesc = {?b=>?\b, ?f=>?\f, ?n=>?\n, ?r=>?\r, ?t=>?\t}
580
- Hex = '0123456789abcdef'
581
- end