rack-mount 0.6.12 → 0.6.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/lib/rack/mount/vendor/regin/regin.rb +57 -27
  2. data/lib/rack/mount/vendor/regin/regin/parser.rb +209 -110
  3. data/lib/rack/mount/vendor/regin/regin/tokenizer.rb +0 -0
  4. data/lib/rack/mount/vendor/regin/regin/version.rb +1 -1
  5. data/lib/rack/mount/version.rb +1 -1
  6. metadata +4 -4
data/lib/rack/mount/vendor/regin/regin.rb CHANGED
@@ -10,36 +10,66 @@ module Regin
10
10
  autoload :Options, 'regin/options'
11
11
  autoload :Parser, 'regin/parser'
12
12
 
13
- class << self
14
- begin
15
- eval('foo = /(?<foo>.*)/').named_captures
16
-
17
- # Returns true if the interpreter is using the Oniguruma Regexp lib
18
- # and supports named captures.
19
- #
20
- # /(?<foo>bar)/
21
- def regexp_supports_named_captures?
22
- true
23
- end
24
- rescue SyntaxError, NoMethodError
25
- def regexp_supports_named_captures? #:nodoc:
26
- false
27
- end
28
- end
13
+ # Detect named capture support
14
+ begin
15
+ old_debug, $DEBUG = $DEBUG, nil
16
+ eval('foo = /(?<foo>.*)/').named_captures
29
17
 
30
- # Parses Regexp and returns a Expression data structure.
31
- def parse(regexp)
32
- Parser.parse_regexp(regexp)
18
+ # Returns true if the interpreter is using the Oniguruma Regexp lib
19
+ # and supports named captures.
20
+ #
21
+ # /(?<foo>bar)/
22
+ def self.regexp_supports_named_captures?
23
+ true
24
+ end
25
+ rescue SyntaxError, NoMethodError
26
+ def self.regexp_supports_named_captures? #:nodoc:
27
+ false
33
28
  end
29
+ ensure
30
+ $DEBUG = old_debug
31
+ end
34
32
 
35
- # Recompiles Regexp by parsing it and turning it back into a Regexp.
36
- #
37
- # (In the future Regin will perform some Regexp optimizations
38
- # such as removing unnecessary captures and options)
39
- def compile(source)
40
- regexp = Regexp.compile(source)
41
- expression = parse(regexp)
42
- Regexp.compile(expression.to_s(true), expression.flags)
33
+
34
+ POSIX_BRACKET_TYPES = %w(
35
+ alnum alpha ascii blank cntrl digit graph
36
+ lower print punct space upper word xdigit
37
+ foo
38
+ )
39
+
40
+ # Returns array of supported POSX bracket types
41
+ def self.supported_posix_bracket_types
42
+ @supported_posix_bracket_types ||= []
43
+ end
44
+
45
+ # Detect supported posix bracket types
46
+ begin
47
+ old_debug, $DEBUG = $DEBUG, nil
48
+
49
+ POSIX_BRACKET_TYPES.each do |type|
50
+ begin
51
+ eval("foo = /[[:#{type}:]]/")
52
+ supported_posix_bracket_types << type
53
+ rescue SyntaxError, RegexpError
54
+ end
43
55
  end
56
+ ensure
57
+ $DEBUG = old_debug
58
+ end
59
+
60
+
61
+ # Parses Regexp and returns a Expression data structure.
62
+ def self.parse(regexp)
63
+ Parser.parse_regexp(regexp)
64
+ end
65
+
66
+ # Recompiles Regexp by parsing it and turning it back into a Regexp.
67
+ #
68
+ # (In the future Regin will perform some Regexp optimizations
69
+ # such as removing unnecessary captures and options)
70
+ def self.compile(source)
71
+ regexp = Regexp.compile(source)
72
+ expression = parse(regexp)
73
+ Regexp.compile(expression.to_s(true), expression.flags)
44
74
  end
45
75
  end
data/lib/rack/mount/vendor/regin/regin/parser.rb CHANGED
@@ -30,120 +30,149 @@ end
30
30
  ##### State transition tables begin ###
31
31
 
32
32
  racc_action_table = [
33
- 3, 54, 39, 8, 10, 12, 14, 50, 37, 58,
34
- 3, 2, 5, 8, 10, 12, 14, 59, 51, 36,
35
- 3, 2, 5, 8, 10, 12, 14, 47, 40, 41,
36
- 3, 2, 5, 8, 10, 12, 14, 47, 40, 41,
37
- 3, 2, 5, 8, 10, 12, 14, 47, 40, 41,
38
- 3, 2, 5, 8, 10, 12, 14, 47, 40, 41,
39
- 3, 2, 5, 8, 10, 12, 14, 33, 28, 18,
40
- 3, 2, 5, 8, 10, 12, 14, 42, 43, 30,
41
- 21, 2, 5, 31, 23, 46, 47, 40, 41, 24,
42
- 25, 26, 49, 65, 17, 20, 31, 18, 56, 47,
43
- 40, 41, 62, 47, 40, 41, 47, 40, 41, 47,
44
- 40, 41, 19, 48 ]
33
+ 45, 47, 67, 69, 56, 57, 58, 59, 60, 61,
34
+ 62, 63, 64, 66, 68, 55, 53, 83, 46, 48,
35
+ 49, 74, 44, 46, 48, 49, 4, 54, 16, 7,
36
+ 9, 11, 13, 18, 19, 20, 4, 3, 5, 7,
37
+ 9, 11, 13, 46, 48, 49, 4, 3, 5, 7,
38
+ 9, 11, 13, 46, 48, 49, 4, 3, 5, 7,
39
+ 9, 11, 13, 46, 48, 49, 4, 3, 5, 7,
40
+ 9, 11, 13, 26, 29, 27, 4, 3, 5, 7,
41
+ 9, 11, 13, 46, 48, 49, 4, 3, 5, 7,
42
+ 9, 11, 13, 46, 48, 49, 4, 3, 5, 7,
43
+ 9, 11, 13, 77, 21, 70, 21, 3, 5, 39,
44
+ 28, 25, 21, 37, 21, 79, 23, 39, 80, 25,
45
+ 75, 46, 48, 49, 46, 48, 49, 52, 32, 33,
46
+ 85, 35, 87, 41, 36 ]
45
47
 
46
48
  racc_action_check = [
47
- 0, 44, 26, 0, 0, 0, 0, 38, 25, 52,
48
- 43, 0, 0, 43, 43, 43, 43, 53, 38, 24,
49
- 54, 43, 43, 54, 54, 54, 54, 63, 63, 63,
50
- 21, 54, 54, 21, 21, 21, 21, 62, 62, 62,
51
- 20, 21, 21, 20, 20, 20, 20, 57, 57, 57,
52
- 9, 20, 20, 9, 9, 9, 9, 56, 56, 56,
53
- 14, 9, 9, 14, 14, 14, 14, 19, 14, 17,
54
- 42, 14, 14, 42, 42, 42, 42, 28, 28, 16,
55
- 7, 42, 42, 16, 13, 28, 28, 28, 28, 13,
56
- 13, 13, 32, 60, 3, 6, 32, 3, 45, 45,
57
- 45, 45, 55, 55, 55, 55, 46, 46, 46, 64,
58
- 64, 64, 4, 29 ]
49
+ 29, 29, 36, 36, 36, 36, 36, 36, 36, 36,
50
+ 36, 36, 36, 36, 36, 36, 34, 76, 76, 76,
51
+ 76, 50, 29, 29, 29, 29, 27, 34, 1, 27,
52
+ 27, 27, 27, 1, 1, 1, 45, 27, 27, 45,
53
+ 45, 45, 45, 75, 75, 75, 0, 45, 45, 0,
54
+ 0, 0, 0, 71, 71, 71, 47, 0, 0, 47,
55
+ 47, 47, 47, 78, 78, 78, 13, 47, 47, 13,
56
+ 13, 13, 13, 8, 13, 10, 14, 13, 13, 14,
57
+ 14, 14, 14, 82, 82, 82, 74, 14, 14, 74,
58
+ 74, 74, 74, 44, 44, 44, 28, 74, 74, 28,
59
+ 28, 28, 28, 65, 40, 40, 23, 28, 28, 40,
60
+ 12, 23, 22, 22, 4, 72, 4, 22, 73, 4,
61
+ 51, 51, 51, 51, 83, 83, 83, 30, 18, 19,
62
+ 77, 20, 81, 26, 21 ]
59
63
 
60
64
  racc_action_pointer = [
61
- -3, nil, nil, 89, 112, nil, 93, 78, nil, 47,
62
- nil, nil, nil, 73, 57, nil, 75, 61, nil, 67,
63
- 37, 27, nil, nil, 8, -3, -6, nil, 65, 103,
64
- nil, nil, 88, nil, nil, nil, nil, nil, -1, nil,
65
- nil, nil, 67, 7, -11, 78, 85, nil, nil, nil,
66
- nil, nil, -1, 7, 17, 82, 36, 26, nil, nil,
67
- 83, nil, 16, 6, 88, nil, nil, nil, nil ]
65
+ 43, 17, nil, nil, 111, nil, nil, nil, 73, nil,
66
+ 73, nil, 108, 63, 73, nil, nil, nil, 117, 118,
67
+ 123, 122, 109, 103, nil, nil, 133, 23, 93, -12,
68
+ 117, nil, nil, nil, 8, nil, -18, nil, nil, nil,
69
+ 101, nil, nil, nil, 58, 33, nil, 53, nil, nil,
70
+ 9, 86, nil, nil, nil, nil, nil, nil, nil, nil,
71
+ nil, nil, nil, nil, nil, 91, nil, nil, nil, nil,
72
+ nil, 18, 105, 108, 83, 8, -17, 126, 28, nil,
73
+ nil, 122, 48, 89, nil, nil, nil, nil, nil, nil ]
68
74
 
69
75
  racc_action_default = [
70
- -40, -15, -21, -40, -40, -22, -1, -2, -13, -5,
71
- -14, -7, -16, -9, -40, -10, -40, -40, -32, -40,
72
- -40, -40, -6, -25, -23, -24, -40, -8, -40, -40,
73
- -11, -31, -40, 69, -3, -4, -26, -27, -40, -30,
74
- -38, -39, -40, -40, -40, -40, -40, -37, -17, -12,
75
- -29, -28, -40, -40, -40, -40, -40, -40, -19, -20,
76
- -40, -36, -40, -40, -40, -18, -35, -34, -33 ]
76
+ -57, -9, -10, -21, -57, -22, -15, -13, -57, -14,
77
+ -1, -16, -2, -57, -5, -7, -25, -8, -23, -24,
78
+ -57, -57, -57, -57, -33, -34, -57, -57, -57, -57,
79
+ -57, -6, -26, -27, -57, -30, -57, -11, -31, -32,
80
+ -57, 90, -3, -4, -57, -57, -54, -57, -55, -56,
81
+ -57, -57, -17, -29, -28, -49, -38, -39, -40, -41,
82
+ -42, -43, -44, -45, -46, -57, -47, -36, -48, -37,
83
+ -12, -57, -57, -57, -57, -57, -57, -57, -57, -19,
84
+ -20, -57, -57, -57, -53, -35, -50, -18, -51, -52 ]
77
85
 
78
86
  racc_goto_table = [
79
- 4, 45, 16, 34, 35, 44, 27, 38, 22, nil,
80
- nil, nil, nil, nil, 29, nil, 32, nil, 55, 57,
81
- nil, nil, nil, nil, nil, nil, nil, nil, 61, 63,
82
- 64, nil, nil, nil, nil, 66, 67, 68, nil, nil,
83
- nil, nil, 52, 53, nil, nil, nil, nil, nil, nil,
84
- nil, nil, nil, nil, 60 ]
87
+ 8, 22, 51, 38, 42, 43, 34, 31, 17, 65,
88
+ 50, nil, nil, 30, nil, nil, nil, 71, nil, nil,
89
+ 40, 38, nil, nil, 76, nil, nil, nil, nil, nil,
90
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
91
+ nil, nil, nil, nil, 78, 72, nil, 73, 82, 84,
92
+ nil, 86, nil, nil, nil, 88, 89, nil, nil, nil,
93
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
94
+ nil, nil, nil, nil, 81 ]
85
95
 
86
96
  racc_goto_check = [
87
- 1, 13, 9, 3, 3, 11, 7, 12, 5, nil,
88
- nil, nil, nil, nil, 1, nil, 9, nil, 13, 13,
89
- nil, nil, nil, nil, nil, nil, nil, nil, 13, 13,
90
- 13, nil, nil, nil, nil, 13, 13, 13, nil, nil,
91
- nil, nil, 1, 1, nil, nil, nil, nil, nil, nil,
97
+ 1, 9, 15, 13, 3, 3, 12, 5, 7, 14,
98
+ 11, nil, nil, 1, nil, nil, nil, 15, nil, nil,
99
+ 9, 13, nil, nil, 15, nil, nil, nil, nil, nil,
100
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
101
+ nil, nil, nil, nil, 15, 1, nil, 1, 15, 15,
102
+ nil, 15, nil, nil, nil, 15, 15, nil, nil, nil,
103
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
92
104
  nil, nil, nil, nil, 1 ]
93
105
 
94
106
  racc_goto_pointer = [
95
- nil, 0, nil, -17, nil, -1, nil, -7, nil, -1,
96
- nil, -23, -19, -27 ]
107
+ nil, 0, nil, -23, nil, -7, nil, 7, nil, -3,
108
+ nil, -19, -14, -19, -27, -27 ]
97
109
 
98
110
  racc_goto_default = [
99
- nil, nil, 6, 7, 9, 11, 13, nil, 15, nil,
100
- 1, nil, nil, nil ]
111
+ nil, nil, 10, 12, 14, 15, 1, nil, 2, nil,
112
+ 6, nil, nil, 24, nil, nil ]
101
113
 
102
114
  racc_reduce_table = [
103
115
  0, 0, :racc_error,
104
- 1, 25, :_reduce_1,
105
- 1, 25, :_reduce_none,
106
- 3, 26, :_reduce_3,
107
- 3, 26, :_reduce_4,
108
- 1, 27, :_reduce_5,
109
- 2, 28, :_reduce_6,
110
- 1, 28, :_reduce_7,
111
- 2, 29, :_reduce_8,
112
- 1, 29, :_reduce_none,
113
- 1, 30, :_reduce_none,
114
- 3, 30, :_reduce_11,
115
- 4, 30, :_reduce_12,
116
- 1, 30, :_reduce_13,
117
- 1, 30, :_reduce_14,
118
- 1, 30, :_reduce_15,
119
- 1, 30, :_reduce_16,
120
- 3, 32, :_reduce_17,
121
- 6, 32, :_reduce_18,
122
- 5, 32, :_reduce_19,
123
- 5, 32, :_reduce_20,
124
- 1, 34, :_reduce_none,
125
- 1, 34, :_reduce_none,
126
- 1, 31, :_reduce_none,
127
- 1, 31, :_reduce_none,
128
- 1, 31, :_reduce_none,
129
- 2, 31, :_reduce_26,
130
- 2, 31, :_reduce_27,
131
- 3, 31, :_reduce_28,
132
- 2, 36, :_reduce_29,
133
- 1, 36, :_reduce_none,
134
- 2, 33, :_reduce_31,
135
- 1, 33, :_reduce_none,
136
- 4, 35, :_reduce_33,
137
- 4, 35, :_reduce_34,
138
- 4, 35, :_reduce_35,
139
- 3, 35, :_reduce_36,
140
- 1, 37, :_reduce_37,
141
- 1, 37, :_reduce_38,
142
- 1, 37, :_reduce_39 ]
143
-
144
- racc_reduce_n = 40
145
-
146
- racc_shift_n = 69
116
+ 1, 39, :_reduce_1,
117
+ 1, 39, :_reduce_none,
118
+ 3, 40, :_reduce_3,
119
+ 3, 40, :_reduce_4,
120
+ 1, 41, :_reduce_5,
121
+ 2, 42, :_reduce_6,
122
+ 1, 42, :_reduce_7,
123
+ 2, 43, :_reduce_8,
124
+ 1, 43, :_reduce_none,
125
+ 1, 44, :_reduce_none,
126
+ 3, 44, :_reduce_11,
127
+ 4, 44, :_reduce_12,
128
+ 1, 44, :_reduce_13,
129
+ 1, 44, :_reduce_14,
130
+ 1, 44, :_reduce_15,
131
+ 1, 44, :_reduce_16,
132
+ 3, 46, :_reduce_17,
133
+ 6, 46, :_reduce_18,
134
+ 5, 46, :_reduce_19,
135
+ 5, 46, :_reduce_20,
136
+ 1, 48, :_reduce_none,
137
+ 1, 48, :_reduce_none,
138
+ 1, 45, :_reduce_none,
139
+ 1, 45, :_reduce_none,
140
+ 1, 45, :_reduce_none,
141
+ 2, 45, :_reduce_26,
142
+ 2, 45, :_reduce_27,
143
+ 3, 45, :_reduce_28,
144
+ 2, 50, :_reduce_29,
145
+ 1, 50, :_reduce_none,
146
+ 2, 47, :_reduce_31,
147
+ 2, 47, :_reduce_32,
148
+ 1, 47, :_reduce_none,
149
+ 1, 47, :_reduce_none,
150
+ 5, 51, :_reduce_35,
151
+ 1, 52, :_reduce_none,
152
+ 1, 52, :_reduce_none,
153
+ 1, 52, :_reduce_none,
154
+ 1, 52, :_reduce_none,
155
+ 1, 52, :_reduce_none,
156
+ 1, 52, :_reduce_none,
157
+ 1, 52, :_reduce_none,
158
+ 1, 52, :_reduce_none,
159
+ 1, 52, :_reduce_none,
160
+ 1, 52, :_reduce_none,
161
+ 1, 52, :_reduce_none,
162
+ 1, 52, :_reduce_none,
163
+ 1, 52, :_reduce_none,
164
+ 1, 52, :_reduce_none,
165
+ 4, 49, :_reduce_50,
166
+ 4, 49, :_reduce_51,
167
+ 4, 49, :_reduce_52,
168
+ 3, 49, :_reduce_53,
169
+ 1, 53, :_reduce_54,
170
+ 1, 53, :_reduce_55,
171
+ 1, 53, :_reduce_56 ]
172
+
173
+ racc_reduce_n = 57
174
+
175
+ racc_shift_n = 90
147
176
 
148
177
  racc_token_table = {
149
178
  false => 0,
@@ -166,12 +195,26 @@ racc_token_table = {
166
195
  :PLUS => 17,
167
196
  :LCURLY => 18,
168
197
  :RCURLY => 19,
169
- :MINUS => 20,
170
- :MULTILINE => 21,
171
- :IGNORECASE => 22,
172
- :EXTENDED => 23 }
173
-
174
- racc_nt_base = 24
198
+ "alnum" => 20,
199
+ "alpha" => 21,
200
+ "ascii" => 22,
201
+ "blank" => 23,
202
+ "cntrl" => 24,
203
+ "digit" => 25,
204
+ "graph" => 26,
205
+ "lower" => 27,
206
+ "print" => 28,
207
+ "punct" => 29,
208
+ "space" => 30,
209
+ "upper" => 31,
210
+ "word" => 32,
211
+ "xdigit" => 33,
212
+ :MINUS => 34,
213
+ :MULTILINE => 35,
214
+ :IGNORECASE => 36,
215
+ :EXTENDED => 37 }
216
+
217
+ racc_nt_base = 38
175
218
 
176
219
  racc_use_result_var = true
177
220
 
@@ -212,6 +255,20 @@ Racc_token_to_s_table = [
212
255
  "PLUS",
213
256
  "LCURLY",
214
257
  "RCURLY",
258
+ "\"alnum\"",
259
+ "\"alpha\"",
260
+ "\"ascii\"",
261
+ "\"blank\"",
262
+ "\"cntrl\"",
263
+ "\"digit\"",
264
+ "\"graph\"",
265
+ "\"lower\"",
266
+ "\"print\"",
267
+ "\"punct\"",
268
+ "\"space\"",
269
+ "\"upper\"",
270
+ "\"word\"",
271
+ "\"xdigit\"",
215
272
  "MINUS",
216
273
  "MULTILINE",
217
274
  "IGNORECASE",
@@ -229,6 +286,8 @@ Racc_token_to_s_table = [
229
286
  "anchor",
230
287
  "options",
231
288
  "quantifier_char",
289
+ "posix_bracket_expression",
290
+ "posix_bracket_type",
232
291
  "modifier" ]
233
292
 
234
293
  Racc_debug_parser = false
@@ -370,43 +429,83 @@ def _reduce_31(val, _values, result)
370
429
  result
371
430
  end
372
431
 
373
- # reduce 32 omitted
432
+ def _reduce_32(val, _values, result)
433
+ result = val.join
434
+ result
435
+ end
436
+
437
+ # reduce 33 omitted
438
+
439
+ # reduce 34 omitted
440
+
441
+ def _reduce_35(val, _values, result)
442
+ result = val.join
443
+ result
444
+ end
445
+
446
+ # reduce 36 omitted
447
+
448
+ # reduce 37 omitted
374
449
 
375
- def _reduce_33(val, _values, result)
450
+ # reduce 38 omitted
451
+
452
+ # reduce 39 omitted
453
+
454
+ # reduce 40 omitted
455
+
456
+ # reduce 41 omitted
457
+
458
+ # reduce 42 omitted
459
+
460
+ # reduce 43 omitted
461
+
462
+ # reduce 44 omitted
463
+
464
+ # reduce 45 omitted
465
+
466
+ # reduce 46 omitted
467
+
468
+ # reduce 47 omitted
469
+
470
+ # reduce 48 omitted
471
+
472
+ # reduce 49 omitted
473
+
474
+ def _reduce_50(val, _values, result)
376
475
  @options_stack << result = { val[1] => false, val[2] => false, val[3] => false }
377
476
 
378
477
  result
379
478
  end
380
479
 
381
- def _reduce_34(val, _values, result)
480
+ def _reduce_51(val, _values, result)
382
481
  @options_stack << result = { val[0] => true, val[2] => false, val[3] => false }
383
482
 
384
483
  result
385
484
  end
386
485
 
387
- def _reduce_35(val, _values, result)
486
+ def _reduce_52(val, _values, result)
388
487
  @options_stack << result = { val[0] => true, val[1] => true, val[3] => false }
389
488
 
390
489
  result
391
490
  end
392
491
 
393
- def _reduce_36(val, _values, result)
492
+ def _reduce_53(val, _values, result)
394
493
  @options_stack << result = { val[0] => true, val[1] => true, val[2] => true }
395
494
 
396
495
  result
397
496
  end
398
497
 
399
- def _reduce_37(val, _values, result)
498
+ def _reduce_54(val, _values, result)
400
499
  result = :multiline
401
500
  result
402
501
  end
403
502
 
404
- def _reduce_38(val, _values, result)
503
+ def _reduce_55(val, _values, result)
405
504
  result = :ignorecase
406
505
  result
407
506
  end
408
507
 
409
- def _reduce_39(val, _values, result)
508
+ def _reduce_56(val, _values, result)
410
509
  result = :extended
411
510
  result
412
511
  end
data/lib/rack/mount/vendor/regin/regin/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Regin
2
- Version = '0.3.6'
2
+ Version = '0.3.7'
3
3
  end
data/lib/rack/mount/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Rack::Mount
2
- Version = '0.6.12'
2
+ Version = '0.6.13'
3
3
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rack-mount
3
3
  version: !ruby/object:Gem::Version
4
- hash: 31
4
+ hash: 29
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 6
9
- - 12
10
- version: 0.6.12
9
+ - 13
10
+ version: 0.6.13
11
11
  platform: ruby
12
12
  authors:
13
13
  - Joshua Peek
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-08-22 00:00:00 -05:00
18
+ date: 2010-08-31 00:00:00 -05:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency