sinatra 1.4.7 → 1.4.8
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of sinatra might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/Gemfile +48 -45
- data/lib/sinatra/base.rb +3 -3
- data/lib/sinatra/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 49eaa57b3d06c8eb819329b3c57cd6401c5da1c2
|
4
|
+
data.tar.gz: d30fe1da78dade1d0b6c961feeef2dc1ef61e268
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 961cb8068ba88aeb8c6a5d801512ddf5c22e71f293545d11fc8514794a1928acbdf8d3ad03d79c4b6281b3999c11bedcc61ea6a95157add919b8a620c57904e0
|
7
|
+
data.tar.gz: 7a525a8d3fd006f267bd28cafad4aadd1c713acb8ab2c508ca2ceecb8bef3e6863fb9f70e68270027d3df1375dccb16e525ec382ce071c68fe997edd18eb53ba
|
data/Gemfile
CHANGED
@@ -10,59 +10,62 @@ RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
|
|
10
10
|
source 'https://rubygems.org' unless ENV['QUICK']
|
11
11
|
gemspec
|
12
12
|
|
13
|
-
gem 'rake'
|
13
|
+
gem 'rake', '~> 10.0'
|
14
14
|
gem 'rack-test', '>= 0.6.2'
|
15
15
|
gem "minitest", "~> 5.0"
|
16
16
|
|
17
|
-
# Allows stuff like `tilt=1.2.2 bundle install` or `tilt=master ...`.
|
18
|
-
# Used by the CI.
|
19
|
-
repos = {'tilt' => "rtomayko/tilt", 'rack' => "rack/rack"}
|
20
|
-
|
21
|
-
%w[tilt rack].each do |lib|
|
22
|
-
dep = case ENV[lib]
|
23
|
-
when 'stable', nil then nil
|
24
|
-
when /(\d+\.)+\d+/ then "~> " + ENV[lib].sub("#{lib}-", '')
|
25
|
-
else {:github => repos[lib], :branch => dep}
|
26
|
-
end
|
27
|
-
gem lib, dep
|
28
|
-
end
|
29
|
-
|
30
17
|
if RUBY_ENGINE == 'jruby'
|
31
18
|
gem 'nokogiri', '!= 1.5.0'
|
32
19
|
gem 'jruby-openssl'
|
33
20
|
gem 'trinidad'
|
34
21
|
end
|
35
22
|
|
36
|
-
if
|
37
|
-
gem '
|
38
|
-
gem '
|
39
|
-
|
40
|
-
gem '
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
23
|
+
if RUBY_VERSION < '1.9.3'
|
24
|
+
gem 'activesupport', '~> 3.2'
|
25
|
+
gem 'i18n', '~> 0.6.0'
|
26
|
+
else
|
27
|
+
gem 'activesupport', '~> 4.2'
|
28
|
+
end
|
29
|
+
|
30
|
+
if RUBY_ENGINE == "ruby"
|
31
|
+
if RUBY_VERSION > '1.9.2'
|
32
|
+
gem 'less', '~> 2.0'
|
33
|
+
gem 'therubyracer'
|
34
|
+
gem 'redcarpet'
|
35
|
+
gem 'wlang', '>= 2.0.1'
|
36
|
+
gem 'bluecloth'
|
37
|
+
gem 'rdiscount'
|
38
|
+
gem 'RedCloth'
|
39
|
+
gem 'puma'
|
40
|
+
gem 'net-http-server'
|
41
|
+
gem 'yajl-ruby'
|
42
|
+
gem 'thin'
|
43
|
+
gem 'slim', '~> 2.0'
|
44
|
+
gem 'coffee-script', '>= 2.0'
|
45
|
+
gem 'rdoc'
|
46
|
+
gem 'kramdown'
|
47
|
+
gem 'maruku'
|
48
|
+
gem 'creole'
|
49
|
+
gem 'wikicloth'
|
50
|
+
gem 'markaby'
|
51
|
+
gem 'radius'
|
52
|
+
gem 'asciidoctor'
|
53
|
+
gem 'liquid', '~> 3.0'
|
54
|
+
gem 'stylus'
|
55
|
+
gem 'rabl'
|
56
|
+
gem 'builder'
|
57
|
+
gem 'erubis'
|
58
|
+
gem 'haml', '>= 3.0'
|
59
|
+
gem 'sass'
|
60
|
+
|
61
|
+
if RUBY_VERSION < '2.1.0'
|
62
|
+
gem 'nokogiri', '~> 1.6.8'
|
63
|
+
else
|
64
|
+
gem 'nokogiri', '~> 1.7.0'
|
65
|
+
end
|
66
|
+
else
|
67
|
+
gem 'nokogiri', '~> 1.5.11'
|
68
|
+
end
|
66
69
|
end
|
67
70
|
|
68
71
|
if RUBY_ENGINE == "rbx"
|
@@ -72,5 +75,5 @@ if RUBY_ENGINE == "rbx"
|
|
72
75
|
end
|
73
76
|
|
74
77
|
platforms :ruby_18, :jruby do
|
75
|
-
gem 'json' unless RUBY_VERSION > '1.9' # is there a jruby but 1.8 only selector?
|
78
|
+
gem 'json', '~> 1.8' unless RUBY_VERSION > '1.9' # is there a jruby but 1.8 only selector?
|
76
79
|
end
|
data/lib/sinatra/base.rb
CHANGED
@@ -1065,8 +1065,8 @@ module Sinatra
|
|
1065
1065
|
# Run the block with 'throw :halt' support and apply result to the response.
|
1066
1066
|
def invoke
|
1067
1067
|
res = catch(:halt) { yield }
|
1068
|
-
res = [res] if
|
1069
|
-
if Array === res and
|
1068
|
+
res = [res] if Integer === res or String === res
|
1069
|
+
if Array === res and Integer === res.first
|
1070
1070
|
res = res.dup
|
1071
1071
|
status(res.shift)
|
1072
1072
|
body(res.pop)
|
@@ -1223,7 +1223,7 @@ module Sinatra
|
|
1223
1223
|
case value
|
1224
1224
|
when Proc
|
1225
1225
|
getter = value
|
1226
|
-
when Symbol,
|
1226
|
+
when Symbol, Integer, FalseClass, TrueClass, NilClass
|
1227
1227
|
getter = value.inspect
|
1228
1228
|
when Hash
|
1229
1229
|
setter = proc do |val|
|
data/lib/sinatra/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sinatra
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.4.
|
4
|
+
version: 1.4.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Blake Mizerany
|
@@ -11,7 +11,7 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date:
|
14
|
+
date: 2017-01-30 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: rack
|
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
236
236
|
version: '0'
|
237
237
|
requirements: []
|
238
238
|
rubyforge_project:
|
239
|
-
rubygems_version: 2.
|
239
|
+
rubygems_version: 2.6.8
|
240
240
|
signing_key:
|
241
241
|
specification_version: 4
|
242
242
|
summary: Classy web-development dressed in a DSL
|