sinatra 1.4.8 → 2.0.0

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 (126) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +111 -47
  3. data/CONTRIBUTING.md +1 -1
  4. data/Gemfile +41 -49
  5. data/LICENSE +4 -1
  6. data/MAINTENANCE.md +42 -0
  7. data/README.de.md +644 -436
  8. data/README.es.md +6 -6
  9. data/README.fr.md +9 -9
  10. data/README.hu.md +37 -3
  11. data/README.ja.md +103 -45
  12. data/README.ko.md +8 -8
  13. data/README.md +471 -363
  14. data/README.pt-br.md +3 -3
  15. data/README.pt-pt.md +2 -2
  16. data/README.ru.md +42 -64
  17. data/README.zh.md +8 -8
  18. data/Rakefile +72 -49
  19. data/SECURITY.md +35 -0
  20. data/lib/sinatra/base.rb +137 -195
  21. data/lib/sinatra/indifferent_hash.rb +150 -0
  22. data/lib/sinatra/main.rb +1 -0
  23. data/lib/sinatra/show_exceptions.rb +63 -55
  24. data/lib/sinatra/version.rb +1 -1
  25. data/sinatra.gemspec +19 -7
  26. metadata +30 -164
  27. data/lib/sinatra/ext.rb +0 -17
  28. data/test/asciidoctor_test.rb +0 -72
  29. data/test/base_test.rb +0 -167
  30. data/test/builder_test.rb +0 -91
  31. data/test/coffee_test.rb +0 -96
  32. data/test/compile_test.rb +0 -183
  33. data/test/contest.rb +0 -91
  34. data/test/creole_test.rb +0 -65
  35. data/test/delegator_test.rb +0 -160
  36. data/test/encoding_test.rb +0 -20
  37. data/test/erb_test.rb +0 -116
  38. data/test/extensions_test.rb +0 -98
  39. data/test/filter_test.rb +0 -487
  40. data/test/haml_test.rb +0 -109
  41. data/test/helper.rb +0 -132
  42. data/test/helpers_test.rb +0 -1917
  43. data/test/integration/app.rb +0 -79
  44. data/test/integration_helper.rb +0 -236
  45. data/test/integration_test.rb +0 -104
  46. data/test/less_test.rb +0 -69
  47. data/test/liquid_test.rb +0 -77
  48. data/test/mapped_error_test.rb +0 -285
  49. data/test/markaby_test.rb +0 -80
  50. data/test/markdown_test.rb +0 -85
  51. data/test/mediawiki_test.rb +0 -68
  52. data/test/middleware_test.rb +0 -68
  53. data/test/nokogiri_test.rb +0 -67
  54. data/test/public/favicon.ico +0 -0
  55. data/test/public/hello+world.txt +0 -1
  56. data/test/rabl_test.rb +0 -89
  57. data/test/rack_test.rb +0 -45
  58. data/test/radius_test.rb +0 -59
  59. data/test/rdoc_test.rb +0 -66
  60. data/test/readme_test.rb +0 -130
  61. data/test/request_test.rb +0 -100
  62. data/test/response_test.rb +0 -63
  63. data/test/result_test.rb +0 -76
  64. data/test/route_added_hook_test.rb +0 -59
  65. data/test/routing_test.rb +0 -1456
  66. data/test/sass_test.rb +0 -115
  67. data/test/scss_test.rb +0 -88
  68. data/test/server_test.rb +0 -56
  69. data/test/settings_test.rb +0 -582
  70. data/test/sinatra_test.rb +0 -12
  71. data/test/slim_test.rb +0 -102
  72. data/test/static_test.rb +0 -266
  73. data/test/streaming_test.rb +0 -149
  74. data/test/stylus_test.rb +0 -90
  75. data/test/templates_test.rb +0 -382
  76. data/test/textile_test.rb +0 -65
  77. data/test/views/a/in_a.str +0 -1
  78. data/test/views/ascii.erb +0 -2
  79. data/test/views/b/in_b.str +0 -1
  80. data/test/views/calc.html.erb +0 -1
  81. data/test/views/error.builder +0 -3
  82. data/test/views/error.erb +0 -3
  83. data/test/views/error.haml +0 -3
  84. data/test/views/error.sass +0 -2
  85. data/test/views/explicitly_nested.str +0 -1
  86. data/test/views/foo/hello.test +0 -1
  87. data/test/views/hello.asciidoc +0 -1
  88. data/test/views/hello.builder +0 -1
  89. data/test/views/hello.coffee +0 -1
  90. data/test/views/hello.creole +0 -1
  91. data/test/views/hello.erb +0 -1
  92. data/test/views/hello.haml +0 -1
  93. data/test/views/hello.less +0 -5
  94. data/test/views/hello.liquid +0 -1
  95. data/test/views/hello.mab +0 -1
  96. data/test/views/hello.md +0 -1
  97. data/test/views/hello.mediawiki +0 -1
  98. data/test/views/hello.nokogiri +0 -1
  99. data/test/views/hello.rabl +0 -2
  100. data/test/views/hello.radius +0 -1
  101. data/test/views/hello.rdoc +0 -1
  102. data/test/views/hello.sass +0 -2
  103. data/test/views/hello.scss +0 -3
  104. data/test/views/hello.slim +0 -1
  105. data/test/views/hello.str +0 -1
  106. data/test/views/hello.styl +0 -2
  107. data/test/views/hello.test +0 -1
  108. data/test/views/hello.textile +0 -1
  109. data/test/views/hello.wlang +0 -1
  110. data/test/views/hello.yajl +0 -1
  111. data/test/views/layout2.builder +0 -3
  112. data/test/views/layout2.erb +0 -2
  113. data/test/views/layout2.haml +0 -2
  114. data/test/views/layout2.liquid +0 -2
  115. data/test/views/layout2.mab +0 -2
  116. data/test/views/layout2.nokogiri +0 -3
  117. data/test/views/layout2.rabl +0 -3
  118. data/test/views/layout2.radius +0 -2
  119. data/test/views/layout2.slim +0 -3
  120. data/test/views/layout2.str +0 -2
  121. data/test/views/layout2.test +0 -1
  122. data/test/views/layout2.wlang +0 -2
  123. data/test/views/nested.str +0 -1
  124. data/test/views/utf8.erb +0 -2
  125. data/test/wlang_test.rb +0 -87
  126. data/test/yajl_test.rb +0 -86
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 49eaa57b3d06c8eb819329b3c57cd6401c5da1c2
4
- data.tar.gz: d30fe1da78dade1d0b6c961feeef2dc1ef61e268
3
+ metadata.gz: fcc61f758e37e82a6ba459dd28ac0427d1e293aa
4
+ data.tar.gz: 89da52018e78be121896892c8f1bd2786048c191
5
5
  SHA512:
6
- metadata.gz: 961cb8068ba88aeb8c6a5d801512ddf5c22e71f293545d11fc8514794a1928acbdf8d3ad03d79c4b6281b3999c11bedcc61ea6a95157add919b8a620c57904e0
7
- data.tar.gz: 7a525a8d3fd006f267bd28cafad4aadd1c713acb8ab2c508ca2ceecb8bef3e6863fb9f70e68270027d3df1375dccb16e525ec382ce071c68fe997edd18eb53ba
6
+ metadata.gz: eedfb95c98ca07e7522e60437f6e7a373b569124bf513a456f9ffc679af95b58e1c0368d08ea76085ae7ea9315947dcf956ba4d07c752ad111533a24a65d7b9e
7
+ data.tar.gz: 298a3ccc3bc242b195c8788efc65e94f45274634f5e04cc7f679fd407fa9c0cff2844de338d08369f8e11452da84293a9fe12c4fdbe898c5eeeef6258cbf725a
data/CHANGELOG.md CHANGED
@@ -1,4 +1,68 @@
1
- = 1.4.7 / 2016-01-24
1
+ ## 2.0.0 / 2017-04-10
2
+
3
+ * Use Mustermann for patterns #1086 by Konstantin Haase
4
+
5
+ * Server now provides `-q` flag for quiet mode, which disables start/stop messages #1153 by Vasiliy.
6
+
7
+ * Session middleware can now be specified with `:session_store` setting #1161 by Jordan Owens.
8
+
9
+ * `APP_ENV` is now preferred and recommended over `RACK_ENV` for setting environment #984 by Damien Mathieu.
10
+
11
+ * Add Reel support #793 by Patricio Mac Adden.
12
+
13
+ * Make route params available during error handling #895 by Jeremy Evans.
14
+
15
+ * Unify `not_found` and `error` 404 behavior #896 by Jeremy Evans.
16
+
17
+ * Enable Ruby 2.3 `frozen_string_literal` feature #1076 by Vladimir Kochnev.
18
+
19
+ * Add Sinatra::ShowExceptions::TEMPLATE and patched Rack::ShowExceptions to prefer Sinatra template by Zachary Scott.
20
+
21
+ * Sinatra::Runner is used internally for integration tests #840 by Nick Sutterer.
22
+
23
+ * Fix case-sensitivity issue in `uri` method #889 by rennex.
24
+
25
+ * Use `Rack::Utils.status_code` to allow `status` helper to use symbol as well as numeric codes #968 by Tobias H. Michaelsen.
26
+
27
+ * Improved error handling for invalid params through Rack #1070 by Jordan Owens.
28
+
29
+ * Ensure template is cached only once #1021 by Patrik Rak.
30
+
31
+ * Rack middleware is initialized at server runtime rather than after receiving first request #1205 by Itamar Turner-Trauring.
32
+
33
+ * Improve Session Secret documentation to encourage better security practices #1218 by Glenn Rempe
34
+
35
+ * Exposed global and per-route options for Mustermann route parsing #1233 by Mike Pastore
36
+
37
+ * Use same `session_secret` for classic and modular apps in development #1245 by Marcus Stollsteimer
38
+
39
+ * Make authenticity token length a fixed value of 32 #1181 by Jordan Owens
40
+
41
+ * Modernize Rack::Protection::ContentSecurityPolicy with CSP Level 2 and 3 Directives #1202 by Glenn Rempe
42
+
43
+ * Adds preload option to Rack:Protection:StrictTransport #1209 by Ed Robinson
44
+
45
+ * Improve BadRequest logic. Raise and handle exceptions if status is 400 #1212 by Mike Pastore
46
+
47
+ * Make Rack::Test a development dependency #1232 by Mike Pastore
48
+
49
+ * Capture exception messages of raised NotFound and BadRequest #1210 by Mike Pastore
50
+
51
+ * Add explicit set method to contrib/cookies to override cookie settings #1240 by Andrew Allen
52
+
53
+ * Avoid executing filters even if prefix matches with other namespace #1253 by namusyaka
54
+
55
+ * Make `#has_key?` also indifferent in access, can accept String or Symbol #1262 by John Hope
56
+
57
+ * Add `allow_if` option to bypass json csrf protection #1265 by Jordan Owens
58
+
59
+ * rack-protection: Bundle StrictTransport, CookieTossing, and CSP #1267 by Mike Pastore
60
+
61
+ * Add `:strict_paths` option for managing trailing slashes #1273 by namusyaka
62
+
63
+ * Add full IndifferentHash implementation to params #1279 by Mike Pastore
64
+
65
+ ## 1.4.7 / 2016-01-24
2
66
 
3
67
  * Add Ashley Williams, Trevor Bramble, and Kashyap Kondamudi to team Sinatra.
4
68
 
@@ -14,7 +78,7 @@
14
78
  * Add CONTRIBUTING guide. #987 (Katrina Owen)
15
79
 
16
80
 
17
- = 1.4.6 / 2015-03-23
81
+ ## 1.4.6 / 2015-03-23
18
82
 
19
83
  * Improve tests and documentation. (Darío Hereñú, Seiichi Yonezawa, kyoendo,
20
84
  John Voloski, Ferenc-, Renaud Martinet, Christian Haase, marocchino,
@@ -44,7 +108,7 @@
44
108
  * Upgrade test suite to Minitest version 5 and fix Ruby 2.2 compatibility.
45
109
  (Vipul A M)
46
110
 
47
- = 1.4.5 / 2014-04-08
111
+ ## 1.4.5 / 2014-04-08
48
112
 
49
113
  * Improve tests and documentation. (Seiichi Yonezawa, Mike Gehard, Andrew
50
114
  Deitrick, Matthew Nicholas Bradley, GoGo tanaka, Carlos Lazo, Shim Tw,
@@ -61,7 +125,7 @@
61
125
 
62
126
  * Fix bug in request.accept? that might trigger a NoMethodError. (sbonami)
63
127
 
64
- = 1.4.4 / 2013-10-21
128
+ ## 1.4.4 / 2013-10-21
65
129
 
66
130
  * Allow setting layout to false specifically for a single rendering engine.
67
131
  (Matt Wildig)
@@ -96,7 +160,7 @@
96
160
 
97
161
  * Reduce file size of dev mode images for 404 and 500 pages. (Francis Go)
98
162
 
99
- = 1.4.3 / 2013-06-07
163
+ ## 1.4.3 / 2013-06-07
100
164
 
101
165
  * Running a Sinatra file directly or via `run!` it will now ignore an
102
166
  empty $PORT env variable. (noxqsgit)
@@ -117,7 +181,7 @@
117
181
 
118
182
  * Request#accept? now returns true instead of a truthy value. (Alan Harris)
119
183
 
120
- = 1.4.2 / 2013-03-21
184
+ ## 1.4.2 / 2013-03-21
121
185
 
122
186
  * Fix parsing error for case where both the pattern and the captured part
123
187
  contain a dot. (Florian Hanke, Konstantin Haase)
@@ -126,11 +190,11 @@
126
190
 
127
191
  * Improve documentation. (Patricio Mac Adden, Joe Bottigliero)
128
192
 
129
- = 1.4.1 / 2013-03-15
193
+ ## 1.4.1 / 2013-03-15
130
194
 
131
195
  * Make delegated methods available in config.ru (Konstantin Haase)
132
196
 
133
- = 1.4.0 / 2013-03-15
197
+ ## 1.4.0 / 2013-03-15
134
198
 
135
199
  * Add support for LINK and UNLINK requests. (Konstantin Haase)
136
200
 
@@ -164,9 +228,9 @@
164
228
  halt in a before filter or route. (Konstantin Haase)
165
229
 
166
230
  * Sinatra::Base.new now returns a Sinatra::Wrapper instance, exposing
167
- #settings and #helpers, yet going through the middleware stack on #call.
168
- It also implements a nice #inspect, so it plays nice with Rails' `rake
169
- routes`. (Konstantin Haase)
231
+ `#settings` and `#helpers`, yet going through the middleware stack on
232
+ `#call`. It also implements a nice `#inspect`, so it plays nice with
233
+ Rails' `rake routes`. (Konstantin Haase)
170
234
 
171
235
  * In addition to WebRick, Thin and Mongrel, Sinatra will now automatically pick
172
236
  up Puma, Trinidad, ControlTower or Net::HTTP::Server when installed. The
@@ -251,7 +315,7 @@
251
315
  * Exceptions in `after` filter are now handled like any other exception.
252
316
  (Nathan Esquenazi)
253
317
 
254
- = 1.3.6 (backport release) / 2013-03-15
318
+ ## 1.3.6 (backport release) / 2013-03-15
255
319
 
256
320
  Backported from 1.4.0:
257
321
 
@@ -261,7 +325,7 @@ Backported from 1.4.0:
261
325
 
262
326
  * No longer override `define_singleton_method`. (Konstantin Haase)
263
327
 
264
- = 1.3.5 / 2013-02-25
328
+ ## 1.3.5 / 2013-02-25
265
329
 
266
330
  * Fix for RubyGems 2.0 (Uchio KONDO)
267
331
 
@@ -269,7 +333,7 @@ Backported from 1.4.0:
269
333
 
270
334
  * No longer override `define_singleton_method`. (Konstantin Haase)
271
335
 
272
- = 1.3.4 / 2013-01-26
336
+ ## 1.3.4 / 2013-01-26
273
337
 
274
338
  * Improve documentation. (Kashyap, Stanislav Chistenko, Konstantin Haase,
275
339
  ymmtmsys, Anurag Priyam)
@@ -286,7 +350,7 @@ Backported from 1.4.0:
286
350
  * Status, headers and body will be set correctly in an after filter when using
287
351
  halt in a before filter or route. (Konstantin Haase)
288
352
 
289
- = 1.3.3 / 2012-08-19
353
+ ## 1.3.3 / 2012-08-19
290
354
 
291
355
  * Improved documentation. (burningTyger, Konstantin Haase, Gabriel Andretta,
292
356
  Anurag Priyam, michelc)
@@ -313,7 +377,7 @@ Backported from 1.4.0:
313
377
  * When protecting against CSRF attacks, drop the session instead of refusing
314
378
  the request. (Konstantin Haase)
315
379
 
316
- = 1.3.2 / 2011-12-30
380
+ ## 1.3.2 / 2011-12-30
317
381
 
318
382
  * Don't automatically add `Rack::CommonLogger` if `Rack::Server` is adding it,
319
383
  too. (Konstantin Haase)
@@ -340,7 +404,7 @@ Backported from 1.4.0:
340
404
 
341
405
  * Improved MagLev support. (Tim Felgentreff)
342
406
 
343
- = 1.3.1 / 2011-10-05
407
+ ## 1.3.1 / 2011-10-05
344
408
 
345
409
  * Support adding more than one callback to the stream object. (Konstantin
346
410
  Haase)
@@ -348,7 +412,7 @@ Backported from 1.4.0:
348
412
  * Fix for infinite loop when streaming on 1.9.2 with Thin from a modular
349
413
  application (Konstantin Haase)
350
414
 
351
- = 1.3.0 / 2011-09-30
415
+ ## 1.3.0 / 2011-09-30
352
416
 
353
417
  * Added `stream` helper method for easily creating streaming APIs, Server
354
418
  Sent Events or even WebSockets. See README for more on that topic.
@@ -475,7 +539,7 @@ Backported from 1.4.0:
475
539
  * Fix handling of broken query params when displaying exceptions. (Luke
476
540
  Jahnke)
477
541
 
478
- = 1.2.9 (backports release) / 2013-03-15
542
+ ## 1.2.9 (backports release) / 2013-03-15
479
543
 
480
544
  IMPORTANT: THIS IS THE LAST 1.2.x RELEASE, PLEASE UPGRADE.
481
545
 
@@ -489,14 +553,14 @@ IMPORTANT: THIS IS THE LAST 1.2.x RELEASE, PLEASE UPGRADE.
489
553
 
490
554
  * Add backports library so we can still run on Ruby 1.8.6. (Konstantin Haase)
491
555
 
492
- = 1.2.8 (backports release) / 2011-12-30
556
+ ## 1.2.8 (backports release) / 2011-12-30
493
557
 
494
558
  Backported from 1.3.2:
495
559
 
496
560
  * Fix bug where rendering a second template in the same request after the
497
561
  first one raised an exception skipped the default layout (Nathan Baum)
498
562
 
499
- = 1.2.7 (backports release) / 2011-09-30
563
+ ## 1.2.7 (backports release) / 2011-09-30
500
564
 
501
565
  Custom changes:
502
566
 
@@ -529,16 +593,16 @@ Backported from 1.3.0:
529
593
  * Fix handling of broken query params when displaying exceptions. (Luke
530
594
  Jahnke)
531
595
 
532
- = 1.2.6 / 2011-05-01
596
+ ## 1.2.6 / 2011-05-01
533
597
 
534
598
  * Fix broken delegation, backport delegation tests from Sinatra 1.3.
535
599
  (Konstantin Haase)
536
600
 
537
- = 1.2.5 / 2011-04-30
601
+ ## 1.2.5 / 2011-04-30
538
602
 
539
603
  * Restore compatibility with Ruby 1.8.6. (Konstantin Haase)
540
604
 
541
- = 1.2.4 / 2011-04-30
605
+ ## 1.2.4 / 2011-04-30
542
606
 
543
607
  * Sinatra::Application (classic style) does not use a session secret in
544
608
  development mode, so sessions are not invalidated after every request when
@@ -562,7 +626,7 @@ Backported from 1.3.0:
562
626
  * Remove HEAD request logic and let Rack::Head handle it instead. (Paolo
563
627
  "Nusco" Perrotta)
564
628
 
565
- = 1.2.3 / 2011-04-13
629
+ ## 1.2.3 / 2011-04-13
566
630
 
567
631
  * This release is compatible with Tilt 1.3, it will still work with Tilt 1.2.2,
568
632
  however, if you want to use a newer Tilt version, you have to upgrade to at
@@ -571,7 +635,7 @@ Backported from 1.3.0:
571
635
  * Helpers dealing with time, like `expires`, handle objects that pretend to be
572
636
  numbers, like `ActiveSupport::Duration`, better. (Konstantin Haase)
573
637
 
574
- = 1.2.2 / 2011-04-08
638
+ ## 1.2.2 / 2011-04-08
575
639
 
576
640
  * The `:provides => :js` condition now matches both `application/javascript`
577
641
  and `text/javascript`. The `:provides => :xml` condition now matches both
@@ -599,7 +663,7 @@ Backported from 1.3.0:
599
663
  * In development environment, when running under a nested path, the image URIs
600
664
  on the error pages are set properly. (Konstantin Haase)
601
665
 
602
- = 1.2.1 / 2011-03-17
666
+ ## 1.2.1 / 2011-03-17
603
667
 
604
668
  * Use a generated session secret when using `enable :sessions`. (Konstantin
605
669
  Haase)
@@ -612,7 +676,7 @@ Backported from 1.3.0:
612
676
  * README translations improved (Gabriel Andretta, burningTyger, Sylvain Desvé,
613
677
  Gregor Schmidt)
614
678
 
615
- = 1.2.0 / 2011-03-03
679
+ ## 1.2.0 / 2011-03-03
616
680
 
617
681
  * Added `slim` rendering method for rendering Slim templates. (Steve
618
682
  Hodgkiss)
@@ -661,11 +725,11 @@ Backported from 1.3.0:
661
725
  * Sinatra now ships with a Gemfile for development dependencies, since it eases
662
726
  supporting different platforms, like JRuby. (Konstantin Haase)
663
727
 
664
- = 1.1.4 (backports release) / 2011-04-13
728
+ ## 1.1.4 (backports release) / 2011-04-13
665
729
 
666
730
  * Compatible with Tilt 1.3. (Konstantin Haase)
667
731
 
668
- = 1.1.3 / 2011-02-20
732
+ ## 1.1.3 / 2011-02-20
669
733
 
670
734
  * Fixed issues with `user_agent` condition if the user agent header is missing.
671
735
  (Konstantin Haase)
@@ -684,11 +748,11 @@ Backported from 1.3.0:
684
748
  a rendering engine - it was not possible to register ".html.erb" without
685
749
  tricks. (Konstantin Haase)
686
750
 
687
- = 1.1.2 / 2010-10-25
751
+ ## 1.1.2 / 2010-10-25
688
752
 
689
753
  Like 1.1.1, but with proper CHANGES file.
690
754
 
691
- = 1.1.1 / 2010-10-25
755
+ ## 1.1.1 / 2010-10-25
692
756
 
693
757
  * README has been translated to Russian (Nickolay Schwarz, Vasily Polovnyov)
694
758
  and Portuguese (Luciano Sousa).
@@ -720,7 +784,7 @@ Like 1.1.1, but with proper CHANGES file.
720
784
  honor default_encoding and URLs support unicode characters. (Konstantin
721
785
  Haase)
722
786
 
723
- = 1.1.0 / 2010-10-24
787
+ ## 1.1.0 / 2010-10-24
724
788
 
725
789
  * Before and after filters now support pattern matching, including the
726
790
  ability to use captures: "before('/user/:name') { |name| ... }". This
@@ -826,7 +890,7 @@ Like 1.1.1, but with proper CHANGES file.
826
890
  * Sinatra now depends on Rack 1.1 or higher. Rack 1.0 is no longer supported.
827
891
  (Konstantin Haase)
828
892
 
829
- = 1.0 / 2010-03-23
893
+ ## 1.0 / 2010-03-23
830
894
 
831
895
  * It's now possible to register blocks to run after each request using
832
896
  after filters. After filters run at the end of each request, after
@@ -969,7 +1033,7 @@ the 1.0 release:
969
1033
  * The `:methodoverride' option to enable/disable the POST _method hack is
970
1034
  obsolete; use `:method_override` instead.
971
1035
 
972
- = 0.9.2 / 2009-05-18
1036
+ ## 0.9.2 / 2009-05-18
973
1037
 
974
1038
  * This version is compatible with Rack 1.0. [Rein Henrichs]
975
1039
 
@@ -1050,12 +1114,12 @@ the 1.0 release:
1050
1114
  * Fix in-file templates __END__ detection when __END__ exists with
1051
1115
  other stuff on a line [Yoji Shidara]
1052
1116
 
1053
- = 0.9.1.1 / 2009-03-09
1117
+ ## 0.9.1.1 / 2009-03-09
1054
1118
 
1055
1119
  * Fix directory traversal vulnerability in default static files
1056
1120
  route. See [#177] for more info.
1057
1121
 
1058
- = 0.9.1 / 2009-03-01
1122
+ ## 0.9.1 / 2009-03-01
1059
1123
 
1060
1124
  * Sinatra now runs under Ruby 1.9.1 [#61]
1061
1125
 
@@ -1125,7 +1189,7 @@ the 1.0 release:
1125
1189
  * Fixed that "." in route patterns erroneously matched any character
1126
1190
  instead of a literal ".". [#124]
1127
1191
 
1128
- = 0.9.0.4 / 2009-01-25
1192
+ ## 0.9.0.4 / 2009-01-25
1129
1193
 
1130
1194
  * Using halt with more than 1 args causes ArgumentError [#131]
1131
1195
  * using halt in a before filter doesn't modify response [#127]
@@ -1134,7 +1198,7 @@ the 1.0 release:
1134
1198
  * Preserve non-nested params in nested params hash [#117]
1135
1199
  * Fix backtrace dump with Rack::Lint [#116]
1136
1200
 
1137
- = 0.9.0.3 / 2009-01-21
1201
+ ## 0.9.0.3 / 2009-01-21
1138
1202
 
1139
1203
  * Fall back on mongrel then webrick when thin not found. [#75]
1140
1204
  * Use :environment instead of :env in test helpers to
@@ -1143,12 +1207,12 @@ the 1.0 release:
1143
1207
  * Fix app_file detection on windows [#118]
1144
1208
  * Fix static files with Rack::Lint in pipeline [#121]
1145
1209
 
1146
- = 0.9.0.2 / 2009-01-18
1210
+ ## 0.9.0.2 / 2009-01-18
1147
1211
 
1148
1212
  * Halting a before block should stop processing of routes [#85]
1149
1213
  * Fix redirect/halt in before filters [#85]
1150
1214
 
1151
- = 0.9.0 / 2009-01-18
1215
+ ## 0.9.0 / 2009-01-18
1152
1216
 
1153
1217
  * Works with and requires Rack >= 0.9.1
1154
1218
 
@@ -1241,7 +1305,7 @@ the 1.0 release:
1241
1305
  subclass of Sinatra::Base; each request is processed within an
1242
1306
  instance.
1243
1307
 
1244
- = 0.3.3 / 2009-01-06
1308
+ ## 0.3.3 / 2009-01-06
1245
1309
 
1246
1310
  * Pin to Rack 0.4.0 (this is the last release on Rack 0.4)
1247
1311
 
@@ -1259,7 +1323,7 @@ the 1.0 release:
1259
1323
  * BUG: Sinatra detects the app file and root path when run under
1260
1324
  thin/passenger.
1261
1325
 
1262
- = 0.3.2
1326
+ ## 0.3.2
1263
1327
 
1264
1328
  * BUG: Static and send_file read entire file into String before
1265
1329
  sending. Updated to stream with 8K chunks instead.
@@ -1269,11 +1333,11 @@ the 1.0 release:
1269
1333
 
1270
1334
  * Various minor doc fixes.
1271
1335
 
1272
- = 0.3.1
1336
+ ## 0.3.1
1273
1337
 
1274
1338
  * Unbreak optional path parameters [jeremyevans]
1275
1339
 
1276
- = 0.3.0
1340
+ ## 0.3.0
1277
1341
 
1278
1342
  * Add sinatra.gemspec w/ support for github gem builds. Forks can now
1279
1343
  enable the build gem option in github to get free username-sinatra.gem
@@ -1330,10 +1394,10 @@ the 1.0 release:
1330
1394
 
1331
1395
  * Fix for escaped paths not resolving static files [Matthew Walker]
1332
1396
 
1333
- = 0.2.1
1397
+ ## 0.2.1
1334
1398
 
1335
1399
  * File upload fix and minor tweaks.
1336
1400
 
1337
- = 0.2.0
1401
+ ## 0.2.0
1338
1402
 
1339
1403
  * Initial gem release of 0.2 codebase.
data/CONTRIBUTING.md CHANGED
@@ -62,7 +62,7 @@ track patch requests.
62
62
  is where the website sources are managed. There are almost always people in
63
63
  `#sinatra` that are happy to discuss, apply, and publish website patches.
64
64
 
65
- * [The Book](http://sinatra-book.gittr.com/) has its own [Git
65
+ * [The Book](http://sinatra-org-book.herokuapp.com/) has its own [Git
66
66
  repository](http://github.com/sinatra/sinatra-book/) and build process but is
67
67
  managed the same as the website and project codebase.
68
68
 
data/Gemfile CHANGED
@@ -10,62 +10,54 @@ RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
10
10
  source 'https://rubygems.org' unless ENV['QUICK']
11
11
  gemspec
12
12
 
13
- gem 'rake', '~> 10.0'
13
+ gem 'rake'
14
+ gem 'rack', git: 'https://github.com/rack/rack.git'
14
15
  gem 'rack-test', '>= 0.6.2'
15
16
  gem "minitest", "~> 5.0"
17
+ gem 'yard'
18
+
19
+ gem "rack-protection", path: "rack-protection"
20
+ gem "sinatra-contrib", path: "sinatra-contrib"
21
+
22
+ gem "twitter-text", "1.14.0"
16
23
 
17
24
  if RUBY_ENGINE == 'jruby'
18
25
  gem 'nokogiri', '!= 1.5.0'
19
- gem 'jruby-openssl'
20
26
  gem 'trinidad'
21
27
  end
22
28
 
23
- if RUBY_VERSION < '1.9.3'
24
- gem 'activesupport', '~> 3.2'
25
- gem 'i18n', '~> 0.6.0'
26
- else
27
- gem 'activesupport', '~> 4.2'
28
- end
29
-
30
29
  if RUBY_ENGINE == "ruby"
31
- if RUBY_VERSION > '1.9.2'
32
- gem 'less', '~> 2.0'
33
- gem 'therubyracer'
34
- gem 'redcarpet'
35
- gem 'wlang', '>= 2.0.1'
36
- gem 'bluecloth'
37
- gem 'rdiscount'
38
- gem 'RedCloth'
39
- gem 'puma'
40
- gem 'net-http-server'
41
- gem 'yajl-ruby'
42
- gem 'thin'
43
- gem 'slim', '~> 2.0'
44
- gem 'coffee-script', '>= 2.0'
45
- gem 'rdoc'
46
- gem 'kramdown'
47
- gem 'maruku'
48
- gem 'creole'
49
- gem 'wikicloth'
50
- gem 'markaby'
51
- gem 'radius'
52
- gem 'asciidoctor'
53
- gem 'liquid', '~> 3.0'
54
- gem 'stylus'
55
- gem 'rabl'
56
- gem 'builder'
57
- gem 'erubis'
58
- gem 'haml', '>= 3.0'
59
- gem 'sass'
60
-
61
- if RUBY_VERSION < '2.1.0'
62
- gem 'nokogiri', '~> 1.6.8'
63
- else
64
- gem 'nokogiri', '~> 1.7.0'
65
- end
66
- else
67
- gem 'nokogiri', '~> 1.5.11'
68
- end
30
+ gem 'less', '~> 2.0'
31
+ gem 'mini_racer'
32
+ gem 'redcarpet'
33
+ gem 'wlang', '>= 2.0.1'
34
+ gem 'bluecloth'
35
+ gem 'rdiscount'
36
+ gem 'RedCloth'
37
+ gem 'puma'
38
+ gem 'yajl-ruby'
39
+ gem 'nokogiri'
40
+ gem 'thin'
41
+ gem 'slim', '~> 2.0'
42
+ gem 'coffee-script', '>= 2.0'
43
+ gem 'rdoc'
44
+ gem 'kramdown'
45
+ gem 'maruku'
46
+ gem 'creole'
47
+ gem 'wikicloth'
48
+ gem 'markaby'
49
+ gem 'radius'
50
+ gem 'asciidoctor'
51
+ gem 'liquid'
52
+ gem 'stylus'
53
+ gem 'rabl'
54
+ gem 'builder'
55
+ gem 'erubis'
56
+ gem 'haml', '>= 3.0'
57
+ gem 'sass'
58
+ gem 'reel-rack'
59
+ gem 'celluloid', '~> 0.16.0'
60
+ gem 'simplecov', require: false
69
61
  end
70
62
 
71
63
  if RUBY_ENGINE == "rbx"
@@ -74,6 +66,6 @@ if RUBY_ENGINE == "rbx"
74
66
  gem 'rubysl-test-unit'
75
67
  end
76
68
 
77
- platforms :ruby_18, :jruby do
78
- gem 'json', '~> 1.8' unless RUBY_VERSION > '1.9' # is there a jruby but 1.8 only selector?
69
+ platforms :jruby do
70
+ gem 'json'
79
71
  end
data/LICENSE CHANGED
@@ -1,5 +1,8 @@
1
+ The MIT License (MIT)
2
+
1
3
  Copyright (c) 2007, 2008, 2009 Blake Mizerany
2
- Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Konstantin Haase
4
+ Copyright (c) 2010-2017 Konstantin Haase
5
+ Copyright (c) 2015-2017 Zachary Scott
3
6
 
4
7
  Permission is hereby granted, free of charge, to any person
5
8
  obtaining a copy of this software and associated documentation
data/MAINTENANCE.md ADDED
@@ -0,0 +1,42 @@
1
+ # Sinatra maintenance
2
+
3
+ ## Versions
4
+
5
+ ### Unstable release
6
+
7
+ The next major version of Sinatra will be released from the master branch.
8
+
9
+ * Current proposed major release: 2.0.0
10
+
11
+ ### Stable release
12
+
13
+ The current stable version of Sinatra is 1.4 series, and released from the stable branch.
14
+
15
+ ## Issues
16
+
17
+ ### New features
18
+
19
+ New features will only be added to the master branch and will not be made available in point releases.
20
+
21
+ ### Bug fixes
22
+
23
+ Only the latest release series will receive bug fixes. When enough bugs are fixed and its deemed worthy to release a new gem, this is the branch it happens from.
24
+
25
+ * Current release series: 1.4.x
26
+
27
+ ### Security issues
28
+
29
+ The current release series will receive patches and new versions in case of a security issue.
30
+
31
+ * Current release series: 1.4.x
32
+
33
+ ### Severe security issues
34
+
35
+ For severe security issues we will provide new versions as above, and also the last major release series will receive patches and new versions. The classification of the security issue is judged by the core team.
36
+
37
+ * Current release series: 1.4.x
38
+ * Next most recent release series: 1.3.x
39
+
40
+ ### Unsupported Release Series
41
+
42
+ When a release series is no longer supported, it’s your own responsibility to deal with bugs and security issues. We may provide back-ports of the fixes and publish them to git, however there will be no new versions released. If you are not comfortable maintaining your own versions, you should upgrade to a supported version.