sinatra 1.2.9 → 1.3.0.a

data/test/routing_test.rb

@@ -23,7 +23,7 @@ class RegexpLookAlike
 end
 
 class RoutingTest < Test::Unit::TestCase
-  %w[get put post delete options].each do |verb|
+  %w[get put post delete options patch].each do |verb|
     it "defines #{verb.upcase} request handlers with #{verb}" do
       mock_app {
         send verb, '/hello' do
@@ -93,28 +93,12 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal "<h1>Not Found</h1>", response.body
   end
 
-  it 'matches empty PATH_INFO to "/" if no route is defined for ""' do
-    mock_app do
-      get '/' do
-        'worked'
-      end
-    end
-
-    get '/', {}, "PATH_INFO" => ""
-    assert ok?
-    assert_equal 'worked', body
-  end
-
-  it 'matches empty PATH_INFO to "" if a route is defined for ""' do
-    mock_app do
+  it 'matches empty PATH_INFO to "/"' do
+    mock_app {
       get '/' do
-        'did not work'
-      end
-
-      get '' do
         'worked'
       end
-    end
+    }
 
     get '/', {}, "PATH_INFO" => ""
     assert ok?
@@ -227,12 +211,6 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal "format=", body
   end
 
-  it 'does not concatinate params with the same name' do
-    mock_app { get('/:foo') { params[:foo] } }
-    get '/a?foo=b'
-    assert_body 'a'
-  end
-
   it "supports single splat params like /*" do
     mock_app {
       get '/*' do
@@ -692,10 +670,10 @@ class RoutingTest < Test::Unit::TestCase
   it "filters by accept header" do
     mock_app {
       get '/', :provides => :xml do
-        env['HTTP_ACCEPT']
+        request.env['HTTP_ACCEPT']
       end
       get '/foo', :provides => :html do
-        env['HTTP_ACCEPT']
+        request.env['HTTP_ACCEPT']
       end
     }
 
@@ -720,7 +698,7 @@ class RoutingTest < Test::Unit::TestCase
 
     mock_app {
       get '/', :provides => types do
-        env['HTTP_ACCEPT']
+        request.env['HTTP_ACCEPT']
       end
     }
 
@@ -735,7 +713,7 @@ class RoutingTest < Test::Unit::TestCase
   it 'degrades gracefully when optional accept header is not provided' do
     mock_app {
       get '/', :provides => :xml do
-        env['HTTP_ACCEPT']
+        request.env['HTTP_ACCEPT']
       end
       get '/' do
         'default'
@@ -746,77 +724,6 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal 'default', body
   end
 
-  it 'respects user agent prefferences for the content type' do
-    mock_app { get('/', :provides => [:png, :html]) { content_type }}
-    get '/', {}, { 'HTTP_ACCEPT' => 'image/png;q=0.5,text/html;q=0.8' }
-    assert_body 'text/html;charset=utf-8'
-    get '/', {}, { 'HTTP_ACCEPT' => 'image/png;q=0.8,text/html;q=0.5' }
-    assert_body 'image/png'
-  end
-
-  it 'accepts generic types' do
-    mock_app do
-      get('/', :provides => :xml) { content_type }
-      get('/') { 'no match' }
-    end
-    get '/'
-    assert_body 'no match'
-    get '/', {}, { 'HTTP_ACCEPT' => 'foo/*' }
-    assert_body 'no match'
-    get '/', {}, { 'HTTP_ACCEPT' => 'application/*' }
-    assert_body 'application/xml;charset=utf-8'
-    get '/', {}, { 'HTTP_ACCEPT' => '*/*' }
-    assert_body 'application/xml;charset=utf-8'
-  end
-
-  it 'prefers concrete over partly generic types' do
-    mock_app { get('/', :provides => [:png, :html]) { content_type }}
-    get '/', {}, { 'HTTP_ACCEPT' => 'image/*, text/html' }
-    assert_body 'text/html;charset=utf-8'
-    get '/', {}, { 'HTTP_ACCEPT' => 'image/png, text/*' }
-    assert_body 'image/png'
-  end
-
-  it 'prefers concrete over fully generic types' do
-    mock_app { get('/', :provides => [:png, :html]) { content_type }}
-    get '/', {}, { 'HTTP_ACCEPT' => '*/*, text/html' }
-    assert_body 'text/html;charset=utf-8'
-    get '/', {}, { 'HTTP_ACCEPT' => 'image/png, */*' }
-    assert_body 'image/png'
-  end
-
-  it 'prefers partly generic over fully generic types' do
-    mock_app { get('/', :provides => [:png, :html]) { content_type }}
-    get '/', {}, { 'HTTP_ACCEPT' => '*/*, text/*' }
-    assert_body 'text/html;charset=utf-8'
-    get '/', {}, { 'HTTP_ACCEPT' => 'image/*, */*' }
-    assert_body 'image/png'
-  end
-
-  it 'respects quality with generic types' do
-    mock_app { get('/', :provides => [:png, :html]) { content_type }}
-    get '/', {}, { 'HTTP_ACCEPT' => 'image/*;q=1, text/html;q=0' }
-    assert_body 'image/png'
-    get '/', {}, { 'HTTP_ACCEPT' => 'image/png;q=0.5, text/*;q=0.7' }
-    assert_body 'text/html;charset=utf-8'
-  end
-
-  it 'accepts both text/javascript and application/javascript for js' do
-    mock_app { get('/', :provides => :js) { content_type }}
-    get '/', {}, { 'HTTP_ACCEPT' => 'application/javascript' }
-    assert_body 'application/javascript;charset=utf-8'
-    get '/', {}, { 'HTTP_ACCEPT' => 'text/javascript' }
-    assert_body 'text/javascript;charset=utf-8'
-  end
-
-  it 'accepts both text/xml and application/xml for xml' do
-    mock_app { get('/', :provides => :xml) { content_type }}
-    get '/', {}, { 'HTTP_ACCEPT' => 'application/xml' }
-    assert_body 'application/xml;charset=utf-8'
-    get '/', {}, { 'HTTP_ACCEPT' => 'text/xml' }
-    assert_body 'text/xml;charset=utf-8'
-  end
-
   it 'passes a single url param as block parameters when one param is specified' do
     mock_app {
       get '/:foo' do |foo|
@@ -1048,35 +955,4 @@ class RoutingTest < Test::Unit::TestCase
     get '/foo'
     assert not_found?
   end
-
-  it 'allows using call to fire another request internally' do
-    mock_app do
-      get '/foo' do
-        status, headers, body = call env.merge("PATH_INFO" => '/bar')
-        [status, headers, body.map { |e| e.upcase }]
-      end
-
-      get '/bar' do
-        "bar"
-      end
-    end
-
-    get '/foo'
-    assert ok?
-    assert_body "BAR"
-  end
-
-  it 'plays well with other routing middleware' do
-    middleware = Sinatra.new
-    inner_app  = Sinatra.new { get('/foo') { 'hello' } }
-    builder    = Rack::Builder.new do
-      use middleware
-      map('/test') { run inner_app }
-    end
-
-    @app = builder.to_app
-    get '/test/foo'
-    assert ok?
-    assert_body 'hello'
-  end
 end

data/test/server_test.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/helper'
-require 'stringio'
 
 module Rack::Handler
   class Mock
@@ -26,11 +25,11 @@ class ServerTest < Test::Unit::TestCase
       set :bind, 'foo.local'
       set :port, 9001
     }
-    $stderr = StringIO.new
+    $stdout = File.open('/dev/null', 'wb')
   end
 
   def teardown
-    $stderr = STDERR
+    $stdout = STDOUT
   end
 
   it "locates the appropriate Rack handler and calls ::run" do

data/test/settings_test.rb

@@ -34,24 +34,6 @@ class SettingsTest < Test::Unit::TestCase
     assert !@base.respond_to?(:fiz)
   end
 
-  it 'raises an error without value and block' do
-    assert_raise(ArgumentError) { @base.set(:fiz) }
-    assert !@base.respond_to?(:fiz)
-  end
-
-  it 'allows setting a value to the app class' do
-    @base.set :base, @base
-    assert @base.respond_to?(:base)
-    assert_equal @base, @base.base
-  end
-
-  it 'raises an error with the app class as value and a block' do
-    assert_raise ArgumentError do
-      @base.set(:fiz, @base) { 'baz' }
-    end
-    assert !@base.respond_to?(:fiz)
-  end
-
   it "sets multiple settings with a Hash" do
     @base.set :foo => 1234,
         :bar => 'Hello World',
@@ -334,14 +316,6 @@ class SettingsTest < Test::Unit::TestCase
       @application.set :root, File.dirname(__FILE__)
       assert @application.static?
     end
-
-    it 'is possible to use Module#public' do
-      @base.send(:define_method, :foo) { }
-      @base.send(:private, :foo)
-      assert !@base.method_defined?(:foo)
-      @base.send(:public, :foo)
-      assert @base.method_defined?(:foo)
-    end
   end
 
   describe 'bind' do

data/test/slim_test.rb

@@ -52,34 +52,44 @@ class SlimTest < Test::Unit::TestCase
   HTML4_DOCTYPE = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">"
   
   it "passes slim options to the slim engine" do
-    mock_app { get('/') { slim "x foo='bar'", :attr_wrapper => "'" }}
+    mock_app {
+      get '/' do
+        slim "! doctype html\nh1 Hello World", :format => :html4
+      end
+    }
     get '/'
     assert ok?
-    assert_body "<x foo='bar'></x>"
+    assert_equal "#{HTML4_DOCTYPE}<h1>Hello World</h1>", body
   end
   
   it "passes default slim options to the slim engine" do
-    mock_app do
-      set :slim, :attr_wrapper => "'"
-      get('/') { slim "x foo='bar'" }
-    end
+    mock_app {
+      set :slim, {:format => :html4}
+      get '/' do
+        slim "! doctype html\nh1 Hello World"
+      end
+    }
     get '/'
     assert ok?
-    assert_body "<x foo='bar'></x>"
+    assert_equal "#{HTML4_DOCTYPE}<h1>Hello World</h1>", body
   end
   
   it "merges the default slim options with the overrides and passes them to the slim engine" do
-    mock_app do
-      set :slim, :attr_wrapper => "'"
-      get('/') { slim "x foo='bar'" }
-      get('/other') { slim "x foo='bar'", :attr_wrapper => '"' }
-    end
+    mock_app {
+      set :slim, {:format => :html4}
+      get '/' do
+        slim "! doctype html\nh1.header Hello World"
+      end
+      get '/html5' do
+        slim "! doctype html\nh1.header Hello World", :format => :html5
+      end
+    }
     get '/'
     assert ok?
-    assert_body "<x foo='bar'></x>"
-    get '/other'
+    assert_match(/^#{HTML4_DOCTYPE}/, body)
+    get '/html5'
     assert ok?
-    assert_body '<x foo="bar"></x>'
+    assert_equal "<!DOCTYPE html><h1 class=\"header\">Hello World</h1>", body
   end
 end
 

data/test/static_test.rb

@@ -36,6 +36,7 @@ class StaticTest < Test::Unit::TestCase
     head "/#{File.basename(__FILE__)}"
     assert ok?
     assert_equal '', body
+    assert_equal File.size(__FILE__).to_s, response['Content-Length']
     assert response.headers.include?('Last-Modified')
   end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 9
-  version: 1.2.9
+  prerelease: 6
+  version: 1.3.0.a
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -18,83 +13,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-15 00:00:00 +01:00
+date: 2011-03-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
-  version_requirements: *id001
-  name: rack
-  prerelease: false
+        version: "1.2"
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: tilt
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 2
-        - 2
         version: 1.2.2
     - - <
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
         version: "2.0"
-  version_requirements: *id002
-  name: tilt
-  prerelease: false
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
-  name: backports
+  name: shotgun
   prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
         version: "0.6"
-  version_requirements: *id004
-  name: shotgun
-  prerelease: false
   type: :development
+  version_requirements: *id003
 description: Classy web-development dressed in a DSL
 email: sinatrarb@googlegroups.com
 executables: []
@@ -131,6 +88,7 @@ files:
 - lib/sinatra/images/404.png
 - lib/sinatra/images/500.png
 - lib/sinatra/main.rb
+- lib/sinatra/rack.rb
 - lib/sinatra/showexceptions.rb
 - sinatra.gemspec
 - test/base_test.rb
@@ -155,7 +113,6 @@ files:
 - test/middleware_test.rb
 - test/nokogiri_test.rb
 - test/public/favicon.ico
-- test/rack_test.rb
 - test/radius_test.rb
 - test/rdoc_test.rb
 - test/request_test.rb
@@ -233,23 +190,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: sinatra
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 2
 summary: Classy web-development dressed in a DSL
@@ -272,7 +223,6 @@ test_files:
 - test/markdown_test.rb
 - test/middleware_test.rb
 - test/nokogiri_test.rb
-- test/rack_test.rb
 - test/radius_test.rb
 - test/rdoc_test.rb
 - test/request_test.rb