sinatra-contrib 1.4.2 → 1.4.4

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.
Files changed (32) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE +2 -0
  3. data/README.md +3 -0
  4. data/Rakefile +3 -3
  5. data/lib/sinatra/capture.rb +1 -1
  6. data/lib/sinatra/config_file.rb +4 -3
  7. data/lib/sinatra/contrib/version.rb +1 -1
  8. data/lib/sinatra/cookies.rb +2 -4
  9. data/lib/sinatra/custom_logger.rb +60 -0
  10. data/lib/sinatra/decompile.rb +7 -1
  11. data/lib/sinatra/namespace.rb +10 -3
  12. data/lib/sinatra/reloader.rb +6 -4
  13. data/lib/sinatra/respond_with.rb +30 -13
  14. data/lib/sinatra/streaming.rb +1 -1
  15. data/sinatra-contrib.gemspec +40 -3
  16. data/spec/capture_spec.rb +9 -2
  17. data/spec/config_file_spec.rb +1 -2
  18. data/spec/content_for_spec.rb +1 -2
  19. data/spec/cookies_spec.rb +25 -18
  20. data/spec/custom_logger_spec.rb +43 -0
  21. data/spec/decompile_spec.rb +1 -2
  22. data/spec/extension_spec.rb +2 -3
  23. data/spec/json_spec.rb +2 -3
  24. data/spec/link_header_spec.rb +1 -2
  25. data/spec/multi_route_spec.rb +1 -2
  26. data/spec/namespace_spec.rb +125 -60
  27. data/spec/reloader_spec.rb +1 -2
  28. data/spec/respond_with/bar.erb +1 -1
  29. data/spec/respond_with_spec.rb +3 -4
  30. data/spec/spec_helper.rb +1 -1
  31. data/spec/streaming_spec.rb +3 -3
  32. metadata +242 -30
data/spec/reloader_spec.rb CHANGED
@@ -1,5 +1,4 @@
1
- require 'backports'
2
- require_relative 'spec_helper'
1
+ require 'spec_helper'
3
2
  require 'fileutils'
4
3
 
5
4
  describe Sinatra::Reloader do
data/spec/respond_with/bar.erb CHANGED
@@ -1 +1 @@
1
- Girl! I wanna take you to a ... bar!
1
+ guten Tag!
data/spec/respond_with_spec.rb CHANGED
@@ -1,8 +1,7 @@
1
- require 'backports'
2
1
  require 'multi_json'
3
2
 
4
- require_relative 'spec_helper'
5
- require_relative 'okjson'
3
+ require 'spec_helper'
4
+ require 'okjson'
6
5
 
7
6
  describe Sinatra::RespondWith do
8
7
  def provides(*args)
@@ -199,7 +198,7 @@ describe Sinatra::RespondWith do
199
198
  it 'looks for templates with name.engine for specific engines' do
200
199
  respond_with :bar
201
200
  req(:html).should be_ok
202
- body.should == "Girl! I wanna take you to a ... bar!"
201
+ body.should == "guten Tag!"
203
202
  end
204
203
 
205
204
  it 'does not use name.engine for engines producing other formats' do
data/spec/spec_helper.rb CHANGED
@@ -2,6 +2,6 @@ ENV['RACK_ENV'] = 'test'
2
2
  require 'sinatra/contrib'
3
3
 
4
4
  RSpec.configure do |config|
5
- config.expect_with :rspec#, :stdlib
5
+ config.expect_with :rspec
6
6
  config.include Sinatra::TestHelpers
7
7
  end
data/spec/streaming_spec.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require 'backports'
2
- require_relative 'spec_helper'
2
+ require 'spec_helper'
3
3
 
4
4
  describe Sinatra::Streaming do
5
5
  def stream(&block)
@@ -26,7 +26,7 @@ describe Sinatra::Streaming do
26
26
  it 'runs the given block' do
27
27
  ran = false
28
28
  stream { ran = true }
29
- ran.should be_true
29
+ ran.should be true
30
30
  end
31
31
 
32
32
  it 'returns the stream object' do
@@ -334,7 +334,7 @@ describe Sinatra::Streaming do
334
334
  fired = false
335
335
  out.callback { fired = true }
336
336
  out.close
337
- fired.should be_true
337
+ fired.should be true
338
338
  end
339
339
  end
340
340
 
metadata CHANGED
@@ -1,203 +1,401 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sinatra-contrib
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.2
4
+ version: 1.4.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Konstantin Haase
8
8
  - Gabriel Andretta
9
- - Trevor Bramble
10
9
  - Zachary Scott
10
+ - Trevor Bramble
11
11
  - Katrina Owen
12
12
  - Nicolas Sanguinetti
13
+ - Ashley Williams
13
14
  - Hrvoje Šimić
14
15
  - Masahiro Fujiwara
15
16
  - Rafael Magana
17
+ - Vipul A M
16
18
  - Jack Chu
17
19
  - Ilya Shindyapin
20
+ - Jake Worth
18
21
  - Kashyap
19
22
  - Sumeet Singh
20
23
  - lest
21
24
  - Adrian Pacała
22
25
  - Aish
26
+ - Alexey Chernenkov
23
27
  - Andrew Crump
28
+ - Bo Jeanes
24
29
  - David Asabina
25
30
  - Eliot Shepard
26
31
  - Eric Marden
27
32
  - Gray Manley
28
33
  - Guillaume Bouteille
29
34
  - Jamie Hodge
35
+ - Koichi Sasada
30
36
  - Kyle Lacy
37
+ - Lars Vonk
31
38
  - Martin Frost
32
39
  - Mathieu Allaire
33
40
  - Matt Lyon
34
41
  - Matthew Conway
35
42
  - Meck
36
43
  - Michi Huber
44
+ - Nic Benders
37
45
  - Patricio Mac Adden
38
46
  - Reed Lipman
39
47
  - Samy Dindane
48
+ - Sergey Nartimov
40
49
  - Thibaut Sacreste
41
50
  - Uchio KONDO
42
51
  - Will Bailey
52
+ - ashley williams
43
53
  - undr
44
54
  autorequire:
45
55
  bindir: bin
46
56
  cert_chain: []
47
- date: 2013-12-01 00:00:00.000000000 Z
57
+ date: 2015-06-06 00:00:00.000000000 Z
48
58
  dependencies:
49
59
  - !ruby/object:Gem::Dependency
50
60
  name: sinatra
51
61
  requirement: !ruby/object:Gem::Requirement
52
62
  requirements:
53
- - - ~>
63
+ - - "~>"
54
64
  - !ruby/object:Gem::Version
55
65
  version: 1.4.0
56
66
  type: :runtime
57
67
  prerelease: false
58
68
  version_requirements: !ruby/object:Gem::Requirement
59
69
  requirements:
60
- - - ~>
70
+ - - "~>"
61
71
  - !ruby/object:Gem::Version
62
72
  version: 1.4.0
63
73
  - !ruby/object:Gem::Dependency
64
74
  name: backports
65
75
  requirement: !ruby/object:Gem::Requirement
66
76
  requirements:
67
- - - '>='
77
+ - - ">="
68
78
  - !ruby/object:Gem::Version
69
79
  version: '2.0'
70
80
  type: :runtime
71
81
  prerelease: false
72
82
  version_requirements: !ruby/object:Gem::Requirement
73
83
  requirements:
74
- - - '>='
84
+ - - ">="
75
85
  - !ruby/object:Gem::Version
76
86
  version: '2.0'
77
87
  - !ruby/object:Gem::Dependency
78
88
  name: tilt
79
89
  requirement: !ruby/object:Gem::Requirement
80
90
  requirements:
81
- - - ~>
91
+ - - ">="
82
92
  - !ruby/object:Gem::Version
83
93
  version: '1.3'
94
+ - - "<"
95
+ - !ruby/object:Gem::Version
96
+ version: '3'
84
97
  type: :runtime
85
98
  prerelease: false
86
99
  version_requirements: !ruby/object:Gem::Requirement
87
100
  requirements:
88
- - - ~>
101
+ - - ">="
89
102
  - !ruby/object:Gem::Version
90
103
  version: '1.3'
104
+ - - "<"
105
+ - !ruby/object:Gem::Version
106
+ version: '3'
91
107
  - !ruby/object:Gem::Dependency
92
108
  name: rack-test
93
109
  requirement: !ruby/object:Gem::Requirement
94
110
  requirements:
95
- - - '>='
111
+ - - ">="
96
112
  - !ruby/object:Gem::Version
97
113
  version: '0'
98
114
  type: :runtime
99
115
  prerelease: false
100
116
  version_requirements: !ruby/object:Gem::Requirement
101
117
  requirements:
102
- - - '>='
118
+ - - ">="
103
119
  - !ruby/object:Gem::Version
104
120
  version: '0'
105
121
  - !ruby/object:Gem::Dependency
106
122
  name: rack-protection
107
123
  requirement: !ruby/object:Gem::Requirement
108
124
  requirements:
109
- - - '>='
125
+ - - ">="
110
126
  - !ruby/object:Gem::Version
111
127
  version: '0'
112
128
  type: :runtime
113
129
  prerelease: false
114
130
  version_requirements: !ruby/object:Gem::Requirement
115
131
  requirements:
116
- - - '>='
132
+ - - ">="
117
133
  - !ruby/object:Gem::Version
118
134
  version: '0'
119
135
  - !ruby/object:Gem::Dependency
120
136
  name: multi_json
121
137
  requirement: !ruby/object:Gem::Requirement
122
138
  requirements:
123
- - - '>='
139
+ - - ">="
124
140
  - !ruby/object:Gem::Version
125
141
  version: '0'
126
142
  type: :runtime
127
143
  prerelease: false
128
144
  version_requirements: !ruby/object:Gem::Requirement
129
145
  requirements:
130
- - - '>='
146
+ - - ">="
131
147
  - !ruby/object:Gem::Version
132
148
  version: '0'
133
149
  - !ruby/object:Gem::Dependency
134
150
  name: rspec
135
151
  requirement: !ruby/object:Gem::Requirement
136
152
  requirements:
137
- - - ~>
153
+ - - "~>"
138
154
  - !ruby/object:Gem::Version
139
155
  version: '2.3'
140
156
  type: :development
141
157
  prerelease: false
142
158
  version_requirements: !ruby/object:Gem::Requirement
143
159
  requirements:
144
- - - ~>
160
+ - - "~>"
145
161
  - !ruby/object:Gem::Version
146
162
  version: '2.3'
147
163
  - !ruby/object:Gem::Dependency
148
164
  name: haml
149
165
  requirement: !ruby/object:Gem::Requirement
150
166
  requirements:
151
- - - '>='
167
+ - - ">="
152
168
  - !ruby/object:Gem::Version
153
169
  version: '0'
154
170
  type: :development
155
171
  prerelease: false
156
172
  version_requirements: !ruby/object:Gem::Requirement
157
173
  requirements:
158
- - - '>='
174
+ - - ">="
159
175
  - !ruby/object:Gem::Version
160
176
  version: '0'
161
177
  - !ruby/object:Gem::Dependency
162
178
  name: erubis
163
179
  requirement: !ruby/object:Gem::Requirement
164
180
  requirements:
165
- - - '>='
181
+ - - ">="
166
182
  - !ruby/object:Gem::Version
167
183
  version: '0'
168
184
  type: :development
169
185
  prerelease: false
170
186
  version_requirements: !ruby/object:Gem::Requirement
171
187
  requirements:
172
- - - '>='
188
+ - - ">="
173
189
  - !ruby/object:Gem::Version
174
190
  version: '0'
175
191
  - !ruby/object:Gem::Dependency
176
192
  name: slim
177
193
  requirement: !ruby/object:Gem::Requirement
178
194
  requirements:
179
- - - '>='
195
+ - - ">="
196
+ - !ruby/object:Gem::Version
197
+ version: '0'
198
+ type: :development
199
+ prerelease: false
200
+ version_requirements: !ruby/object:Gem::Requirement
201
+ requirements:
202
+ - - ">="
203
+ - !ruby/object:Gem::Version
204
+ version: '0'
205
+ - !ruby/object:Gem::Dependency
206
+ name: less
207
+ requirement: !ruby/object:Gem::Requirement
208
+ requirements:
209
+ - - ">="
210
+ - !ruby/object:Gem::Version
211
+ version: '0'
212
+ type: :development
213
+ prerelease: false
214
+ version_requirements: !ruby/object:Gem::Requirement
215
+ requirements:
216
+ - - ">="
217
+ - !ruby/object:Gem::Version
218
+ version: '0'
219
+ - !ruby/object:Gem::Dependency
220
+ name: sass
221
+ requirement: !ruby/object:Gem::Requirement
222
+ requirements:
223
+ - - ">="
224
+ - !ruby/object:Gem::Version
225
+ version: '0'
226
+ type: :development
227
+ prerelease: false
228
+ version_requirements: !ruby/object:Gem::Requirement
229
+ requirements:
230
+ - - ">="
231
+ - !ruby/object:Gem::Version
232
+ version: '0'
233
+ - !ruby/object:Gem::Dependency
234
+ name: builder
235
+ requirement: !ruby/object:Gem::Requirement
236
+ requirements:
237
+ - - ">="
238
+ - !ruby/object:Gem::Version
239
+ version: '0'
240
+ type: :development
241
+ prerelease: false
242
+ version_requirements: !ruby/object:Gem::Requirement
243
+ requirements:
244
+ - - ">="
245
+ - !ruby/object:Gem::Version
246
+ version: '0'
247
+ - !ruby/object:Gem::Dependency
248
+ name: liquid
249
+ requirement: !ruby/object:Gem::Requirement
250
+ requirements:
251
+ - - ">="
252
+ - !ruby/object:Gem::Version
253
+ version: '0'
254
+ type: :development
255
+ prerelease: false
256
+ version_requirements: !ruby/object:Gem::Requirement
257
+ requirements:
258
+ - - ">="
259
+ - !ruby/object:Gem::Version
260
+ version: '0'
261
+ - !ruby/object:Gem::Dependency
262
+ name: redcarpet
263
+ requirement: !ruby/object:Gem::Requirement
264
+ requirements:
265
+ - - ">="
266
+ - !ruby/object:Gem::Version
267
+ version: '0'
268
+ type: :development
269
+ prerelease: false
270
+ version_requirements: !ruby/object:Gem::Requirement
271
+ requirements:
272
+ - - ">="
273
+ - !ruby/object:Gem::Version
274
+ version: '0'
275
+ - !ruby/object:Gem::Dependency
276
+ name: RedCloth
277
+ requirement: !ruby/object:Gem::Requirement
278
+ requirements:
279
+ - - ">="
280
+ - !ruby/object:Gem::Version
281
+ version: '0'
282
+ type: :development
283
+ prerelease: false
284
+ version_requirements: !ruby/object:Gem::Requirement
285
+ requirements:
286
+ - - ">="
287
+ - !ruby/object:Gem::Version
288
+ version: '0'
289
+ - !ruby/object:Gem::Dependency
290
+ name: asciidoctor
291
+ requirement: !ruby/object:Gem::Requirement
292
+ requirements:
293
+ - - ">="
294
+ - !ruby/object:Gem::Version
295
+ version: '0'
296
+ type: :development
297
+ prerelease: false
298
+ version_requirements: !ruby/object:Gem::Requirement
299
+ requirements:
300
+ - - ">="
301
+ - !ruby/object:Gem::Version
302
+ version: '0'
303
+ - !ruby/object:Gem::Dependency
304
+ name: radius
305
+ requirement: !ruby/object:Gem::Requirement
306
+ requirements:
307
+ - - ">="
308
+ - !ruby/object:Gem::Version
309
+ version: '0'
310
+ type: :development
311
+ prerelease: false
312
+ version_requirements: !ruby/object:Gem::Requirement
313
+ requirements:
314
+ - - ">="
315
+ - !ruby/object:Gem::Version
316
+ version: '0'
317
+ - !ruby/object:Gem::Dependency
318
+ name: coffee-script
319
+ requirement: !ruby/object:Gem::Requirement
320
+ requirements:
321
+ - - ">="
180
322
  - !ruby/object:Gem::Version
181
323
  version: '0'
182
324
  type: :development
183
325
  prerelease: false
184
326
  version_requirements: !ruby/object:Gem::Requirement
185
327
  requirements:
186
- - - '>='
328
+ - - ">="
329
+ - !ruby/object:Gem::Version
330
+ version: '0'
331
+ - !ruby/object:Gem::Dependency
332
+ name: nokogiri
333
+ requirement: !ruby/object:Gem::Requirement
334
+ requirements:
335
+ - - ">="
336
+ - !ruby/object:Gem::Version
337
+ version: '0'
338
+ type: :development
339
+ prerelease: false
340
+ version_requirements: !ruby/object:Gem::Requirement
341
+ requirements:
342
+ - - ">="
343
+ - !ruby/object:Gem::Version
344
+ version: '0'
345
+ - !ruby/object:Gem::Dependency
346
+ name: creole
347
+ requirement: !ruby/object:Gem::Requirement
348
+ requirements:
349
+ - - ">="
350
+ - !ruby/object:Gem::Version
351
+ version: '0'
352
+ type: :development
353
+ prerelease: false
354
+ version_requirements: !ruby/object:Gem::Requirement
355
+ requirements:
356
+ - - ">="
357
+ - !ruby/object:Gem::Version
358
+ version: '0'
359
+ - !ruby/object:Gem::Dependency
360
+ name: wikicloth
361
+ requirement: !ruby/object:Gem::Requirement
362
+ requirements:
363
+ - - ">="
364
+ - !ruby/object:Gem::Version
365
+ version: '0'
366
+ type: :development
367
+ prerelease: false
368
+ version_requirements: !ruby/object:Gem::Requirement
369
+ requirements:
370
+ - - ">="
371
+ - !ruby/object:Gem::Version
372
+ version: '0'
373
+ - !ruby/object:Gem::Dependency
374
+ name: markaby
375
+ requirement: !ruby/object:Gem::Requirement
376
+ requirements:
377
+ - - ">="
378
+ - !ruby/object:Gem::Version
379
+ version: '0'
380
+ type: :development
381
+ prerelease: false
382
+ version_requirements: !ruby/object:Gem::Requirement
383
+ requirements:
384
+ - - ">="
187
385
  - !ruby/object:Gem::Version
188
386
  version: '0'
189
387
  - !ruby/object:Gem::Dependency
190
388
  name: rake
191
389
  requirement: !ruby/object:Gem::Requirement
192
390
  requirements:
193
- - - '>='
391
+ - - ">="
194
392
  - !ruby/object:Gem::Version
195
393
  version: '0'
196
394
  type: :development
197
395
  prerelease: false
198
396
  version_requirements: !ruby/object:Gem::Requirement
199
397
  requirements:
200
- - - '>='
398
+ - - ">="
201
399
  - !ruby/object:Gem::Version
202
400
  version: '0'
203
401
  description: Collection of useful Sinatra extensions
@@ -205,41 +403,52 @@ email:
205
403
  - konstantin.mailinglists@googlemail.com
206
404
  - ohhgabriel@gmail.com
207
405
  - inbox@trevorbramble.com
406
+ - e@zzak.io
208
407
  - zachary@zacharyscott.net
209
408
  - katrina.owen@gmail.com
210
409
  - contacto@nicolassanguinetti.info
410
+ - ashley@bocoup.com
211
411
  - shime.ferovac@gmail.com
212
412
  - m-fujiwara@axsh.net
213
413
  - raf.magana@gmail.com
414
+ - vipulnsward@gmail.com
214
415
  - jack@jackchu.com
215
416
  - konstantin.haase@gmail.com
216
417
  - ilya@shindyapin.com
418
+ - jworth@prevailhs.com
217
419
  - kashyap.kmbc@gmail.com
218
420
  - ortuna@gmail.com
219
- - e@zzak.io
421
+ - tbramble@chef.io
220
422
  - just.lest@gmail.com
221
423
  - altpacala@gmail.com
222
424
  - aisha.fenton@visfleet.com
425
+ - laise@pisem.net
223
426
  - andrew.crump@ieee.org
427
+ - me@bjeanes.com
224
428
  - david@supr.nu
225
429
  - eshepard@slower.net
226
430
  - eric.marden@gmail.com
227
431
  - g.manley@tukaiz.com
228
432
  - duffman@via.ecp.fr
229
433
  - jamiehodge@me.com
434
+ - ko1@atdot.net
230
435
  - kylewlacy@me.com
436
+ - lars.vonk@gmail.com
231
437
  - blame@kth.se
232
438
  - mathieuallaire@gmail.com
233
439
  - matt@flowerpowered.com
234
440
  - himself@mattonrails.com
235
441
  - yesmeck@gmail.com
236
442
  - michi.huber@gmail.com
443
+ - nic@newrelic.com
237
444
  - patriciomacadden@gmail.com
238
445
  - rmlipman@gmail.com
239
446
  - samy@dindane.com
447
+ - just.lest@gmail.com
240
448
  - thibaut.sacreste@gmail.com
241
449
  - udzura@udzura.jp
242
450
  - will.bailey@gmail.com
451
+ - ashley666ashley@gmail.com
243
452
  - undr@yandex.ru
244
453
  executables: []
245
454
  extensions: []
@@ -257,6 +466,7 @@ files:
257
466
  - lib/sinatra/contrib/setup.rb
258
467
  - lib/sinatra/contrib/version.rb
259
468
  - lib/sinatra/cookies.rb
469
+ - lib/sinatra/custom_logger.rb
260
470
  - lib/sinatra/decompile.rb
261
471
  - lib/sinatra/engine_tracking.rb
262
472
  - lib/sinatra/extension.rb
@@ -311,6 +521,7 @@ files:
311
521
  - spec/content_for/takes_values.slim
312
522
  - spec/content_for_spec.rb
313
523
  - spec/cookies_spec.rb
524
+ - spec/custom_logger_spec.rb
314
525
  - spec/decompile_spec.rb
315
526
  - spec/extension_spec.rb
316
527
  - spec/json_spec.rb
@@ -331,7 +542,8 @@ files:
331
542
  - spec/spec_helper.rb
332
543
  - spec/streaming_spec.rb
333
544
  homepage: http://github.com/sinatra/sinatra-contrib
334
- licenses: []
545
+ licenses:
546
+ - MIT
335
547
  metadata: {}
336
548
  post_install_message:
337
549
  rdoc_options: []
@@ -339,17 +551,17 @@ require_paths:
339
551
  - lib
340
552
  required_ruby_version: !ruby/object:Gem::Requirement
341
553
  requirements:
342
- - - '>='
554
+ - - ">="
343
555
  - !ruby/object:Gem::Version
344
556
  version: '0'
345
557
  required_rubygems_version: !ruby/object:Gem::Requirement
346
558
  requirements:
347
- - - '>='
559
+ - - ">="
348
560
  - !ruby/object:Gem::Version
349
561
  version: '0'
350
562
  requirements: []
351
563
  rubyforge_project:
352
- rubygems_version: 2.0.6
564
+ rubygems_version: 2.4.6
353
565
  signing_key:
354
566
  specification_version: 4
355
567
  summary: Collection of useful Sinatra extensions