sinatra 2.2.0 → 3.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +133 -16
- data/CONTRIBUTING.md +11 -11
- data/Gemfile +48 -62
- data/MAINTENANCE.md +2 -2
- data/README.md +199 -386
- data/Rakefile +66 -75
- data/VERSION +1 -1
- data/examples/chat.rb +25 -12
- data/examples/lifecycle_events.rb +20 -0
- data/examples/rainbows.rb +3 -1
- data/examples/simple.rb +2 -0
- data/examples/stream.ru +2 -1
- data/lib/sinatra/base.rb +420 -338
- data/lib/sinatra/indifferent_hash.rb +25 -33
- data/lib/sinatra/main.rb +18 -16
- data/lib/sinatra/show_exceptions.rb +17 -15
- data/lib/sinatra/version.rb +3 -1
- data/lib/sinatra.rb +2 -0
- data/sinatra.gemspec +38 -33
- metadata +40 -30
- data/README.de.md +0 -3239
- data/README.es.md +0 -3231
- data/README.fr.md +0 -3111
- data/README.hu.md +0 -728
- data/README.ja.md +0 -2844
- data/README.ko.md +0 -2967
- data/README.malayalam.md +0 -3141
- data/README.pt-br.md +0 -3787
- data/README.pt-pt.md +0 -791
- data/README.ru.md +0 -3207
- data/README.zh.md +0 -2934
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 315dee3d85d7778ffa48e041bd60370e9e89ecd3c01dbf0cf9450e41c62dc0d8
|
4
|
+
data.tar.gz: '083a914c0b520684471e2715ec091c67ca8121bfb8b5d4cf410307d6e14e4ac5'
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2790a4d58595f0f89667c5fd4530dde2de532ddaf02628f373162cc47d393732b1c9475ab59775c756750dfb52e60e7091118936ac8e70739fb266b46f82d3bd
|
7
|
+
data.tar.gz: eb74f34bf0b9a681557809c656754312eb266e66c3b68fcabbf95699c3273cf4d998e3969224b09df9127ff90f5d34fba5bc93b1ff0c321b4a7646ddfcc0b6b7
|
data/CHANGELOG.md
CHANGED
@@ -1,28 +1,136 @@
|
|
1
|
-
##
|
1
|
+
## Unreleased
|
2
2
|
|
3
|
-
*
|
3
|
+
* _Your new feature here._
|
4
4
|
|
5
|
-
|
5
|
+
## 3.1.0 / 2023-08-07
|
6
6
|
|
7
|
-
*
|
7
|
+
* New: Add sass support via sass-embedded [#1911] by なつき
|
8
8
|
|
9
|
-
*
|
9
|
+
* New: Add start and stop callbacks [#1913] by Jevin Sew
|
10
10
|
|
11
|
-
*
|
11
|
+
* New: Warn on dropping sessions [#1900] by Jonathan del Strother
|
12
12
|
|
13
|
-
*
|
13
|
+
* New: Make Puma the default server [#1924] by Patrik Ragnarsson
|
14
14
|
|
15
|
-
*
|
15
|
+
* Fix: Remove use of Tilt::Cache [#1922] by Jeremy Evans (allows use of Tilt 2.2.0 without deprecation warning)
|
16
16
|
|
17
|
-
*
|
17
|
+
* Fix: rack-protection: specify rack version requirement [#1932] by Patrik Ragnarsson
|
18
18
|
|
19
|
-
|
19
|
+
[#1913]: https://github.com/sinatra/sinatra/pull/1913
|
20
|
+
[#1900]: https://github.com/sinatra/sinatra/pull/1900
|
21
|
+
[#1924]: https://github.com/sinatra/sinatra/pull/1924
|
22
|
+
[#1922]: https://github.com/sinatra/sinatra/pull/1922
|
23
|
+
[#1932]: https://github.com/sinatra/sinatra/pull/1932
|
24
|
+
|
25
|
+
## 3.0.6 / 2023-04-11
|
26
|
+
|
27
|
+
* Fix: Add support to keep open streaming connections with Puma [#1858](https://github.com/sinatra/sinatra/pull/1858) by Jordan Owens
|
28
|
+
|
29
|
+
* Fix: Avoid crash in `uri` helper on Integer input [#1890](https://github.com/sinatra/sinatra/pull/1890) by Patrik Ragnarsson
|
30
|
+
|
31
|
+
* Fix: Rescue `RuntimeError` when trying to use `SecureRandom` [#1888](https://github.com/sinatra/sinatra/pull/1888) by Stefan Sundin
|
32
|
+
|
33
|
+
## 3.0.5 / 2022-12-16
|
34
|
+
|
35
|
+
* Fix: Add Zeitwerk compatibility. [#1831](https://github.com/sinatra/sinatra/pull/1831) by Dawid Janczak
|
36
|
+
|
37
|
+
* Fix: Allow CALLERS_TO_IGNORE to be overridden
|
38
|
+
|
39
|
+
## 3.0.4 / 2022-11-25
|
40
|
+
|
41
|
+
* Fix: Escape filename in the Content-Disposition header. [#1841](https://github.com/sinatra/sinatra/pull/1841) by Kunpei Sakai
|
42
|
+
|
43
|
+
## 3.0.3 / 2022-11-11
|
44
|
+
|
45
|
+
* Fix: fixed ReDoS for Rack::Protection::IPSpoofing. [#1823](https://github.com/sinatra/sinatra/pull/1823) by @ooooooo-q
|
46
|
+
|
47
|
+
## 3.0.2 / 2022-10-01
|
48
|
+
|
49
|
+
* New: Add Haml 6 support. [#1820](https://github.com/sinatra/sinatra/pull/1820) by Jordan Owens
|
50
|
+
|
51
|
+
## 3.0.1 / 2022-09-26
|
52
|
+
|
53
|
+
* Fix: Revert removal of rack-protection.rb. [#1814](https://github.com/sinatra/sinatra/pull/1814) by Olle Jonsson
|
54
|
+
|
55
|
+
* Fix: Revert change to server start and stop messaging by using Kernel#warn. Renamed internal warn method warn_for_deprecation. [#1818](https://github.com/sinatra/sinatra/pull/1818) by Jordan Owens
|
56
|
+
|
57
|
+
## 3.0.0 / 2022-09-26
|
58
|
+
|
59
|
+
* New: Add Falcon support. [#1794](https://github.com/sinatra/sinatra/pull/1794) by Samuel Williams and @horaciob
|
60
|
+
|
61
|
+
* New: Add AES GCM encryption support for session cookies. [#1324] (https://github.com/sinatra/sinatra/pull/1324) by Michael Coyne
|
62
|
+
|
63
|
+
* Deprecated: Sinatra Reloader will be removed in the next major release.
|
64
|
+
|
65
|
+
* Fix: Internal Sinatra errors now extend `Sinatra::Error`. This fixes [#1204](https://github.com/sinatra/sinatra/issues/1204) and [#1518](https://github.com/sinatra/sinatra/issues/1518). [bda8c29d](https://github.com/sinatra/sinatra/commit/bda8c29d70619d53f5b1c181140638d340695514) by Jordan Owens
|
66
|
+
|
67
|
+
* Fix: Preserve query param value if named route param nil. [#1676](https://github.com/sinatra/sinatra/pull/1676) by Jordan Owens
|
68
|
+
|
69
|
+
* Require Ruby 2.6 as minimum Ruby version. [#1699](https://github.com/sinatra/sinatra/pull/1699) by Eloy Pérez
|
70
|
+
|
71
|
+
* Breaking change: Remove support for the Stylus template engine. [#1697](https://github.com/sinatra/sinatra/pull/1697) by Eloy Pérez
|
72
|
+
|
73
|
+
* Breaking change: Remove support for the erubis template engine. [#1761](https://github.com/sinatra/sinatra/pull/1761) by Eloy Pérez
|
74
|
+
|
75
|
+
* Breaking change: Remove support for the textile template engine. [#1766](https://github.com/sinatra/sinatra/pull/1766) by Eloy Pérez
|
76
|
+
|
77
|
+
* Breaking change: Remove support for SASS as a template engine. [#1768](https://github.com/sinatra/sinatra/pull/1768) by Eloy Pérez
|
78
|
+
|
79
|
+
* Breaking change: Remove support for Wlang as a template engine. [#1780](https://github.com/sinatra/sinatra/pull/1780) by Eloy Pérez
|
20
80
|
|
21
|
-
*
|
81
|
+
* Breaking change: Remove support for CoffeeScript as a template engine. [#1790](https://github.com/sinatra/sinatra/pull/1790) by Eloy Pérez
|
22
82
|
|
23
|
-
*
|
83
|
+
* Breaking change: Remove support for Mediawiki as a template engine. [#1791](https://github.com/sinatra/sinatra/pull/1791) by Eloy Pérez
|
24
84
|
|
25
|
-
*
|
85
|
+
* Breaking change: Remove support for Creole as a template engine. [#1792](https://github.com/sinatra/sinatra/pull/1792) by Eloy Pérez
|
86
|
+
|
87
|
+
* Breaking change: Remove support for Radius as a template engine. [#1793](https://github.com/sinatra/sinatra/pull/1793) by Eloy Pérez
|
88
|
+
|
89
|
+
* Breaking change: Remove support for the defunct Less templating library. See [#1716](https://github.com/sinatra/sinatra/issues/1716), [#1715](https://github.com/sinatra/sinatra/issues/1715) for more discussion and background. [d1af2f1e](https://github.com/sinatra/sinatra/commit/d1af2f1e6c8710419dfe3102a660f7a32f0e67e3) by Olle Jonsson
|
90
|
+
|
91
|
+
* Breaking change: Remove Reel integration. [54597502](https://github.com/sinatra/sinatra/commit/545975025927a27a1daca790598620038979f1c5) by Olle Jonsson
|
92
|
+
|
93
|
+
* CI: Start testing on Ruby 3.1. [60e221940](https://github.com/sinatra/sinatra/commit/60e2219407e6ae067bf3e53eb060ee4860c60c8d) and [b0fa4bef](https://github.com/sinatra/sinatra/commit/b0fa4beffaa3b10bf02947d0a35e137403296c6b) by Johannes Würbach
|
94
|
+
|
95
|
+
* Use `Kernel#caller_locations`. [#1491](https://github.com/sinatra/sinatra/pull/1491) by Julik Tarkhanov
|
96
|
+
|
97
|
+
* Docs: Japanese documentation: Add notes about the `default_content_type` setting. [#1650](https://github.com/sinatra/sinatra/pull/1650) by Akifumi Tominaga
|
98
|
+
|
99
|
+
* Docs: Polish documentation: Add section about Multithreaded modes and Routes. [#1708](https://github.com/sinatra/sinatra/pull/1708) by Patrick Gramatowski
|
100
|
+
|
101
|
+
* Docs: Japanese documentation: Make Session section reflect changes done to README.md. [#1731](https://github.com/sinatra/sinatra/pull/1731) by @shu-i-chi
|
102
|
+
|
103
|
+
## 2.2.3 / 2022-11-25
|
104
|
+
|
105
|
+
* Fix: Escape filename in the Content-Disposition header. [#1841](https://github.com/sinatra/sinatra/pull/1841) by Kunpei Sakai
|
106
|
+
|
107
|
+
* Fix: fixed ReDoS for Rack::Protection::IPSpoofing. [#1823](https://github.com/sinatra/sinatra/pull/1823) by @ooooooo-q
|
108
|
+
|
109
|
+
## 2.2.2 / 2022-07-23
|
110
|
+
|
111
|
+
* Update mustermann dependency to version 2.
|
112
|
+
|
113
|
+
## 2.2.1 / 2022-07-15
|
114
|
+
|
115
|
+
* Fix JRuby regression by using ruby2_keywords for delegation. #1750 by Patrik Ragnarsson
|
116
|
+
|
117
|
+
* Add JRuby to CI. #1755 by Karol Bucek
|
118
|
+
|
119
|
+
## 2.2.0 / 2022-02-15
|
120
|
+
|
121
|
+
* Breaking change: Add `#select`, `#reject` and `#compact` methods to `Sinatra::IndifferentHash`. If hash keys need to be converted to symbols, call `#to_h` to get a `Hash` instance first. [#1711](https://github.com/sinatra/sinatra/pull/1711) by Olivier Bellone
|
122
|
+
|
123
|
+
* Handle EOFError raised by Rack and return Bad Request 400 status. [#1743](https://github.com/sinatra/sinatra/pull/1743) by tamazon
|
124
|
+
|
125
|
+
* Minor refactors in `base.rb`. [#1640](https://github.com/sinatra/sinatra/pull/1640) by ceclinux
|
126
|
+
|
127
|
+
* Add escaping to the static 404 page. [#1645](https://github.com/sinatra/sinatra/pull/1645) by Chris Gavin
|
128
|
+
|
129
|
+
* Remove `detect_rack_handler` method. [#1652](https://github.com/sinatra/sinatra/pull/1652) by ceclinux
|
130
|
+
|
131
|
+
* Respect content type set in superclass before filter. Fixes [#1647](https://github.com/sinatra/sinatra/issues/1647) [#1649](https://github.com/sinatra/sinatra/pull/1649) by Jordan Owens
|
132
|
+
|
133
|
+
* *Revert "Use prepend instead of include for helpers.* [#1662](https://github.com/sinatra/sinatra/pull/1662) by namusyaka
|
26
134
|
|
27
135
|
* Fix usage of inherited `Sinatra::Base` classes keyword arguments. Fixes [#1669](https://github.com/sinatra/sinatra/issues/1669) [#1670](https://github.com/sinatra/sinatra/pull/1670) by Cadu Ribeiro
|
28
136
|
|
@@ -36,20 +144,29 @@
|
|
36
144
|
|
37
145
|
* Fix Delegator to pass keyword arguments for Ruby 3.0. [#1684](https://github.com/sinatra/sinatra/pull/1684) by andrewtblake
|
38
146
|
|
39
|
-
* Fix use with keyword arguments for Ruby 3.0. [#1701](https://github.com/sinatra/sinatra/pull/1701) by Robin Wallin
|
147
|
+
* Fix use with keyword arguments for Ruby 3.0. [#1701](https://github.com/sinatra/sinatra/pull/1701) by Robin Wallin
|
40
148
|
|
41
149
|
* Fix memory leaks for proc template. Fixes [#1704](https://github.com/sinatra/sinatra/issues/1714) [#1719](https://github.com/sinatra/sinatra/pull/1719) by Slevin
|
42
150
|
|
43
151
|
* Remove unnecessary `test_files` from the gemspec. [#1712](https://github.com/sinatra/sinatra/pull/1712) by Masataka Pocke Kuwabara
|
44
152
|
|
45
|
-
*
|
153
|
+
* Docs: Spanish documentation: Update README.es.md with removal of Thin. [#1630](https://github.com/sinatra/sinatra/pull/1630) by Espartaco Palma
|
154
|
+
|
155
|
+
* Docs: German documentation: Fixed typos in German README.md. [#1648](https://github.com/sinatra/sinatra/pull/1648) by Juri
|
156
|
+
|
157
|
+
* Docs: Japanese documentation: Update README.ja.md with removal of Thin. [#1629](https://github.com/sinatra/sinatra/pull/1629) by Ryuichi KAWAMATA
|
158
|
+
|
159
|
+
* Docs: English documentation: Various minor fixes to README.md. [#1663](https://github.com/sinatra/sinatra/pull/1663) by Yanis Zafirópulos
|
160
|
+
|
161
|
+
* Docs: English documentation: Document when `dump_errors` is enabled. Fixes [#1664](https://github.com/sinatra/sinatra/issues/1664) [#1665](https://github.com/sinatra/sinatra/pull/1665) by Patrik Ragnarsson
|
46
162
|
|
163
|
+
* Docs: Brazilian Portuguese documentation: Update README.pt-br.md with translation fixes. [#1668](https://github.com/sinatra/sinatra/pull/1668) by Vitor Oliveira
|
47
164
|
|
48
165
|
### CI
|
49
166
|
|
50
167
|
* Use latest JRuby 9.2.16.0 on CI. [#1682](https://github.com/sinatra/sinatra/pull/1682) by Olle Jonsson
|
51
168
|
|
52
|
-
* Switch CI from travis to
|
169
|
+
* Switch CI from travis to GitHub Actions. [#1691](https://github.com/sinatra/sinatra/pull/1691) by namusyaka
|
53
170
|
|
54
171
|
* Skip the Slack action if `secrets.SLACK_WEBHOOK` is not set. [#1705](https://github.com/sinatra/sinatra/pull/1705) by Robin Wallin
|
55
172
|
|
data/CONTRIBUTING.md
CHANGED
@@ -65,21 +65,21 @@ track patch requests.
|
|
65
65
|
also has its own [Git repository](http://github.com/sinatra/sinatra-recipes).
|
66
66
|
|
67
67
|
* [The Introduction](http://www.sinatrarb.com/intro.html) is generated from
|
68
|
-
Sinatra's [README file](http://github.com/sinatra/sinatra/blob/
|
68
|
+
Sinatra's [README file](http://github.com/sinatra/sinatra/blob/main/README.md).
|
69
69
|
|
70
70
|
* If you want to help translating the documentation, the README is already
|
71
71
|
available in
|
72
|
-
[Japanese](http://github.com/sinatra/sinatra/blob/
|
73
|
-
[German](http://github.com/sinatra/sinatra/blob/
|
74
|
-
[Chinese](https://github.com/sinatra/sinatra/blob/
|
75
|
-
[Russian](https://github.com/sinatra/sinatra/blob/
|
76
|
-
[European](https://github.com/sinatra/sinatra/blob/
|
77
|
-
[Brazilian](https://github.com/sinatra/sinatra/blob/
|
72
|
+
[Japanese](http://github.com/sinatra/sinatra/blob/main/README.ja.md),
|
73
|
+
[German](http://github.com/sinatra/sinatra/blob/main/README.de.md),
|
74
|
+
[Chinese](https://github.com/sinatra/sinatra/blob/main/README.zh.md),
|
75
|
+
[Russian](https://github.com/sinatra/sinatra/blob/main/README.ru.md),
|
76
|
+
[European](https://github.com/sinatra/sinatra/blob/main/README.pt-pt.md) and
|
77
|
+
[Brazilian](https://github.com/sinatra/sinatra/blob/main/README.pt-br.md)
|
78
78
|
Portuguese,
|
79
|
-
[French](https://github.com/sinatra/sinatra/blob/
|
80
|
-
[Spanish](https://github.com/sinatra/sinatra/blob/
|
81
|
-
[Korean](https://github.com/sinatra/sinatra/blob/
|
82
|
-
[Hungarian](https://github.com/sinatra/sinatra/blob/
|
79
|
+
[French](https://github.com/sinatra/sinatra/blob/main/README.fr.md),
|
80
|
+
[Spanish](https://github.com/sinatra/sinatra/blob/main/README.es.md),
|
81
|
+
[Korean](https://github.com/sinatra/sinatra/blob/main/README.ko.md), and
|
82
|
+
[Hungarian](https://github.com/sinatra/sinatra/blob/main/README.hu.md).
|
83
83
|
The translations tend to fall behind the English version. Translations into
|
84
84
|
other languages would also be appreciated.
|
85
85
|
|
data/Gemfile
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
# Why use bundler?
|
2
4
|
# Well, not all development dependencies install on all rubies. Moreover, `gem
|
3
5
|
# install sinatra --development` doesn't work, as it will also try to install
|
@@ -6,75 +8,59 @@
|
|
6
8
|
#
|
7
9
|
# If you have issues with a gem: `bundle install --without-coffee-script`.
|
8
10
|
|
9
|
-
|
10
|
-
source 'https://rubygems.org' unless ENV['QUICK']
|
11
|
+
source 'https://rubygems.org'
|
11
12
|
gemspec
|
12
13
|
|
13
14
|
gem 'rake'
|
14
|
-
gem 'rack', '~> 2.0'
|
15
|
-
gem 'rack-test', '>= 0.6.2'
|
16
|
-
gem "minitest", "~> 5.0"
|
17
|
-
gem 'yard'
|
18
15
|
|
19
|
-
|
20
|
-
|
16
|
+
rack_version = ENV['rack'].to_s
|
17
|
+
rack_version = nil if rack_version.empty? || (rack_version == 'stable')
|
18
|
+
rack_version = { github: 'rack/rack' } if rack_version == 'head'
|
19
|
+
gem 'rack', rack_version
|
20
|
+
|
21
|
+
puma_version = ENV['puma'].to_s
|
22
|
+
puma_version = nil if puma_version.empty? || (puma_version == 'stable')
|
23
|
+
puma_version = { github: 'puma/puma' } if puma_version == 'head'
|
24
|
+
gem 'puma', puma_version
|
25
|
+
|
26
|
+
gem 'minitest', '~> 5.0'
|
27
|
+
gem 'rack-test', github: 'rack/rack-test'
|
28
|
+
gem 'rubocop', '~> 1.32.0', require: false
|
29
|
+
gem 'yard'
|
21
30
|
|
22
|
-
gem
|
31
|
+
gem 'rack-protection', path: 'rack-protection'
|
32
|
+
gem 'sinatra-contrib', path: 'sinatra-contrib'
|
23
33
|
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
34
|
+
# traces 0.10.0 started to use Ruby 2.7 syntax without specifying required Ruby version
|
35
|
+
# https://github.com/socketry/traces/pull/8#discussion_r1237988182
|
36
|
+
# async-http 0.60.2 added traces 0.10.0 as dependency
|
37
|
+
# https://github.com/socketry/async-http/pull/124/files#r1237988899
|
38
|
+
gem 'traces', '< 0.10.0' if RUBY_VERSION >= '2.6.0' && RUBY_VERSION < '2.7.0'
|
28
39
|
|
29
|
-
|
30
|
-
gem "activesupport", "~> 5.1.6"
|
31
|
-
end
|
40
|
+
gem 'activesupport', '~> 6.1'
|
32
41
|
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
gem 'radius'
|
55
|
-
gem 'asciidoctor'
|
56
|
-
gem 'liquid'
|
57
|
-
gem 'stylus'
|
58
|
-
gem 'rabl'
|
59
|
-
gem 'builder'
|
60
|
-
gem 'erubi'
|
61
|
-
gem 'erubis'
|
62
|
-
gem 'haml', '>= 3.0'
|
63
|
-
gem 'sass'
|
64
|
-
gem 'reel-rack'
|
65
|
-
gem 'celluloid', '~> 0.16.0'
|
66
|
-
gem 'commonmarker', '~> 0.20.0'
|
67
|
-
gem 'pandoc-ruby', '~> 2.0.2'
|
68
|
-
gem 'simplecov', require: false
|
69
|
-
end
|
42
|
+
gem 'asciidoctor'
|
43
|
+
gem 'builder'
|
44
|
+
gem 'commonmarker', '~> 0.23.4', platforms: [:ruby]
|
45
|
+
gem 'erubi'
|
46
|
+
gem 'eventmachine'
|
47
|
+
gem 'falcon', '~> 0.40', platforms: [:ruby]
|
48
|
+
gem 'haml', '~> 6'
|
49
|
+
gem 'kramdown'
|
50
|
+
gem 'liquid'
|
51
|
+
gem 'markaby'
|
52
|
+
gem 'nokogiri', '> 1.5.0'
|
53
|
+
gem 'pandoc-ruby', '~> 2.0.2'
|
54
|
+
gem 'rabl'
|
55
|
+
gem 'rainbows', platforms: [:mri] # uses #fork
|
56
|
+
gem 'rdiscount', platforms: [:ruby]
|
57
|
+
gem 'rdoc'
|
58
|
+
gem 'redcarpet', platforms: [:ruby]
|
59
|
+
gem 'sass-embedded', '~> 1.54'
|
60
|
+
gem 'simplecov', require: false
|
61
|
+
gem 'slim', '~> 4'
|
62
|
+
gem 'yajl-ruby', platforms: [:ruby]
|
70
63
|
|
71
|
-
|
72
|
-
gem 'json'
|
73
|
-
gem 'rubysl'
|
74
|
-
gem 'rubysl-test-unit'
|
75
|
-
gem 'erubi'
|
76
|
-
end
|
64
|
+
gem 'json', platforms: %i[jruby mri]
|
77
65
|
|
78
|
-
platforms :jruby
|
79
|
-
gem 'json'
|
80
|
-
end
|
66
|
+
gem 'jar-dependencies', '= 0.4.1', platforms: [:jruby] # Gem::LoadError with jar-dependencies 0.4.2
|
data/MAINTENANCE.md
CHANGED
@@ -4,13 +4,13 @@
|
|
4
4
|
|
5
5
|
### Releases
|
6
6
|
|
7
|
-
The next major version of Sinatra will be released from the
|
7
|
+
The next major version of Sinatra will be released from the main branch. Each version will be tagged so it will be possible to branch of should there be a need for bug fixes and other updates.
|
8
8
|
|
9
9
|
## Issues
|
10
10
|
|
11
11
|
### New features
|
12
12
|
|
13
|
-
New features will only be added to the
|
13
|
+
New features will only be added to the main branch and will not be made available in point releases.
|
14
14
|
|
15
15
|
### Bug fixes
|
16
16
|
|