sinatra 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c058fb61ccbbdfec994df6e2c9f974a86f7a37e
-  data.tar.gz: e0064574ee40beab396f08d5800e758febdf5930
+  metadata.gz: 49eaa57b3d06c8eb819329b3c57cd6401c5da1c2
+  data.tar.gz: d30fe1da78dade1d0b6c961feeef2dc1ef61e268
 SHA512:
-  metadata.gz: 1a2805b30e9d10a026efa8ba6e6ca237eb5820ccc269d15771ccc5f9403bc300f3d7bb7eb3a89f867ab4eb68194c6df9e2b60d6fa229fec24a8d260e0d7f98cf
-  data.tar.gz: a78ea1f840c1087ed181df74a59763e189a5e973fdbfb0d47390fae66abd9a50704ec1a690ea7e6f97a436e32fd1cfe750cc64f651273c46e709b454a6de54e5
+  metadata.gz: 961cb8068ba88aeb8c6a5d801512ddf5c22e71f293545d11fc8514794a1928acbdf8d3ad03d79c4b6281b3999c11bedcc61ea6a95157add919b8a620c57904e0
+  data.tar.gz: 7a525a8d3fd006f267bd28cafad4aadd1c713acb8ab2c508ca2ceecb8bef3e6863fb9f70e68270027d3df1375dccb16e525ec382ce071c68fe997edd18eb53ba

data/Gemfile

@@ -10,59 +10,62 @@ RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
 source 'https://rubygems.org' unless ENV['QUICK']
 gemspec
 
-gem 'rake'
+gem 'rake', '~> 10.0'
 gem 'rack-test', '>= 0.6.2'
 gem "minitest", "~> 5.0"
 
-# Allows stuff like `tilt=1.2.2 bundle install` or `tilt=master ...`.
-# Used by the CI.
-repos  = {'tilt' => "rtomayko/tilt", 'rack' => "rack/rack"}
-
-%w[tilt rack].each do |lib|
-  dep = case ENV[lib]
-        when 'stable', nil then nil
-        when /(\d+\.)+\d+/ then "~> " + ENV[lib].sub("#{lib}-", '')
-        else {:github => repos[lib], :branch => dep}
-        end
-  gem lib, dep
-end
-
 if RUBY_ENGINE == 'jruby'
   gem 'nokogiri', '!= 1.5.0'
   gem 'jruby-openssl'
   gem 'trinidad'
 end
 
-if RUBY_ENGINE == "ruby" and RUBY_VERSION > '1.9.2'
-  gem 'less', '~> 2.0'
-  gem 'therubyracer'
-  gem 'redcarpet'
-  gem 'wlang', '>= 2.0.1'
-  gem 'bluecloth'
-  gem 'rdiscount'
-  gem 'RedCloth'
-  gem 'puma'
-  gem 'net-http-server'
-  gem 'yajl-ruby'
-  gem 'nokogiri'
-  gem 'thin'
-  gem 'slim', '~> 2.0'
-  gem 'coffee-script', '>= 2.0'
-  gem 'rdoc'
-  gem 'kramdown'
-  gem 'maruku'
-  gem 'creole'
-  gem 'wikicloth'
-  gem 'markaby'
-  gem 'radius'
-  gem 'asciidoctor'
-  gem 'liquid'
-  gem 'stylus'
-  gem 'rabl'
-  gem 'builder'
-  gem 'erubis'
-  gem 'haml', '>= 3.0'
-  gem 'sass'
+if RUBY_VERSION < '1.9.3'
+  gem 'activesupport', '~> 3.2'
+  gem 'i18n', '~> 0.6.0'
+else
+  gem 'activesupport', '~> 4.2'
+end
+
+if RUBY_ENGINE == "ruby"
+  if RUBY_VERSION > '1.9.2'
+    gem 'less', '~> 2.0'
+    gem 'therubyracer'
+    gem 'redcarpet'
+    gem 'wlang', '>= 2.0.1'
+    gem 'bluecloth'
+    gem 'rdiscount'
+    gem 'RedCloth'
+    gem 'puma'
+    gem 'net-http-server'
+    gem 'yajl-ruby'
+    gem 'thin'
+    gem 'slim', '~> 2.0'
+    gem 'coffee-script', '>= 2.0'
+    gem 'rdoc'
+    gem 'kramdown'
+    gem 'maruku'
+    gem 'creole'
+    gem 'wikicloth'
+    gem 'markaby'
+    gem 'radius'
+    gem 'asciidoctor'
+    gem 'liquid', '~> 3.0'
+    gem 'stylus'
+    gem 'rabl'
+    gem 'builder'
+    gem 'erubis'
+    gem 'haml', '>= 3.0'
+    gem 'sass'
+    
+    if RUBY_VERSION < '2.1.0'
+      gem 'nokogiri', '~> 1.6.8'
+    else
+      gem 'nokogiri', '~> 1.7.0'
+    end
+  else
+    gem 'nokogiri', '~> 1.5.11'
+  end
 end
 
 if RUBY_ENGINE == "rbx"
@@ -72,5 +75,5 @@ if RUBY_ENGINE == "rbx"
 end
 
 platforms :ruby_18, :jruby do
-  gem 'json' unless RUBY_VERSION > '1.9' # is there a jruby but 1.8 only selector?
+  gem 'json', '~> 1.8' unless RUBY_VERSION > '1.9' # is there a jruby but 1.8 only selector?
 end

data/lib/sinatra/base.rb

@@ -1065,8 +1065,8 @@ module Sinatra
     # Run the block with 'throw :halt' support and apply result to the response.
     def invoke
       res = catch(:halt) { yield }
-      res = [res] if Fixnum === res or String === res
-      if Array === res and Fixnum === res.first
+      res = [res] if Integer === res or String === res
+      if Array === res and Integer === res.first
         res = res.dup
         status(res.shift)
         body(res.pop)
@@ -1223,7 +1223,7 @@ module Sinatra
         case value
         when Proc
           getter = value
-        when Symbol, Fixnum, FalseClass, TrueClass, NilClass
+        when Symbol, Integer, FalseClass, TrueClass, NilClass
           getter = value.inspect
         when Hash
           setter = proc do |val|

data/lib/sinatra/version.rb

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '1.4.7'
+  VERSION = '1.4.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors:
 - Blake Mizerany
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-24 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Classy web-development dressed in a DSL