sinatra 2.0.4 → 2.0.5

data/README.md

@@ -351,13 +351,13 @@ But other values are also accepted.
 You can return any object that would either be a valid Rack response, Rack
 body object or HTTP status code:
 
-* An Array with three elements: `[status (Fixnum), headers (Hash), response
+* An Array with three elements: `[status (Integer), headers (Hash), response
   body (responds to #each)]`
-* An Array with two elements: `[status (Fixnum), response body (responds to
+* An Array with two elements: `[status (Integer), response body (responds to
   #each)]`
 * An object that responds to `#each` and passes nothing but strings to
   the given block
-* A Fixnum representing the status code
+* A Integer representing the status code
 
 That way we can, for instance, easily implement a streaming example:
 
@@ -611,13 +611,15 @@ get('/') { markdown :index }
   <tr>
     <td>Dependency</td>
     <td>
-      <a href="http://www.kuwata-lab.com/erubis/" title="erubis">erubis</a>
+      <a href="https://github.com/jeremyevans/erubi" title="erubi">erubi</a>
+      or <a href="http://www.kuwata-lab.com/erubis/" title="erubis">erubis</a>
       or erb (included in Ruby)
     </td>
   </tr>
   <tr>
     <td>File Extensions</td>
-    <td><tt>.erb</tt>, <tt>.rhtml</tt> or <tt>.erubis</tt> (Erubis only)</td>
+    <td><tt>.erb</tt>, <tt>.rhtml</tt> or <tt>.erubi</tt> (Erubi only)
+ or <tt>.erubis</tt> (Erubis only)</td>
   </tr>
   <tr>
     <td>Example</td>

data/README.pt-br.md

@@ -293,16 +293,16 @@ Você pode retornar uma resposta válida ou um objeto para o Rack, sendo
 eles de qualquer tipo de objeto que queira. Além disso, é possível
 retornar um código de status HTTP.
 
-* Um array com três elementros: `[status (Fixnum), cabecalho (Hash),
+* Um array com três elementros: `[status (Integer), cabecalho (Hash),
     corpo da resposta (responde à #each)]`
 
-* Um array com dois elementros: `[status (Fixnum), corpo da resposta
+* Um array com dois elementros: `[status (Integer), corpo da resposta
     (responde à #each)]`
 
 * Um objeto que responda à `#each` sem passar nada, mas, sim, `strings`
     para um dado bloco
 
-* Um objeto `Fixnum` representando o código de status
+* Um objeto `Integer` representando o código de status
 
 Dessa forma, podemos implementar facilmente um exemplo de streaming:
 

data/README.ru.md

@@ -353,13 +353,13 @@ end
 Вы можете вернуть любой объект, который будет либо корректным Rack ответом,
 либо объектом Rack body, либо кодом состояния HTTP:
 
-* массив с тремя переменными: `[код (Fixnum), заголовки (Hash), тело ответа
+* массив с тремя переменными: `[код (Integer), заголовки (Hash), тело ответа
   (должно отвечать на #each)]`;
-* массив с двумя переменными: `[код (Fixnum), тело ответа (должно отвечать
+* массив с двумя переменными: `[код (Integer), тело ответа (должно отвечать
   на #each)]`;
 * объект, отвечающий на `#each`, который передает только строковые типы
   данных в этот блок;
-* Fixnum, представляющий код состояния HTTP.
+* Integer, представляющий код состояния HTTP.
 
 Таким образом легко можно реализовать, например, потоковую передачу:
 

data/README.zh.md

@@ -324,8 +324,8 @@ Rack 堆栈中的下一个中间件。大多数情况下，返回值是一个字
 
 你可以返回任何对象，该对象要么是一个合理的 Rack 响应，要么是一个 Rack body 对象，要么是 HTTP 状态码：
 
-* 一个包含三个元素的数组: `[状态 (Fixnum), 响应首部 (Hash), 响应主体 (可以响应 #each 方法)]`
-* 一个包含两个元素的数组: `[状态 (Fixnum), 响应主体 (可以响应 #each 方法)]`
+* 一个包含三个元素的数组: `[状态 (Integer), 响应首部 (Hash), 响应主体 (可以响应 #each 方法)]`
+* 一个包含两个元素的数组: `[状态 (Integer), 响应主体 (可以响应 #each 方法)]`
 * 一个响应 `#each` 方法，只传回字符串的对象
 * 一个代表状态码的数字
 

data/VERSION

@@ -1 +1 @@
-2.0.4
+2.0.5

data/lib/sinatra/base.rb

@@ -1089,7 +1089,7 @@ module Sinatra
 
     # Dispatch a request with error handling.
     def dispatch!
-      force_encoding(@params.merge!(@request.params))
+      @params.merge!(@request.params).each { |key, val| @params[key] = force_encoding(val.dup) }
 
       invoke do
         static! if settings.static? && (request.get? || request.head?)

data/lib/sinatra/indifferent_hash.rb

@@ -1,22 +1,11 @@
 # frozen_string_literal: true
-if !$LOAD_PATH.grep(%r{gems/activesupport}).empty? && $LOADED_FEATURES.grep(%r{active_support/core_ext/hash}).empty?
-  puts <<-EOF
+$stderr.puts <<EOF if !Hash.method_defined?(:slice) && !$LOAD_PATH.grep(%r{gems/activesupport}).empty? && ENV['SINATRA_ACTIVESUPPORT_WARNING'] != 'false'
 WARNING: If you plan to load any of ActiveSupport's core extensions to Hash, be
 sure to do so *before* loading Sinatra::Application or Sinatra::Base. If not,
 you may disregard this warning.
-  EOF
-end
 
-if ENV['APP_ENV'] == 'test' && !Hash.method_defined?(:slice)
-  # Some extensions get loaded during testing (e.g. by RABL and our RABL test)
-  # that we have no control over, but we need it to load *before*
-  # IndifferentHash, so we'll do it preemptively here.
-  #
-  # Newer Rubies have these methods built-in, so the extensions are no-ops.
-  require 'active_support/core_ext/hash/conversions'
-  require 'active_support/core_ext/hash/slice'
-  require 'active_support/core_ext/hash/keys'
-end
+Set SINATRA_ACTIVESUPPORT_WARNING=false in the environment to hide this warning.
+EOF
 
 module Sinatra
   # A poor man's ActiveSupport::HashWithIndifferentAccess, with all the Rails-y

data/lib/sinatra/version.rb

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Blake Mizerany
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-15 00:00:00.000000000 Z
+date: 2018-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +81,7 @@ extra_rdoc_files:
 - README.hu.md
 - README.ja.md
 - README.ko.md
+- README.malayalam.md
 - README.md
 - README.pt-br.md
 - README.pt-pt.md
@@ -101,6 +102,7 @@ files:
 - README.hu.md
 - README.ja.md
 - README.ko.md
+- README.malayalam.md
 - README.md
 - README.pt-br.md
 - README.pt-pt.md
@@ -154,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Classy web-development dressed in a DSL