RubyGems - sinatra - Versions diffs - 1.4.5 → 1.4.6 - Mend

sinatra 1.4.5 → 1.4.6

Potentially problematic release.

This version of sinatra might be problematic. Click here for more details.

Files changed (69) hide show

checksums.yaml +4 -4
data/AUTHORS.md +77 -0
data/CHANGES +30 -0
data/Gemfile +5 -5
data/README.de.md +186 -56
data/README.es.md +76 -76
data/README.fr.md +120 -56
data/README.hu.md +19 -19
data/README.ja.md +44 -46
data/README.ko.md +163 -67
data/README.md +151 -127
data/README.pt-br.md +905 -144
data/README.pt-pt.md +17 -17
data/README.ru.md +88 -52
data/README.zh.md +76 -68
data/lib/sinatra.rb +0 -1
data/lib/sinatra/base.rb +21 -15
data/lib/sinatra/show_exceptions.rb +10 -4
data/lib/sinatra/version.rb +1 -1
data/sinatra.gemspec +1 -1
data/test/asciidoctor_test.rb +2 -2
data/test/base_test.rb +1 -5
data/test/builder_test.rb +2 -2
data/test/coffee_test.rb +8 -2
data/test/compile_test.rb +1 -1
data/test/contest.rb +3 -12
data/test/creole_test.rb +2 -2
data/test/delegator_test.rb +1 -1
data/test/encoding_test.rb +1 -1
data/test/erb_test.rb +1 -1
data/test/extensions_test.rb +1 -1
data/test/filter_test.rb +2 -2
data/test/haml_test.rb +2 -2
data/test/helper.rb +8 -7
data/test/helpers_test.rb +6 -6
data/test/integration_test.rb +3 -3
data/test/less_test.rb +2 -2
data/test/liquid_test.rb +3 -3
data/test/mapped_error_test.rb +5 -5
data/test/markaby_test.rb +2 -2
data/test/markdown_test.rb +6 -3
data/test/mediawiki_test.rb +2 -2
data/test/middleware_test.rb +1 -1
data/test/nokogiri_test.rb +2 -2
data/test/rabl_test.rb +2 -2
data/test/rack_test.rb +1 -1
data/test/radius_test.rb +2 -2
data/test/rdoc_test.rb +4 -4
data/test/readme_test.rb +1 -1
data/test/request_test.rb +4 -1
data/test/response_test.rb +1 -1
data/test/result_test.rb +2 -2
data/test/route_added_hook_test.rb +1 -1
data/test/routing_test.rb +7 -7
data/test/sass_test.rb +3 -3
data/test/scss_test.rb +2 -2
data/test/server_test.rb +10 -2
data/test/settings_test.rb +4 -4
data/test/sinatra_test.rb +1 -1
data/test/slim_test.rb +2 -2
data/test/static_test.rb +2 -2
data/test/streaming_test.rb +2 -2
data/test/stylus_test.rb +2 -2
data/test/templates_test.rb +3 -3
data/test/textile_test.rb +2 -2
data/test/wlang_test.rb +1 -1
data/test/yajl_test.rb +2 -2
metadata +10 -11
data/AUTHORS +0 -61

@@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
 begin
 require 'sass'
-class ScssTest < Test::Unit::TestCase
+class ScssTest < Minitest::Test
   def scss_app(options = {}, &block)
     mock_app do
       set :views, File.dirname(__FILE__) + '/views'
@@ -56,7 +56,7 @@ class ScssTest < Test::Unit::TestCase
   it "raises error if template not found" do
     mock_app { get('/') { scss(:no_such_template) } }
-    assert_raise(Errno::ENOENT) { get('/') }
+    assert_raises(Errno::ENOENT) { get('/') }
   end
   it "passes scss options to the scss engine" do

data/test/server_test.rb CHANGED

@@ -3,7 +3,15 @@ require 'stringio'
 module Rack::Handler
   class Mock
-    extend Test::Unit::Assertions
+    extend Minitest::Assertions
+    # Allow assertions in request context
+    def self.assertions
+      @assertions ||= 0
+    end
+    def self.assertions= assertions
+      @assertions = assertions
+    end
     def self.run(app, options={})
       assert(app < Sinatra::Base)
@@ -19,7 +27,7 @@ module Rack::Handler
   register 'mock', 'Rack::Handler::Mock'
 end
-class ServerTest < Test::Unit::TestCase
+class ServerTest < Minitest::Test
   setup do
     mock_app do
       set :server, 'mock'

data/test/settings_test.rb CHANGED

@@ -1,6 +1,6 @@
 require File.expand_path('../helper', __FILE__)
-class SettingsTest < Test::Unit::TestCase
+class SettingsTest < Minitest::Test
   setup do
     @base = Sinatra.new(Sinatra::Base)
     @base.set :environment => :foo, :app_file => nil
@@ -28,14 +28,14 @@ class SettingsTest < Test::Unit::TestCase
   end
   it 'raises an error with a value and a block' do
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       @base.set(:fiz, 'boom!'){ 'baz' }
     end
     assert !@base.respond_to?(:fiz)
   end
   it 'raises an error without value and block' do
-    assert_raise(ArgumentError) { @base.set(:fiz) }
+    assert_raises(ArgumentError) { @base.set(:fiz) }
     assert !@base.respond_to?(:fiz)
   end
@@ -46,7 +46,7 @@ class SettingsTest < Test::Unit::TestCase
   end
   it 'raises an error with the app class as value and a block' do
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       @base.set(:fiz, @base) { 'baz' }
     end
     assert !@base.respond_to?(:fiz)

data/test/sinatra_test.rb CHANGED

@@ -1,6 +1,6 @@
 require File.expand_path('../helper', __FILE__)
-class SinatraTest < Test::Unit::TestCase
+class SinatraTest < Minitest::Test
   it 'creates a new Sinatra::Base subclass on new' do
     app = Sinatra.new { get('/') { 'Hello World' } }
     assert_same Sinatra::Base, app.superclass

data/test/slim_test.rb CHANGED

@@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
 begin
 require 'slim'
-class SlimTest < Test::Unit::TestCase
+class SlimTest < Minitest::Test
   def slim_app(&block)
     mock_app do
       set :views, File.dirname(__FILE__) + '/views'
@@ -42,7 +42,7 @@ class SlimTest < Test::Unit::TestCase
   it "raises error if template not found" do
     mock_app { get('/') { slim(:no_such_template) } }
-    assert_raise(Errno::ENOENT) { get('/') }
+    assert_raises(Errno::ENOENT) { get('/') }
   end
   HTML4_DOCTYPE = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">"

data/test/static_test.rb CHANGED

@@ -1,6 +1,6 @@
 require File.expand_path('../helper', __FILE__)
-class StaticTest < Test::Unit::TestCase
+class StaticTest < Minitest::Test
   setup do
     mock_app do
       set :static, true
@@ -233,4 +233,4 @@ class StaticTest < Test::Unit::TestCase
     assert response.headers.include?('Last-Modified')
   end
-end
+end

data/test/streaming_test.rb CHANGED

@@ -1,6 +1,6 @@
 require File.expand_path('../helper', __FILE__)
-class StreamingTest < Test::Unit::TestCase
+class StreamingTest < Minitest::Test
   Stream = Sinatra::Helpers::Stream
   it 'returns the concatenated body' do
@@ -105,7 +105,7 @@ class StreamingTest < Test::Unit::TestCase
     scheduler = MockScheduler.new
     Stream.new(scheduler) { fail 'should be caught' }.each { }
     scheduler.defer!
-    assert_raise(RuntimeError) { scheduler.schedule! }
+    assert_raises(RuntimeError) { scheduler.schedule! }
   end
   it 'does not trigger an infinite loop if you call close in a callback' do

data/test/stylus_test.rb CHANGED

@@ -10,7 +10,7 @@ begin
     raise LoadError, 'unable to find Stylus compiler'
   end
-  class StylusTest < Test::Unit::TestCase
+  class StylusTest < Minitest::Test
     def stylus_app(options = {}, &block)
       mock_app do
         set :views, File.dirname(__FILE__) + '/views'
@@ -65,7 +65,7 @@ begin
       mock_app {
         get('/') { stylus :no_such_template }
       }
-      assert_raise(Errno::ENOENT) { get('/') }
+      assert_raises(Errno::ENOENT) { get('/') }
     end
     it "passes stylus options to the stylus engine" do

data/test/templates_test.rb CHANGED

@@ -14,7 +14,7 @@ class TestTemplate < Tilt::Template
   Tilt.register 'test', self
 end
-class TemplatesTest < Test::Unit::TestCase
+class TemplatesTest < Minitest::Test
   def render_app(base=Sinatra::Base, options = {}, &block)
     base, options = Sinatra::Base, base if base.is_a? Hash
     mock_app(base) do
@@ -120,7 +120,7 @@ class TemplatesTest < Test::Unit::TestCase
     end
   end
-  it 'uses the default layout template if not really overriden' do
+  it 'uses the default layout template if not really overridden' do
     with_default_layout do
       render_app { render(:test, :hello, :layout => true) }
       assert ok?
@@ -197,7 +197,7 @@ class TemplatesTest < Test::Unit::TestCase
   end
   test 'inline_templates ignores IO errors' do
-    assert_nothing_raised { mock_app { set(:inline_templates, '/foo/bar') } }
+    mock_app { set(:inline_templates, '/foo/bar') }
     assert @app.templates.empty?
   end

data/test/textile_test.rb CHANGED

@@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
 begin
 require 'redcloth'
-class TextileTest < Test::Unit::TestCase
+class TextileTest < Minitest::Test
   def textile_app(&block)
     mock_app do
       set :views, File.dirname(__FILE__) + '/views'
@@ -26,7 +26,7 @@ class TextileTest < Test::Unit::TestCase
   it "raises error if template not found" do
     mock_app { get('/') { textile(:no_such_template) } }
-    assert_raise(Errno::ENOENT) { get('/') }
+    assert_raises(Errno::ENOENT) { get('/') }
   end
   it "renders with inline layouts" do

data/test/wlang_test.rb CHANGED

@@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
 begin
 require 'wlang'
-class WLangTest < Test::Unit::TestCase
+class WLangTest < Minitest::Test
   def engine
     Tilt::WLangTemplate
   end

data/test/yajl_test.rb CHANGED

@@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
 begin
 require 'yajl'
-class YajlTest < Test::Unit::TestCase
+class YajlTest < Minitest::Test
   def yajl_app(&block)
     mock_app do
       set :views, File.dirname(__FILE__) + '/views'
@@ -26,7 +26,7 @@ class YajlTest < Test::Unit::TestCase
   it 'raises error if template not found' do
     mock_app { get('/') { yajl(:no_such_template) } }
-    assert_raise(Errno::ENOENT) { get('/') }
+    assert_raises(Errno::ENOENT) { get('/') }
   end
   it 'accepts a :locals option' do

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
 platform: ruby
 authors:
 - Blake Mizerany
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -31,22 +31,22 @@ dependencies:
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ extra_rdoc_files:
 - LICENSE
 files:
 - ".yardopts"
-- AUTHORS
+- AUTHORS.md
 - CHANGES
 - Gemfile
 - LICENSE
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: Classy web-development dressed in a DSL
@@ -283,4 +283,3 @@ test_files:
 - test/textile_test.rb
 - test/wlang_test.rb
 - test/yajl_test.rb
-has_rdoc:

data/AUTHORS DELETED

@@ -1,61 +0,0 @@
-Sinatra was designed and developed by Blake Mizerany (bmizerany) in
-California.
-Sinatra would not have been possible without strong company backing.
-In the past, financial and emotional support have been provided mainly by
-[Heroku](http://heroku.com), [GitHub](http://github.com) and
-[Engine Yard](http://www.engineyard.com/), and is now taken care of by
-[Travis CI](http://travis-ci.com/).
-Special thanks to the following extraordinary individuals, who-out which
-Sinatra would not be possible:
-* Ryan Tomayko (rtomayko) for constantly fixing whitespace errors 60d5006
-* Ezra Zygmuntowicz (ezmobius) for initial help and letting Blake steal
-  some of merbs internal code.
-* Ari Lerner (http://xnot.org/) for his evangelism, spirit, and gumption
-  that got Sinatra recognized from Day 1.
-* Christopher Schneid (cschneid) for The Book, the blog (gittr.com),
-  irclogger.com, and a bunch of useful patches.
-* Markus Prinz (cypher) for patches over the years, caring about
-  the README, and hanging in there when times were rough.
-* Simon Rozet (sr) for a ton of doc patches, HAML options, and all that
-  advocacy stuff he's going to do for 1.0.
-* Erik Kastner (kastner) for fixing `MIME_TYPES` under Rack 0.5.
-* Ben Bleything (bleything) for caring about HTTP status codes and doc fixes.
-* Igal Koshevoy (igal) for root path detection under Thin/Passenger.
-* Jon Crosby (jcrosby) for coffee breaks, doc fixes, and just because, man.
-* Karel Minarik (karmi) for screaming until the website came back up.
-* Jeremy Evans (jeremyevans) for unbreaking optional path params (twice!)
-* The GitHub guys for stealing Blake's table.
-* Nickolas Means (nmeans) for Sass template support.
-* Victor Hugo Borja (vic) for splat'n routes specs and doco.
-* Avdi Grimm (avdi) for basic RSpec support.
-* Jack Danger Canty for a more accurate root directory and for making me
-  watch [this](http://www.youtube.com/watch?v=ueaHLHgskkw) just now.
-* Mathew Walker for making escaped paths work with static files.
-* Millions of Us for having the problem that led to Sinatra's conception.
-* Songbird for the problems that helped Sinatra's future become realized.
-* Rick Olson (technoweenie) for the killer plug at RailsConf '08.
-* Steven Garcia for the amazing custom artwork you see on 404's and 500's
-* Pat Nakajima (nakajima) for fixing non-nested params in nested params Hash's.
-* Konstantin Haase for his hard work and ongoing commitment to improving
-  Sinatra, for 1.1.0, 1.2.0 and beyond..
-* Zachary Scott for adding Konstantin to the AUTHORS file. He also did help
-  writing the book, but mainly for adding Konstantin.
-* Gabriel Andretta for having people wonder whether our documentation is
-  actually in English or in Spanish.
-* Vasily Polovnyov, Nickolay Schwarz, Luciano Sousa, Wu Jiang, Mickael Riga,
-  Bernhard Essl, Janos Hardi, Kouhei Yanagita and "burningTyger" for willingly
-  translating whatever ends up in the README.
-* [Wordy](http://www.wordy.com/) for proofreading our README. 73e137d
-* cactus for digging through code and specs, multiple times.
-* Nicolás Sanguinetti (foca) for strong demand of karma and shaping
-  helpers/register.
-and last but not least:
-* Frank Sinatra (chairman of the board) for having so much class he
-  deserves a web-framework named after him.
-For a complete list of all contributors to Sinatra itself, run `rake authors`.