sinatra 1.4.8 → 2.1.0

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.

Files changed (133) hide show
  1. checksums.yaml +5 -5
  2. data/AUTHORS.md +1 -0
  3. data/CHANGELOG.md +272 -54
  4. data/CONTRIBUTING.md +8 -8
  5. data/Gemfile +48 -47
  6. data/LICENSE +4 -1
  7. data/MAINTENANCE.md +42 -0
  8. data/README.de.md +651 -443
  9. data/README.es.md +738 -357
  10. data/README.fr.md +197 -100
  11. data/README.hu.md +40 -6
  12. data/README.ja.md +125 -67
  13. data/README.ko.md +15 -15
  14. data/README.malayalam.md +3141 -0
  15. data/README.md +592 -432
  16. data/README.pt-br.md +2362 -335
  17. data/README.pt-pt.md +5 -5
  18. data/README.ru.md +857 -608
  19. data/README.zh.md +91 -29
  20. data/Rakefile +77 -51
  21. data/SECURITY.md +35 -0
  22. data/VERSION +1 -0
  23. data/examples/chat.rb +2 -1
  24. data/examples/rainbows.conf +3 -0
  25. data/examples/rainbows.rb +20 -0
  26. data/examples/stream.ru +4 -4
  27. data/lib/sinatra/base.rb +243 -265
  28. data/lib/sinatra/indifferent_hash.rb +200 -0
  29. data/lib/sinatra/main.rb +30 -10
  30. data/lib/sinatra/show_exceptions.rb +67 -62
  31. data/lib/sinatra/version.rb +1 -1
  32. data/sinatra.gemspec +44 -8
  33. metadata +43 -167
  34. data/lib/sinatra/ext.rb +0 -17
  35. data/test/asciidoctor_test.rb +0 -72
  36. data/test/base_test.rb +0 -167
  37. data/test/builder_test.rb +0 -91
  38. data/test/coffee_test.rb +0 -96
  39. data/test/compile_test.rb +0 -183
  40. data/test/contest.rb +0 -91
  41. data/test/creole_test.rb +0 -65
  42. data/test/delegator_test.rb +0 -160
  43. data/test/encoding_test.rb +0 -20
  44. data/test/erb_test.rb +0 -116
  45. data/test/extensions_test.rb +0 -98
  46. data/test/filter_test.rb +0 -487
  47. data/test/haml_test.rb +0 -109
  48. data/test/helper.rb +0 -132
  49. data/test/helpers_test.rb +0 -1917
  50. data/test/integration/app.rb +0 -79
  51. data/test/integration_helper.rb +0 -236
  52. data/test/integration_test.rb +0 -104
  53. data/test/less_test.rb +0 -69
  54. data/test/liquid_test.rb +0 -77
  55. data/test/mapped_error_test.rb +0 -285
  56. data/test/markaby_test.rb +0 -80
  57. data/test/markdown_test.rb +0 -85
  58. data/test/mediawiki_test.rb +0 -68
  59. data/test/middleware_test.rb +0 -68
  60. data/test/nokogiri_test.rb +0 -67
  61. data/test/public/favicon.ico +0 -0
  62. data/test/public/hello+world.txt +0 -1
  63. data/test/rabl_test.rb +0 -89
  64. data/test/rack_test.rb +0 -45
  65. data/test/radius_test.rb +0 -59
  66. data/test/rdoc_test.rb +0 -66
  67. data/test/readme_test.rb +0 -130
  68. data/test/request_test.rb +0 -100
  69. data/test/response_test.rb +0 -63
  70. data/test/result_test.rb +0 -76
  71. data/test/route_added_hook_test.rb +0 -59
  72. data/test/routing_test.rb +0 -1456
  73. data/test/sass_test.rb +0 -115
  74. data/test/scss_test.rb +0 -88
  75. data/test/server_test.rb +0 -56
  76. data/test/settings_test.rb +0 -582
  77. data/test/sinatra_test.rb +0 -12
  78. data/test/slim_test.rb +0 -102
  79. data/test/static_test.rb +0 -266
  80. data/test/streaming_test.rb +0 -149
  81. data/test/stylus_test.rb +0 -90
  82. data/test/templates_test.rb +0 -382
  83. data/test/textile_test.rb +0 -65
  84. data/test/views/a/in_a.str +0 -1
  85. data/test/views/ascii.erb +0 -2
  86. data/test/views/b/in_b.str +0 -1
  87. data/test/views/calc.html.erb +0 -1
  88. data/test/views/error.builder +0 -3
  89. data/test/views/error.erb +0 -3
  90. data/test/views/error.haml +0 -3
  91. data/test/views/error.sass +0 -2
  92. data/test/views/explicitly_nested.str +0 -1
  93. data/test/views/foo/hello.test +0 -1
  94. data/test/views/hello.asciidoc +0 -1
  95. data/test/views/hello.builder +0 -1
  96. data/test/views/hello.coffee +0 -1
  97. data/test/views/hello.creole +0 -1
  98. data/test/views/hello.erb +0 -1
  99. data/test/views/hello.haml +0 -1
  100. data/test/views/hello.less +0 -5
  101. data/test/views/hello.liquid +0 -1
  102. data/test/views/hello.mab +0 -1
  103. data/test/views/hello.md +0 -1
  104. data/test/views/hello.mediawiki +0 -1
  105. data/test/views/hello.nokogiri +0 -1
  106. data/test/views/hello.rabl +0 -2
  107. data/test/views/hello.radius +0 -1
  108. data/test/views/hello.rdoc +0 -1
  109. data/test/views/hello.sass +0 -2
  110. data/test/views/hello.scss +0 -3
  111. data/test/views/hello.slim +0 -1
  112. data/test/views/hello.str +0 -1
  113. data/test/views/hello.styl +0 -2
  114. data/test/views/hello.test +0 -1
  115. data/test/views/hello.textile +0 -1
  116. data/test/views/hello.wlang +0 -1
  117. data/test/views/hello.yajl +0 -1
  118. data/test/views/layout2.builder +0 -3
  119. data/test/views/layout2.erb +0 -2
  120. data/test/views/layout2.haml +0 -2
  121. data/test/views/layout2.liquid +0 -2
  122. data/test/views/layout2.mab +0 -2
  123. data/test/views/layout2.nokogiri +0 -3
  124. data/test/views/layout2.rabl +0 -3
  125. data/test/views/layout2.radius +0 -2
  126. data/test/views/layout2.slim +0 -3
  127. data/test/views/layout2.str +0 -2
  128. data/test/views/layout2.test +0 -1
  129. data/test/views/layout2.wlang +0 -2
  130. data/test/views/nested.str +0 -1
  131. data/test/views/utf8.erb +0 -2
  132. data/test/wlang_test.rb +0 -87
  133. data/test/yajl_test.rb +0 -86
data/Gemfile CHANGED
@@ -10,70 +10,71 @@ RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
10
10
  source 'https://rubygems.org' unless ENV['QUICK']
11
11
  gemspec
12
12
 
13
- gem 'rake', '~> 10.0'
13
+ gem 'rake'
14
+ gem 'rack', git: 'https://github.com/rack/rack.git'
14
15
  gem 'rack-test', '>= 0.6.2'
15
16
  gem "minitest", "~> 5.0"
17
+ gem 'yard'
18
+
19
+ gem "rack-protection", path: "rack-protection"
20
+ gem "sinatra-contrib", path: "sinatra-contrib"
21
+
22
+ gem "twitter-text", "1.14.7"
16
23
 
17
24
  if RUBY_ENGINE == 'jruby'
18
25
  gem 'nokogiri', '!= 1.5.0'
19
- gem 'jruby-openssl'
20
26
  gem 'trinidad'
21
27
  end
22
28
 
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'
29
+ if RUBY_ENGINE == 'jruby' || RUBY_ENGINE == 'ruby'
30
+ gem "activesupport", "~> 5.1.6"
28
31
  end
29
32
 
30
33
  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
34
+ gem 'less', '~> 2.0'
35
+ gem 'therubyracer'
36
+ gem 'redcarpet'
37
+ gem 'wlang', '>= 2.0.1'
38
+ gem 'bluecloth'
39
+ gem 'rdiscount'
40
+ gem 'RedCloth'
41
+ gem 'puma'
42
+ gem 'yajl-ruby'
43
+ gem 'nokogiri'
44
+ gem 'rainbows'
45
+ gem 'eventmachine'
46
+ gem 'slim', '~> 2.0'
47
+ gem 'coffee-script', '>= 2.0'
48
+ gem 'rdoc'
49
+ gem 'kramdown'
50
+ gem 'maruku'
51
+ gem 'creole'
52
+ gem 'wikicloth'
53
+ gem 'markaby'
54
+ gem 'radius'
55
+ gem 'asciidoctor'
56
+ gem 'liquid'
57
+ gem 'stylus'
58
+ gem 'rabl'
59
+ gem 'builder'
60
+ gem 'erubi'
61
+ gem 'erubis'
62
+ gem 'haml', '>= 3.0'
63
+ gem 'sass'
64
+ gem 'reel-rack'
65
+ gem 'celluloid', '~> 0.16.0'
66
+ gem 'commonmarker', '~> 0.20.0'
67
+ gem 'pandoc-ruby', '~> 2.0.2'
68
+ gem 'simplecov', require: false
69
69
  end
70
70
 
71
71
  if RUBY_ENGINE == "rbx"
72
72
  gem 'json'
73
73
  gem 'rubysl'
74
74
  gem 'rubysl-test-unit'
75
+ gem 'erubi'
75
76
  end
76
77
 
77
- platforms :ruby_18, :jruby do
78
- gem 'json', '~> 1.8' unless RUBY_VERSION > '1.9' # is there a jruby but 1.8 only selector?
78
+ platforms :jruby do
79
+ gem 'json'
79
80
  end
data/LICENSE CHANGED
@@ -1,5 +1,8 @@
1
+ The MIT License (MIT)
2
+
1
3
  Copyright (c) 2007, 2008, 2009 Blake Mizerany
2
- Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Konstantin Haase
4
+ Copyright (c) 2010-2017 Konstantin Haase
5
+ Copyright (c) 2015-2017 Zachary Scott
3
6
 
4
7
  Permission is hereby granted, free of charge, to any person
5
8
  obtaining a copy of this software and associated documentation
data/MAINTENANCE.md ADDED
@@ -0,0 +1,42 @@
1
+ # Sinatra maintenance
2
+
3
+ ## Versions
4
+
5
+ ### Unstable release
6
+
7
+ The next major version of Sinatra will be released from the master branch.
8
+
9
+ * Current proposed major release: 2.0.0
10
+
11
+ ### Stable release
12
+
13
+ The current stable version of Sinatra is 1.4 series, and released from the stable branch.
14
+
15
+ ## Issues
16
+
17
+ ### New features
18
+
19
+ New features will only be added to the master branch and will not be made available in point releases.
20
+
21
+ ### Bug fixes
22
+
23
+ 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.
24
+
25
+ * Current release series: 1.4.x
26
+
27
+ ### Security issues
28
+
29
+ The current release series will receive patches and new versions in case of a security issue.
30
+
31
+ * Current release series: 1.4.x
32
+
33
+ ### Severe security issues
34
+
35
+ 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.
36
+
37
+ * Current release series: 1.4.x
38
+ * Next most recent release series: 1.3.x
39
+
40
+ ### Unsupported Release Series
41
+
42
+ 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.