sinatra 3.0.5 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 253794a685657aa33414a6384abfa99f0c4b0a8aa97a9f15aa6d5ae88bcd747e
-  data.tar.gz: 455faa2397e06210cdeeb6e90eb5b8ec56908695585c869bb9241afc1e480cca
+  metadata.gz: 71d0bb379c736d6c251ceb424cac84dbe3a8b22d80a54473a0af1085b93b7dbf
+  data.tar.gz: 489d48a5e4f934127e04cdafa2d0d582c5143cc2a8f476239ea5b5b0f0e492c9
 SHA512:
-  metadata.gz: b8ca8d0630ca6a5b420a6066ac6bb0375092e92a549bf623974a8780b576b859a227eccf32402ffb4628a04523c107420cda5982bcc69a14dbb3779ff299b255
-  data.tar.gz: 85352987ea63bcbdfa6a80af67a59e5e3e4e812f1aaf4f28016ebd085805934ffa2787278b3034cef623ee5ed278bb5b66eeb02f390b6b8fea5326f7f039c4d7
+  metadata.gz: fbe92c1867d3ebe8ddc3f707c4e9f9cf2b68bddf2556164b85083ac635650725d63f8c847b4c70d0ad2abf6793b5f1054918b0b7c4e04d303119867be84c3253
+  data.tar.gz: 0727d88e9f5574c304dd3f31c6107a2b3e1cde96914e258c86fee529a1e922b0ff1d023f109fcc3b232f010ae21d9bdb4c365001dc7c3f658c0bd75b95e8d24d

data/AUTHORS.md

@@ -2,31 +2,37 @@ Sinatra was designed and developed by Blake Mizerany in California.
 
 ### Current Team
 
-* **Konstantin Haase** (maintainer)
+* **Eloy Perez**
+* **Jordan Owens**
+* **Olle Jonsson**
+* **Patrik Ragnarsson**
 * **Zachary Scott**
-* **Kashyap Kondamudi**
-* **Ashley Williams**
-* **Trevor Bramble**
-* **Kunpei Sakai**
 
 ### Alumni
 
 * **Blake Mizerany** (creator)
+* **Konstantin Haase** (maintainer)
 * **Ryan Tomayko**
 * **Simon Rozet**
 * **Katrina Owen**
+* **Kashyap Kondamudi**
+* **Ashley Williams**
+* **Trevor Bramble**
+* **Kunpei Sakai**
 
 ### Thanks
 
 Sinatra would not have been possible without strong company backing.
 In the past, financial and emotional support have been provided mainly by
-[Heroku](http://heroku.com), [GitHub](https://github.com) and
-[Engine Yard](http://www.engineyard.com/), and is now taken care of by
-[Travis CI](http://travis-ci.com/).
+[Heroku](https://heroku.com), [GitHub](https://github.com),
+[Engine Yard](http://www.engineyard.com/) and [Travis CI](https://travis-ci.com/),
+and is now taken care of by [84codes](https://www.84codes.com/).
 
 Special thanks to the following extraordinary individuals, without whom
 Sinatra would not be possible:
 
+* [Benoit Daloze](https://eregon.me/blog/) (eregon) for help around TruffleRuby
+  and keyword arguments use in mustermann.
 * [Ryan Tomayko](http://tomayko.com/) (rtomayko) for constantly fixing
   whitespace errors __60d5006__
 * [Ezra Zygmuntowicz](http://brainspl.at/) (ezmobius) for initial help and

data/CHANGELOG.md

@@ -1,6 +1,79 @@
-## Unreleased
+## 4.0.0. / 2024-01-19
 
-* _Your new feature here._
+* New: Add support for Rack 3 ([#1857])
+  * Note: you may want to read the [Rack 3 Upgrade Guide]
+
+* Require Ruby 2.7.8 as minimum Ruby version ([#1993])
+
+* Breaking change: Drop support for Rack 2 ([#1857])
+  * Note: when using Sinatra to start the web server, you now need the `rackup` gem installed
+
+* Breaking change: Remove the `IndifferentHash` initializer ([#1982])
+
+* Breaking change: Disable `session_hijacking` protection by default ([#1984])
+
+* Breaking change: Remove `Rack::Protection::EncryptedCookie` ([#1989])
+  * Note: cookies are still encrypted (by [`Rack::Session::Cookie`])
+
+[#1857]: https://github.com/sinatra/sinatra/pull/1857
+[#1993]: https://github.com/sinatra/sinatra/pull/1993
+[#1982]: https://github.com/sinatra/sinatra/pull/1982
+[#1984]: https://github.com/sinatra/sinatra/pull/1984
+[#1989]: https://github.com/sinatra/sinatra/pull/1989
+[`Rack::Session::Cookie`]: https://github.com/rack/rack-session
+[Rack 3 Upgrade Guide]: https://github.com/rack/rack/blob/main/UPGRADE-GUIDE.md
+
+## 3.2.0 / 2023-12-29
+
+* New: Add `#except` method to `Sinatra::IndifferentHash` ([#1940])
+
+* New: Use `Exception#detailed_message` to show backtrace ([#1952])
+
+* New: Add `Sinatra::HamlHelpers` to sinatra-contrib ([#1960])
+
+* Fix: Add `base64` to rack-protection runtime dependencies ([#1946])
+
+* Fix: Avoid open-ended dependencies for sinatra-contrib and rack-protection ([#1949])
+
+* Fix: Helpful message when `Sinatra::Runner` times out ([#1975])
+
+* Fix: Ruby 3.3 + Bundler 2.5 compatibility ([#1975])
+
+[#1940]: https://github.com/sinatra/sinatra/pull/1940
+[#1946]: https://github.com/sinatra/sinatra/pull/1946
+[#1949]: https://github.com/sinatra/sinatra/pull/1949
+[#1952]: https://github.com/sinatra/sinatra/pull/1952
+[#1960]: https://github.com/sinatra/sinatra/pull/1960
+[#1975]: https://github.com/sinatra/sinatra/pull/1975
+
+## 3.1.0 / 2023-08-07
+
+* New: Add sass support via sass-embedded [#1911] by なつき
+
+* New: Add start and stop callbacks [#1913] by Jevin Sew
+
+* New: Warn on dropping sessions [#1900] by Jonathan del Strother
+
+* New: Make Puma the default server [#1924] by Patrik Ragnarsson
+
+* Fix: Remove use of Tilt::Cache [#1922] by Jeremy Evans (allows use of Tilt 2.2.0 without deprecation warning)
+
+* Fix: rack-protection: specify rack version requirement [#1932] by Patrik Ragnarsson
+
+[#1911]: https://github.com/sinatra/sinatra/pull/1911
+[#1913]: https://github.com/sinatra/sinatra/pull/1913
+[#1900]: https://github.com/sinatra/sinatra/pull/1900
+[#1924]: https://github.com/sinatra/sinatra/pull/1924
+[#1922]: https://github.com/sinatra/sinatra/pull/1922
+[#1932]: https://github.com/sinatra/sinatra/pull/1932
+
+## 3.0.6 / 2023-04-11
+
+* Fix: Add support to keep open streaming connections with Puma [#1858](https://github.com/sinatra/sinatra/pull/1858) by Jordan Owens
+
+* Fix: Avoid crash in `uri` helper on Integer input [#1890](https://github.com/sinatra/sinatra/pull/1890) by Patrik Ragnarsson
+
+* Fix: Rescue `RuntimeError` when trying to use `SecureRandom` [#1888](https://github.com/sinatra/sinatra/pull/1888) by Stefan Sundin
 
 ## 3.0.5 / 2022-12-16
 

data/CONTRIBUTING.md

@@ -65,21 +65,21 @@ track patch requests.
   also has its own [Git repository](http://github.com/sinatra/sinatra-recipes).
 
 * [The Introduction](http://www.sinatrarb.com/intro.html) is generated from
-  Sinatra's [README file](http://github.com/sinatra/sinatra/blob/master/README.md).
+  Sinatra's [README file](http://github.com/sinatra/sinatra/blob/main/README.md).
 
 * If you want to help translating the documentation, the README is already
   available in
-  [Japanese](http://github.com/sinatra/sinatra/blob/master/README.ja.md),
-  [German](http://github.com/sinatra/sinatra/blob/master/README.de.md),
-  [Chinese](https://github.com/sinatra/sinatra/blob/master/README.zh.md),
-  [Russian](https://github.com/sinatra/sinatra/blob/master/README.ru.md),
-  [European](https://github.com/sinatra/sinatra/blob/master/README.pt-pt.md) and
-  [Brazilian](https://github.com/sinatra/sinatra/blob/master/README.pt-br.md)
+  [Japanese](http://github.com/sinatra/sinatra/blob/main/README.ja.md),
+  [German](http://github.com/sinatra/sinatra/blob/main/README.de.md),
+  [Chinese](https://github.com/sinatra/sinatra/blob/main/README.zh.md),
+  [Russian](https://github.com/sinatra/sinatra/blob/main/README.ru.md),
+  [European](https://github.com/sinatra/sinatra/blob/main/README.pt-pt.md) and
+  [Brazilian](https://github.com/sinatra/sinatra/blob/main/README.pt-br.md)
   Portuguese,
-  [French](https://github.com/sinatra/sinatra/blob/master/README.fr.md),
-  [Spanish](https://github.com/sinatra/sinatra/blob/master/README.es.md),
-  [Korean](https://github.com/sinatra/sinatra/blob/master/README.ko.md), and
-  [Hungarian](https://github.com/sinatra/sinatra/blob/master/README.hu.md).
+  [French](https://github.com/sinatra/sinatra/blob/main/README.fr.md),
+  [Spanish](https://github.com/sinatra/sinatra/blob/main/README.es.md),
+  [Korean](https://github.com/sinatra/sinatra/blob/main/README.ko.md), and
+  [Hungarian](https://github.com/sinatra/sinatra/blob/main/README.hu.md).
   The translations tend to fall behind the English version. Translations into
   other languages would also be appreciated.
 

data/Gemfile

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-# Why use bundler?
-# Well, not all development dependencies install on all rubies. Moreover, `gem
-# install sinatra --development` doesn't work, as it will also try to install
-# development dependencies of our dependencies, and those are not conflict free.
-# So, here we are, `bundle install`.
-#
-# If you have issues with a gem: `bundle install --without-coffee-script`.
-
 source 'https://rubygems.org'
 gemspec
 
@@ -15,45 +7,55 @@ gem 'rake'
 
 rack_version = ENV['rack'].to_s
 rack_version = nil if rack_version.empty? || (rack_version == 'stable')
-rack_version = { github: 'rack/rack' } if rack_version == 'latest'
+rack_version = { github: 'rack/rack' } if rack_version == 'head'
 gem 'rack', rack_version
 
+rack_session_version = ENV['rack_session'].to_s
+rack_session_version = nil if rack_session_version.empty? || (rack_session_version == 'stable')
+rack_session_version = { github: 'rack/rack-session' } if rack_session_version == 'head'
+gem 'rack-session', rack_session_version
+
+gem 'rackup'
+
 puma_version = ENV['puma'].to_s
 puma_version = nil if puma_version.empty? || (puma_version == 'stable')
-puma_version = { github: 'puma/puma' } if puma_version == 'latest'
+puma_version = { github: 'puma/puma' } if puma_version == 'head'
 gem 'puma', puma_version
 
 gem 'minitest', '~> 5.0'
-gem 'rack-test', github: 'rack/rack-test'
+gem 'rack-test'
 gem 'rubocop', '~> 1.32.0', require: false
-gem 'yard'
+gem 'yard' # used by rake doc
 
 gem 'rack-protection', path: 'rack-protection'
 gem 'sinatra-contrib', path: 'sinatra-contrib'
 
-gem 'activesupport', '~> 6.1'
-
 gem 'asciidoctor'
 gem 'builder'
+gem 'childprocess', '>= 5'
 gem 'commonmarker', '~> 0.23.4', platforms: [:ruby]
 gem 'erubi'
 gem 'eventmachine'
 gem 'falcon', '~> 0.40', platforms: [:ruby]
-gem 'haml', '~> 5'
+gem 'haml', '~> 6'
 gem 'kramdown'
 gem 'liquid'
 gem 'markaby'
 gem 'nokogiri', '> 1.5.0'
 gem 'pandoc-ruby', '~> 2.0.2'
 gem 'rabl'
-gem 'rainbows', platforms: [:mri] # uses #fork
 gem 'rdiscount', platforms: [:ruby]
 gem 'rdoc'
 gem 'redcarpet', platforms: [:ruby]
 gem 'simplecov', require: false
 gem 'slim', '~> 4'
 gem 'yajl-ruby', platforms: [:ruby]
-
-gem 'json', platforms: %i[jruby mri]
-
-gem 'jar-dependencies', '= 0.4.1', platforms: [:jruby] # Gem::LoadError with jar-dependencies 0.4.2
+gem 'zeitwerk'
+
+# sass-embedded depends on google-protobuf
+# which fails to be installed on JRuby and TruffleRuby under aarch64
+# https://github.com/jruby/jruby/issues/8062
+# https://github.com/protocolbuffers/protobuf/issues/11935
+java    = %w(jruby truffleruby).include?(RUBY_ENGINE)
+aarch64 = RbConfig::CONFIG["target_cpu"] == 'aarch64'
+gem 'sass-embedded', '~> 1.54' unless java && aarch64

data/MAINTENANCE.md

@@ -4,13 +4,13 @@
 
 ### Releases
 
-The next major version of Sinatra will be released from the master 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.
+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.
 
 ## Issues
 
 ### New features
 
-New features will only be added to the master branch and will not be made available in point releases.
+New features will only be added to the main branch and will not be made available in point releases.
 
 ### Bug fixes