sinatra 1.4.8 → 2.0.0.beta1

data/MAINTENANCE.md

@@ -0,0 +1,42 @@
+# Sinatra maintenance
+
+## Versions
+
+### Unstable release
+
+The next major version of Sinatra will be released from the master branch.
+
+* Current proposed major release: 2.0.0
+
+### Stable release
+
+The current stable version of Sinatra is 1.4 series, and released from the stable branch.
+
+## Issues
+
+### New features
+
+New features will only be added to the master branch and will not be made available in point releases.
+
+### Bug fixes
+
+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.
+
+* Current release series: 1.4.x
+
+### Security issues
+
+The current release series will receive patches and new versions in case of a security issue.
+
+* Current release series: 1.4.x
+
+### Severe security issues
+
+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.
+
+* Current release series: 1.4.x
+* Next most recent release series: 1.3.x
+
+### Unsupported Release Series
+
+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.

data/README.de.md

@@ -204,7 +204,7 @@ end
 Routen mit regulären Ausdrücken sind auch möglich:
 
 ```ruby
-get /\A\/hallo\/([\w]+)\z/ do
+get /\/hallo\/([\w]+)/ do
   "Hallo, #{params['captures'].first}!"
 end
 ```
@@ -389,7 +389,7 @@ end
 Oder unter Verwendung eines negativen look ahead:
 
 ```ruby
-get %r{^(?!/index$)} do
+get %r{(?!/index)} do
   # ...
 end
 ```
@@ -2039,7 +2039,7 @@ configure do
 end
 ```
 
-Läuft nur, wenn die Umgebung (RACK_ENV-Umgebungsvariable) auf `:production`
+Läuft nur, wenn die Umgebung (APP_ENV-Umgebungsvariable) auf `:production`
 gesetzt ist:
 
 ```ruby
@@ -2239,7 +2239,7 @@ set :protection, :except => [:path_traversal, :session_hijacking]
 ## Umgebungen
 
 Es gibt drei voreingestellte Umgebungen in Sinatra: `"development"`,
-`"production"` und `"test"`. Umgebungen können über die `RACK_ENV`
+`"production"` und `"test"`. Umgebungen können über die `APP_ENV`
 Umgebungsvariable gesetzt werden. Die Standardeinstellung ist `"development"`.
 In diesem Modus werden alle Templates zwischen Requests neu geladen. Dazu gibt
 es besondere Fehlerseiten für 404 Stati und Fehlermeldungen. In `"production"`
@@ -2408,7 +2408,7 @@ class MyAppTest < Minitest::Test
     assert_equal 'Hallo Frank!', last_response.body
   end
 
-  def test_with_rack_env
+  def test_with_user_agent
     get '/', {}, 'HTTP_USER_AGENT' => 'Songbird'
     assert_equal "Du verwendest Songbird!", last_response.body
   end

data/README.es.md

@@ -117,7 +117,7 @@ end
 Rutas con Expresiones Regulares:
 
 ```ruby
-get /\A\/hola\/([\w]+)\z/ do
+get /\/hola\/([\w]+)/ do
   "Hola, #{params['captures'].first}!"
 end
 ```
@@ -282,7 +282,7 @@ end
 O, usando un lookahead negativo:
 
 ```ruby
-get %r{^(?!/index$)} do
+get %r{(?!/index)} do
   # ...
 end
 ```
@@ -1808,7 +1808,7 @@ configure do
 end
 ```
 
-Ejecutar únicamente cuando el entorno (la variable de entorno RACK_ENV) es
+Ejecutar únicamente cuando el entorno (la variable de entorno APP_ENV) es
 `:production`:
 
 ```ruby
@@ -1918,7 +1918,7 @@ set :protection, :except => [:path_traversal, :session_hijacking]
   <dt>environment</dt>
   <dd>
     Entorno actual, por defecto toma el valor de
-    <tt>ENV['RACK_ENV']</tt>, o <tt>"development"</tt> si no
+    <tt>ENV['APP_ENV']</tt>, o <tt>"development"</tt> si no
     está disponible.
   </dd>
 
@@ -2080,7 +2080,7 @@ de `production` y `test`, donde se cachean.
 especiales que muestran un stack trace en el navegador cuando son disparados.
 
 Para utilizar alguno de los otros entornos puede asignarse el valor
-correspondiente a la variable de entorno `RACK_ENV`, o bien utilizar la opción
+correspondiente a la variable de entorno `APP_ENV`, o bien utilizar la opción
 `-e` al ejecutar la aplicación:
 
 ```shell

data/README.fr.md

@@ -209,7 +209,7 @@ end
 Une route peut aussi être définie par une expression régulière :
 
 ```ruby
-get /\A\/bonjour\/([\w]+)\z/ do
+get /\/bonjour\/([\w]+)/ do
   "Bonjour, #{params['captures'].first} !"
 end
 ```
@@ -390,7 +390,7 @@ end
 Ou bien en utilisant cette expression regulière :
 
 ```ruby
-get %r{^(?!/index$)} do
+get %r{(?!/index)} do
   # ...
 end
 ```
@@ -2016,7 +2016,7 @@ configure do
 end
 ```
 
-Lancé si l'environnement (variable d'environnement RACK_ENV) est `:production` :
+Lancé si l'environnement (variable d'environnement APP_ENV) est `:production` :
 
 ```ruby
   configure :production do
@@ -2121,7 +2121,7 @@ set :protection, :session => true
   </dd>
 
   <dt>environment</dt>
-  <dd>environnement courant, par défaut <tt>ENV['RACK_ENV']</tt>, ou
+  <dd>environnement courant, par défaut <tt>ENV['APP_ENV']</tt>, ou
   <tt>"development"</tt> si absent.</dd>
 
   <dt>logging</dt>
@@ -2229,7 +2229,7 @@ set :protection, :session => true
 
 Il existe trois environnements prédéfinis : `"development"`,
 `"production"` et `"test"`. Les environements peuvent être
-sélectionné via la variable d'environnement `RACK_ENV`. Sa valeur par défaut
+sélectionné via la variable d'environnement `APP_ENV`. Sa valeur par défaut
 est `"development"`. Dans ce mode, tous les templates sont rechargés à
 chaque requête. Des handlers spécifiques pour `not_found` et
 `error` sont installés pour vous permettre d'avoir une pile de trace
@@ -2237,10 +2237,10 @@ dans votre navigateur. En mode `"production"` et `"test"` les
 templates sont mis en cache par défaut.
 
 Pour exécuter votre application dans un environnement différent, définissez la
-variable d'environnement `RACK_ENV` :
+variable d'environnement `APP_ENV` :
 
-```shell
-RACK_ENV=production ruby my_app.rb
+``` shell
+APP_ENV=production ruby my_app.rb
 ```
 
 Vous pouvez utiliser une des méthodes `development?`, `test?` et `production?`
@@ -2405,7 +2405,7 @@ class MonTest < Minitest::Test
     assert_equal 'Salut Frank !', last_response.body
   end
 
-  def test_avec_rack_env
+  def test_avec_agent
     get '/', {}, 'HTTP_USER_AGENT' => 'Songbird'
     assert_equal "Vous utilisez Songbird !", last_response.body
   end

data/README.hu.md

@@ -88,7 +88,7 @@ Az útvonalmintákban szerepelhetnek joker paraméterek is, melyeket a
 Reguláris kifejezéseket is felvehetünk az útvonalba:
 
 ```ruby
-  get /\A\/hello\/([\w]+)\z/ do
+  get /\/hello\/([\w]+)/ do
     "Helló, #{params['captures'].first}!"
   end
 ```
@@ -411,7 +411,7 @@ Csak indításkor, de minden környezetre érvényesen fusson le:
   end
 ```
 
-Csak akkor fusson le, ha a környezet (a RACK_ENV környezeti változóban)
+Csak akkor fusson le, ha a környezet (a APP_ENV környezeti változóban)
 `:production`-ra van állítva:
 
 ```ruby
@@ -562,7 +562,7 @@ könyvtárat ajánljuk:
       assert_equal 'Helló Frici!', last_response.body
     end
 
-    def test_with_rack_env
+    def test_with_user_agent
       get '/', {}, 'HTTP_USER_AGENT' => 'Songbird'
       assert_equal "Songbird-öt használsz!", last_response.body
     end

data/README.ja.md

@@ -160,6 +160,15 @@ end
 ルーティングは定義された順番にマッチします。
 リクエストに最初にマッチしたルーティングが呼び出されます。
 
+トレイリングスラッシュを付けたルートは、そうでないルートと異なったものになります。
+
+```ruby
+    get '/foo' do
+      # Does not match "GET /foo/"
+    end
+```
+
+
 ルーティングのパターンは名前付きパラメータを含むことができ、
 `params`ハッシュで取得できます。
 
@@ -208,7 +217,7 @@ end
 ルーティングを正規表現にマッチさせることもできます。
 
 ```ruby
-get /\A\/hello\/([\w]+)\z/ do
+get /\/hello\/([\w]+)/ do
   "Hello, #{params['captures'].first}!"
 end
 ```
@@ -365,7 +374,7 @@ end
 または、否定先読みを使って:
 
 ```ruby
-get %r{^(?!/index$)} do
+get %r{(?!/index)} do
   # ...
 end
 ```
@@ -1461,6 +1470,8 @@ post '/message' do
 end
 ```
 
+クライアントはソケットに書き込もうとしている接続を閉じることも可能です。そのため、記述しようとする前に`out.closed?`をチェックすることを勧めます。
+
 ### ロギング(Logging)
 
 リクエストスコープにおいて、`logger`ヘルパーは`Logger`インスタンスを作り出します。
@@ -1868,7 +1879,7 @@ configure do
 end
 ```
 
-環境設定(`RACK_ENV`環境変数)が`:production`に設定されている時だけ実行する方法:
+環境設定(`APP_ENV`環境変数)が`:production`に設定されている時だけ実行する方法:
 
 ```ruby
 configure :production do
@@ -1958,7 +1969,7 @@ set :protection, :session => true
 
   <dt>environment</dt>
   <dd>
-    現在の環境。デフォルトは<tt>ENV['RACK_ENV']</tt>、それが無い場合は<tt>"development"</tt>。
+    現在の環境。デフォルトは<tt>ENV['APP_ENV']</tt>、それが無い場合は<tt>"development"</tt>。
   </dd>
 
   <dt>logging</dt>
@@ -2070,12 +2081,12 @@ set :protection, :session => true
 
 ## 環境設定(Environments)
 
-３種類の既定環境、`"development"`、`"production"`および`"test"`があります。環境は、`RACK_ENV`環境変数を通して設定できます。デフォルト値は、`"development"`です。`"development"`環境において、すべてのテンプレートは、各リクエスト間で再ロードされ、そして、特別の`not_found`および`error`ハンドラがブラウザにスタックトレースを表示します。`"production"`および`"test"`環境においては、テンプレートはデフォルトでキャッシュされます。
+３種類の既定環境、`"development"`、`"production"`および`"test"`があります。環境は、`APP_ENV`環境変数を通して設定できます。デフォルト値は、`"development"`です。`"development"`環境において、すべてのテンプレートは、各リクエスト間で再ロードされ、そして、特別の`not_found`および`error`ハンドラがブラウザにスタックトレースを表示します。`"production"`および`"test"`環境においては、テンプレートはデフォルトでキャッシュされます。
 
-異なる環境を走らせるには、`RACK_ENV`環境変数を設定します。
+異なる環境を走らせるには、`APP_ENV`環境変数を設定します。
 
 ```shell
-RACK_ENV=production ruby my_app.rb
+APP_ENV=production ruby my_app.rb
 ```
 
 既定メソッド、`development?`、`test?`および`production?`を、現在の環境設定を確認するために使えます。
@@ -2219,7 +2230,7 @@ class MyAppTest < Minitest::Test
     assert_equal 'Hello Frank!', last_response.body
   end
 
-  def test_with_rack_env
+  def test_with_user_agent
     get '/', {}, 'HTTP_USER_AGENT' => 'Songbird'
     assert_equal "Songbirdを使ってます!", last_response.body
   end

data/README.ko.md

@@ -207,7 +207,7 @@ end
 라우터는 정규표현식으로 매치할 수 있습니다.
 
 ```ruby
-get /\A\/hello\/([\w]+)\z/ do
+get /\/hello\/([\w]+)/ do
   "Hello, #{params['captures'].first}!"
 end
 ```
@@ -374,7 +374,7 @@ end
 또는 거꾸로 탐색(negative look ahead)할 수도 있습니다.
 
 ```ruby
-get %r{^(?!/index$)} do
+get %r{(?!/index)} do
   # ...
 end
 ```
@@ -1991,7 +1991,7 @@ configure do
 end
 ```
 
-환경(RACK_ENV 환경 변수)이 `:production`일 때만 실행되게 하려면 이렇게 하면 됩니다.
+환경(APP_ENV 환경 변수)이 `:production`일 때만 실행되게 하려면 이렇게 하면 됩니다.
 
 ```ruby
 configure :production do
@@ -2094,7 +2094,7 @@ set :protection, :session => true
 
   <dt>environment</dt>
   <dd>
-    현재 환경, 기본값은 <tt>ENV['RACK_ENV']</tt> ENV에 없을 경우엔 "development".
+    현재 환경, 기본값은 <tt>ENV['APP_ENV']</tt> ENV에 없을 경우엔 "development".
   </dd>
 
   <dt>logging</dt>
@@ -2225,16 +2225,16 @@ set :protection, :session => true
 ## 환경(Environments)
 
 3가지의 미리 정의된 `environments` `"development"`, `"production"`, `"test"`
-가 있습니다. 환경은 `RACK_ENV` 환경 변수를 통해서도 설정됩니다. 기본값은
+가 있습니다. 환경은 `APP_ENV` 환경 변수를 통해서도 설정됩니다. 기본값은
 `"development"`입니다. `"development"` 모드에서는 모든 템플릿들은 요청 간에
 리로드됩니다. 또, `"development"` 모드에서는 특별한 `not_found` 와 `error`
 핸들러가 브라우저에서 스택 트레이스를 볼 수 있게합니다.
 `"production"`과 `"test"`에서는 기본적으로 템플릿은 캐시됩니다.
 
-다른 환경으로 실행시키려면 `RACK_ENV` 환경 변수를 사용하세요.
+다른 환경으로 실행시키려면 `APP_ENV` 환경 변수를 사용하세요.
 
 ```shell
-RACK_ENV=production ruby my_app.rb
+APP_ENV=production ruby my_app.rb
 ```
 
 현재 설정된 환경이 무엇인지 검사하기 위해서는 준비된 `development?`, `test?`,
@@ -2400,7 +2400,7 @@ class MyAppTest < Minitest::Test
     assert_equal 'Hello Frank!', last_response.body
   end
 
-  def test_with_rack_env
+  def test_with_user_agent
     get '/', {}, 'HTTP_USER_AGENT' => 'Songbird'
     assert_equal "You're using Songbird!", last_response.body
   end

data/README.md

@@ -1,5 +1,7 @@
 # Sinatra
 
+[![Build Status](https://secure.travis-ci.org/sinatra/sinatra.png)](http://travis-ci.org/sinatra/sinatra)
+
 Sinatra is a [DSL](https://en.wikipedia.org/wiki/Domain-specific_language) for
 quickly creating web applications in Ruby with minimal effort:
 
@@ -73,6 +75,7 @@ pick up if available.
     * [Filters](#filters)
     * [Helpers](#helpers)
         * [Using Sessions](#using-sessions)
+        	* [Choosing Your Own Session Middleware](#choosing-your-own-session-middleware)
         * [Halting](#halting)
         * [Passing](#passing)
         * [Triggering Another Route](#triggering-another-route)
@@ -160,6 +163,14 @@ end
 Routes are matched in the order they are defined. The first route that
 matches the request is invoked.
 
+Routes with trailing slashes are different from the ones without:
+
+```ruby
+    get '/foo' do
+      # Does not match "GET /foo/"
+    end
+```
+
 Route patterns may include named parameters, accessible via the
 `params` hash:
 
@@ -208,7 +219,7 @@ end
 Route matching with Regular Expressions:
 
 ```ruby
-get /\A\/hello\/([\w]+)\z/ do
+get /\/hello\/([\w]+)/ do
   "Hello, #{params['captures'].first}!"
 end
 ```
@@ -384,7 +395,7 @@ end
 Or, using negative look ahead:
 
 ```ruby
-get %r{^(?!/index$)} do
+get %r{(?!/index)} do
   # ...
 end
 ```
@@ -535,6 +546,14 @@ end
 ```
 
 Renders the template string.
+You can optionally specify `:path` and `:line` for a clearer backtrace if there is
+a filesystem path or line associated with that string:
+
+```ruby
+get '/' do
+  haml '%div.title Hello World', :path => 'examples/file.haml', :line => 3
+end
+```
 
 ### Available Template Languages
 
@@ -718,7 +737,7 @@ template, you almost always want to pass locals to it.
   </tr>
 </table>
 
-It is not possible to call methods from markdown, nor to pass locals to it.
+It is not possible to call methods from Markdown, nor to pass locals to it.
 You therefore will usually use it in combination with another rendering
 engine:
 
@@ -754,7 +773,7 @@ template than for the layout by passing the `:layout_engine` option.
   </tr>
 </table>
 
-It is not possible to call methods from textile, nor to pass locals to it. You
+It is not possible to call methods from Textile, nor to pass locals to it. You
 therefore will usually use it in combination with another rendering engine:
 
 ```ruby
@@ -789,7 +808,7 @@ template than for the layout by passing the `:layout_engine` option.
   </tr>
 </table>
 
-It is not possible to call methods from rdoc, nor to pass locals to it. You
+It is not possible to call methods from RDoc, nor to pass locals to it. You
 therefore will usually use it in combination with another rendering engine:
 
 ```ruby
@@ -917,7 +936,7 @@ It also takes a block for inline templates (see example).
   </tr>
 </table>
 
-It is not possible to call methods from creole, nor to pass locals to it. You
+It is not possible to call methods from Creole, nor to pass locals to it. You
 therefore will usually use it in combination with another rendering engine:
 
 ```ruby
@@ -1359,24 +1378,6 @@ get '/:value' do
 end
 ```
 
-Note that `enable :sessions` actually stores all data in a cookie. This
-might not always be what you want (storing lots of data will increase your
-traffic, for instance). You can use any Rack session middleware: in order to
-do so, do **not** call `enable :sessions`, but instead pull in your
-middleware of choice as you would any other middleware:
-
-```ruby
-use Rack::Session::Pool, :expire_after => 2592000
-
-get '/' do
-  "value = " << session[:value].inspect
-end
-
-get '/:value' do
-  session['value'] = params['value']
-end
-```
-
 To improve security, the session data in the cookie is signed with a session
 secret. A random secret is generated for you by Sinatra. However, since this
 secret will change with every start of your application, you might want to
@@ -1400,6 +1401,40 @@ domain with a *.* like this instead:
 set :sessions, :domain => '.foo.com'
 ```
 
+#### Choosing Your Own Session Middleware
+
+Note that `enable :sessions` actually stores all data in a cookie. This
+might not always be what you want (storing lots of data will increase your
+traffic, for instance). You can use any Rack session middleware: in order to
+do so, one of the following methods can be used:
+
+```ruby
+enable :sessions
+set :session_store, Rack::Session::Pool
+```
+
+Or to set up sessions with a hash of options:
+
+```ruby
+set :sessions, :expire_after => 2592000
+set :session_store, Rack::Session::Pool
+```
+
+Another option is to **not** call `enable :sessions`, but instead pull in your
+middleware of choice as you would any other middleware.
+
+It is important to note that when using this method, session based protection **will not be enabled by default**.
+
+The Rack middleware to do that will also need to be added:
+
+```ruby
+use Rack::Session::Pool, :expire_after => 2592000
+use Rack::Protection::RemoteToken
+use Rack::Protection::SessionHijacking
+```
+
+See 'Configuring attack protection' for more information.
+
 ### Halting
 
 To immediately stop a request within a filter or route use:
@@ -1581,6 +1616,10 @@ post '/:message' do
 end
 ```
 
+It's also possible for the client to close the connection when trying to write
+to the socket. Because of this, it's recommended to check `out.closed?` before
+trying to write.
+
 ### Logging
 
 In the request scope, the `logger` helper exposes a `Logger` instance:
@@ -2021,7 +2060,7 @@ configure do
 end
 ```
 
-Run only when the environment (`RACK_ENV` environment variable) is set to
+Run only when the environment (`APP_ENV` environment variable) is set to
 `:production`:
 
 ```ruby
@@ -2076,12 +2115,12 @@ set :protection, :except => [:path_traversal, :session_hijacking]
 ```
 
 By default, Sinatra will only set up session based protection if `:sessions`
-has been enabled. Sometimes you want to set up sessions on your own, though. In
-that case you can get it to set up session based protections by passing the
-`:session` option:
+have been enabled. See 'Using Sessions'. Sometimes you may want to set up
+sessions "outside" of the Sinatra app, such as in the config.ru or with a
+separate Rack::Builder instance. In that case you can still set up session
+based protection by passing the `:session` option:
 
 ```ruby
-use Rack::Session::Pool
 set :protection, :session => true
 ```
 
@@ -2126,7 +2165,7 @@ set :protection, :session => true
 
   <dt>environment</dt>
   <dd>
-    Current environment. Defaults to <tt>ENV['RACK_ENV']</tt>, or
+    Current environment. Defaults to <tt>ENV['APP_ENV']</tt>, or
     <tt>"development"</tt> if not available.
   </dd>
 
@@ -2170,6 +2209,11 @@ set :protection, :session => true
     <tt>app_file</tt> setting if not set.
   </dd>
 
+  <dt>quiet</dt>
+  <dd>
+    Disables logs generated by Sinatra's start and stop commands. `false` by default.
+  </dd>
+
   <dt>reload_templates</dt>
   <dd>
     Whether or not to reload templates between requests. Enabled in development
@@ -2209,6 +2253,9 @@ set :protection, :session => true
     See 'Using Sessions' section for more information.
   </dd>
 
+  <dt>session_store</dt>
+  <dd>The Rack session middleware used. Defaults to <tt>Rack::Session::Cookie</tt>. See 'Using Sessions' section for more information.</dd>
+
   <dt>show_exceptions</dt>
   <dd>
     Show a stack trace in the browser when an exception happens. Enabled by
@@ -2264,16 +2311,16 @@ set :protection, :session => true
 ## Environments
 
 There are three predefined `environments`: `"development"`, `"production"` and
-`"test"`. Environments can be set through the `RACK_ENV` environment variable.
+`"test"`. Environments can be set through the `APP_ENV` environment variable.
 The default value is `"development"`. In the `"development"` environment all
 templates are reloaded between requests, and special `not_found` and `error`
 handlers display stack traces in your browser. In the `"production"` and
 `"test"` environments, templates are cached by default.
 
-To run different environments, set the `RACK_ENV` environment variable:
+To run different environments, set the `APP_ENV` environment variable:
 
 ```shell
-RACK_ENV=production ruby my_app.rb
+APP_ENV=production ruby my_app.rb
 ```
 
 You can use predefined methods: `development?`, `test?` and `production?` to
@@ -2442,7 +2489,7 @@ class MyAppTest < Minitest::Test
     assert_equal 'Hello Frank!', last_response.body
   end
 
-  def test_with_rack_env
+  def test_with_user_agent
     get '/', {}, 'HTTP_USER_AGENT' => 'Songbird'
     assert_equal "You're using Songbird!", last_response.body
   end
@@ -2817,7 +2864,7 @@ being [extending the main object](https://github.com/sinatra/sinatra/blob/ca0636
 Sinatra applications can be run directly:
 
 ```shell
-ruby myapp.rb [-h] [-x] [-e ENVIRONMENT] [-p PORT] [-o HOST] [-s HANDLER]
+ruby myapp.rb [-h] [-x] [-q] [-e ENVIRONMENT] [-p PORT] [-o HOST] [-s HANDLER]
 ```
 
 Options are:
@@ -2828,6 +2875,7 @@ Options are:
 -o # set the host (default is 0.0.0.0)
 -e # set the environment (default is development)
 -s # specify rack server/handler (default is thin)
+-q # turn on quiet mode for server (default is off)
 -x # turn on the mutex lock (default is off)
 ```
 
@@ -2871,31 +2919,10 @@ thin --threaded start
 
 The following Ruby versions are officially supported:
 <dl>
-  <dt>Ruby 1.8.7</dt>
-  <dd>
-    1.8.7 is fully supported, however, if nothing is keeping you from it, we
-    recommend upgrading or switching to JRuby or Rubinius. Support for 1.8.7
-    will not be dropped before Sinatra 2.0. Ruby 1.8.6 is no longer supported.
-  </dd>
-
-  <dt>Ruby 1.9.2</dt>
+  <dt>Ruby 2.2</dt>
   <dd>
-    1.9.2 is fully supported. Do not use 1.9.2p0, as it is known to cause
-    segmentation faults when running Sinatra. Official support will continue
-    at least until the release of Sinatra 1.5.
-  </dd>
-
-  <dt>Ruby 1.9.3</dt>
-  <dd>
-    1.9.3 is fully supported and recommended. Please note that switching to 1.9.3
-    from an earlier version will invalidate all sessions. 1.9.3 will be supported
-    until the release of Sinatra 2.0.
-  </dd>
-
-  <dt>Ruby 2.x</dt>
-  <dd>
-    2.x is fully supported and recommended. There are currently no plans to drop
-    official support for it.
+    2.2 is fully supported and recommended. There are currently no plans to
+    drop official support for it.
   </dd>
 
   <dt>Rubinius</dt>
@@ -2912,6 +2939,8 @@ The following Ruby versions are officially supported:
   </dd>
 </dl>
 
+Versions of Ruby prior to 2.2.2 are no longer supported as of Sinatra 2.0.
+
 We also keep an eye on upcoming Ruby versions.
 
 The following Ruby implementations are not officially supported but still are
@@ -2935,7 +2964,7 @@ implementation.
 If you run MacRuby, you should `gem install control_tower`.
 
 Sinatra currently doesn't run on Cardinal, SmallRuby, BlueRuby or any
-Ruby version prior to 1.8.7.
+Ruby version prior to 2.2.
 
 ## The Bleeding Edge
 
@@ -2965,7 +2994,7 @@ Then, in your project directory, create a `Gemfile`:
 
 ```ruby
 source 'https://rubygems.org'
-gem 'sinatra', :github => "sinatra/sinatra"
+gem 'sinatra', :github => 'sinatra/sinatra'
 
 # other dependencies
 gem 'haml'                    # for instance, if you use haml