sinatra 1.3.6 → 1.4.0.a

data/test/markaby_test.rb

@@ -7,7 +7,7 @@ class MarkabyTest < Test::Unit::TestCase
   def markaby_app(&block)
     mock_app do
       set :views, File.dirname(__FILE__) + '/views'
-      get '/', &block
+      get('/', &block)
     end
     get '/'
   end
@@ -55,7 +55,7 @@ class MarkabyTest < Test::Unit::TestCase
     assert_equal "<h1>THIS. IS. <em>SPARTA</em></h1>", body
   end
 
-  it 'renders inline markaby blocks with file layouts' do    
+  it 'renders inline markaby blocks with file layouts' do
     markaby_app { markaby(:layout => :layout2) { text "Hello World" } }
     assert ok?
     assert_equal "<h1>Markaby Layout!</h1><p>Hello World</p>", body
@@ -65,11 +65,11 @@ class MarkabyTest < Test::Unit::TestCase
     mock_app { get('/') { markaby :no_such_template } }
     assert_raise(Errno::ENOENT) { get('/') }
   end
-  
+
   it "allows passing locals" do
-    markaby_app do
+    markaby_app {
       markaby 'text value', :locals => { :value => 'foo' }
-    end
+    }
     assert ok?
     assert_equal 'foo', body
   end

data/test/markdown_test.rb

@@ -4,7 +4,7 @@ MarkdownTest = proc do
   def markdown_app(&block)
     mock_app do
       set :views, File.dirname(__FILE__) + '/views'
-      get '/', &block
+      get('/', &block)
     end
     get '/'
   end
@@ -48,7 +48,9 @@ MarkdownTest = proc do
   end
 
   it "renders with file layouts" do
-    markdown_app { markdown 'Hello World', :layout => :layout2, :layout_engine => :erb }
+    markdown_app {
+      markdown 'Hello World', :layout => :layout2, :layout_engine => :erb
+    }
     assert ok?
     assert_body "ERB Layout!\n<p>Hello World</p>"
   end
@@ -57,9 +59,7 @@ MarkdownTest = proc do
     mock_app do
       template(:inner) { "hi" }
       template(:outer) { "<outer><%= markdown :inner %></outer>" }
-      get '/' do
-        erb :outer
-      end
+      get('/') { erb :outer }
     end
 
     get '/'

data/test/middleware_test.rb

@@ -2,14 +2,14 @@ require File.expand_path('../helper', __FILE__)
 
 class MiddlewareTest < Test::Unit::TestCase
   setup do
-    @app = mock_app(Sinatra::Application) {
-      get '/*' do
+    @app = mock_app(Sinatra::Application) do
+      get('/*')do
         response.headers['X-Tests'] = env['test.ran'].
           map { |n| n.split('::').last }.
           join(', ')
         env['PATH_INFO']
       end
-    }
+    end
   end
 
   class MockMiddleware < Struct.new(:app)

data/test/nokogiri_test.rb

@@ -7,7 +7,7 @@ class NokogiriTest < Test::Unit::TestCase
   def nokogiri_app(&block)
     mock_app do
       set :views, File.dirname(__FILE__) + '/views'
-      get '/', &block
+      get('/', &block)
     end
     get '/'
   end
@@ -21,9 +21,7 @@ class NokogiriTest < Test::Unit::TestCase
   it 'renders inline blocks' do
     nokogiri_app do
       @name = "Frank & Mary"
-      nokogiri do |xml|
-        xml.couple @name
-      end
+      nokogiri { |xml| xml.couple @name }
     end
     assert ok?
     assert_body %(<?xml version="1.0"?>\n<couple>Frank &amp; Mary</couple>\n)
@@ -51,9 +49,9 @@ class NokogiriTest < Test::Unit::TestCase
 
   it "renders with file layouts" do
     next if Tilt::VERSION <= "1.1"
-    nokogiri_app do
+    nokogiri_app {
       nokogiri %(xml.em 'Hello World'), :layout => :layout2
-    end
+    }
     assert ok?
     assert_body %(<?xml version="1.0"?>\n<layout>\n  <em>Hello World</em>\n</layout>\n)
   end

data/test/rabl_test.rb

@@ -0,0 +1,89 @@
+require File.expand_path('../helper', __FILE__)
+
+begin
+require 'rabl'
+require 'ostruct'
+require 'json'
+require 'active_support/core_ext/hash/conversions'
+
+class RablTest < Test::Unit::TestCase
+  def rabl_app(&block)
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    }
+    get '/'
+  end
+
+  it 'renders inline rabl strings' do
+    rabl_app do
+      @foo = OpenStruct.new(:baz => 'w00t')
+      rabl %q{
+        object @foo
+        attributes :baz
+      }
+    end
+    assert ok?
+    assert_equal '{"openstruct":{"baz":"w00t"}}', body
+  end
+  it 'renders .rabl files in views path' do
+    rabl_app do
+      @foo = OpenStruct.new(:bar => 'baz')
+      rabl :hello
+    end
+    assert ok?
+    assert_equal '{"openstruct":{"bar":"baz"}}', body
+  end
+
+  it "renders with file layouts" do
+    rabl_app {
+      @foo = OpenStruct.new(:bar => 'baz')
+      rabl :hello, :layout => :layout2
+    }
+    assert ok?
+    assert_equal '{"qux":{"openstruct":{"bar":"baz"}}}', body
+  end
+
+  it "raises error if template not found" do
+    mock_app {
+      get('/') { rabl :no_such_template }
+    }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+
+  it "passes rabl options to the rabl engine" do
+    mock_app do
+      get('/') do
+        @foo = OpenStruct.new(:bar => 'baz')
+        rabl %q{
+          object @foo
+          attributes :bar
+        }, :format => 'xml'
+      end
+    end
+    get '/'
+    assert ok?
+    assert_body '<?xml version="1.0" encoding="UTF-8"?><openstruct><bar>baz</bar></openstruct>'
+  end
+
+  it "passes default rabl options to the rabl engine" do
+    mock_app do
+      set :rabl, :format => 'xml'
+      get('/') do
+        @foo = OpenStruct.new(:bar => 'baz')
+        rabl %q{
+          object @foo
+          attributes :bar
+        }
+      end
+    end
+    get '/'
+    assert ok?
+    assert_body '<?xml version="1.0" encoding="UTF-8"?><openstruct><bar>baz</bar></openstruct>'
+  end
+
+end
+
+rescue LoadError
+  warn "#{$!.to_s}: skipping rabl tests"
+end

data/test/radius_test.rb

@@ -7,7 +7,7 @@ class RadiusTest < Test::Unit::TestCase
   def radius_app(&block)
     mock_app do
       set :views, File.dirname(__FILE__) + '/views'
-      get '/', &block
+      get('/', &block)
     end
     get '/'
   end
@@ -44,11 +44,11 @@ class RadiusTest < Test::Unit::TestCase
     mock_app { get('/') { radius :no_such_template } }
     assert_raise(Errno::ENOENT) { get('/') }
   end
-  
+
   it "allows passing locals" do
-    radius_app do
+    radius_app {
       radius '<r:value />', :locals => { :value => 'foo' }
-    end
+    }
     assert ok?
     assert_equal 'foo', body
   end

data/test/rdoc_test.rb

@@ -8,7 +8,7 @@ class RdocTest < Test::Unit::TestCase
   def rdoc_app(&block)
     mock_app do
       set :views, File.dirname(__FILE__) + '/views'
-      get '/', &block
+      get('/', &block)
     end
     get '/'
   end
@@ -16,13 +16,13 @@ class RdocTest < Test::Unit::TestCase
   it 'renders inline rdoc strings' do
     rdoc_app { rdoc '= Hiya' }
     assert ok?
-    assert_body /<h1[^>]*>Hiya(<span><a href=\"#label-Hiya\">&para;<\/a> <a href=\"#documentation\">&uarr;<\/a><\/span>)?<\/h1>/
+    assert_body /<h1[^>]*>Hiya<\/h1>/
   end
 
   it 'renders .rdoc files in views path' do
     rdoc_app { rdoc :hello }
     assert ok?
-    assert_body /<h1[^>]*>Hello From RDoc(<span><a href=\"#label-Hello\+From\+RDoc\">&para;<\/a> <a href=\"#documentation\">&uarr;<\/a><\/span>)?<\/h1>/
+    assert_body /<h1[^>]*>Hello From RDoc<\/h1>/
   end
 
   it "raises error if template not found" do
@@ -41,7 +41,9 @@ class RdocTest < Test::Unit::TestCase
   end
 
   it "renders with file layouts" do
-    rdoc_app { rdoc 'Hello World', :layout => :layout2, :layout_engine => :erb }
+    rdoc_app {
+      rdoc 'Hello World', :layout => :layout2, :layout_engine => :erb
+    }
     assert ok?
     assert_body "ERB Layout!\n<p>Hello World</p>"
   end
@@ -50,9 +52,7 @@ class RdocTest < Test::Unit::TestCase
     mock_app do
       template(:inner) { "hi" }
       template(:outer) { "<outer><%= rdoc :inner %></outer>" }
-      get '/' do
-        erb :outer
-      end
+      get('/') { erb :outer }
     end
 
     get '/'

data/test/readme_test.rb

@@ -11,29 +11,17 @@ class ReadmeTest < Test::Unit::TestCase
   section "Routes" do
     example do
       mock_app do
-        get '/' do
-          ".. show something .."
-        end
+        get('/') { ".. show something .." }
 
-        post '/' do
-          ".. create something .."
-        end
+        post('/') { ".. create something .." }
 
-        put '/' do
-          ".. replace something .."
-        end
+        put('/') { ".. replace something .." }
 
-        patch '/' do
-          ".. modify something .."
-        end
+        patch('/') { ".. modify something .." }
 
-        delete '/' do
-          ".. annihilate something .."
-        end
+        delete('/') { ".. annihilate something .." }
 
-        options '/' do
-          ".. appease something .."
-        end
+        options('/') { ".. appease something .." }
       end
 
       get '/'
@@ -57,7 +45,7 @@ class ReadmeTest < Test::Unit::TestCase
 
     example do
       mock_app do
-        get '/hello/:name' do
+        get('/hello/:name') do
           # matches "GET /hello/foo" and "GET /hello/bar"
           # params[:name] is 'foo' or 'bar'
           "Hello #{params[:name]}!"
@@ -72,11 +60,7 @@ class ReadmeTest < Test::Unit::TestCase
     end
 
     example do
-      mock_app do
-        get '/hello/:name' do |n|
-          "Hello #{n}!"
-        end
-      end
+      mock_app { get('/hello/:name') { |n| "Hello #{n}!" } }
 
       get '/hello/foo'
       assert_body 'Hello foo!'
@@ -87,12 +71,12 @@ class ReadmeTest < Test::Unit::TestCase
 
     example do
       mock_app do
-        get '/say/*/to/*' do
+        get('/say/*/to/*') do
           # matches /say/hello/to/world
           params[:splat].inspect # => ["hello", "world"]
         end
 
-        get '/download/*.*' do
+        get('/download/*.*') do
           # matches /download/path/to/file.xml
           params[:splat].inspect # => ["path/to/file", "xml"]
         end
@@ -107,9 +91,9 @@ class ReadmeTest < Test::Unit::TestCase
 
     example do
       mock_app do
-        get %r{/hello/([\w]+)} do
+        get(%r{/hello/([\w]+)}) {
           "Hello, #{params[:captures].first}!"
-        end
+        }
       end
 
       get '/hello/foo'
@@ -121,9 +105,9 @@ class ReadmeTest < Test::Unit::TestCase
 
     example do
       mock_app do
-        get %r{/hello/([\w]+)} do |c|
+        get( %r{/hello/([\w]+)}) { |c|
           "Hello, #{c}!"
-        end
+        }
       end
 
       get '/hello/foo'

data/test/request_test.rb

@@ -42,4 +42,19 @@ class RequestTest < Test::Unit::TestCase
     dumped = Marshal.dump(request.params)
     assert_equal 'bar', Marshal.load(dumped)['foo']
   end
+
+  it "exposes the preferred type's parameters" do
+    request = Sinatra::Request.new(
+      'HTTP_ACCEPT' => 'image/jpeg; compress=0.25'
+    )
+    assert_equal({ 'compress' => '0.25' }, request.preferred_type.params)
+  end
+
+  it "properly decodes MIME type parameters" do
+    request = Sinatra::Request.new(
+      'HTTP_ACCEPT' => 'image/jpeg;unquoted=0.25;quoted="0.25";chartest="\";,\x"'
+    )
+    expected = { 'unquoted' => '0.25', 'quoted' => '0.25', 'chartest' => '";,x' }
+    assert_equal(expected, request.preferred_type.params)
+  end
 end

data/test/response_test.rb

@@ -3,12 +3,11 @@
 require File.expand_path('../helper', __FILE__)
 
 class ResponseTest < Test::Unit::TestCase
-  setup do
-    @response = Sinatra::Response.new
-  end
+  setup { @response = Sinatra::Response.new }
 
   def assert_same_body(a, b)
-    assert_equal a.to_enum(:each).to_a, b.to_enum(:each).to_a
+    enum = Enumerable.const_get(:Enumerator)
+    assert_equal enum.new(a).to_a, enum.new(b).to_a
   end
 
   it "initializes with 200, text/html, and empty body" do

data/test/result_test.rb

@@ -2,11 +2,7 @@ require File.expand_path('../helper', __FILE__)
 
 class ResultTest < Test::Unit::TestCase
   it "sets response.body when result is a String" do
-    mock_app {
-      get '/' do
-        'Hello World'
-      end
-    }
+    mock_app { get('/') { 'Hello World' } }
 
     get '/'
     assert ok?
@@ -14,11 +10,7 @@ class ResultTest < Test::Unit::TestCase
   end
 
   it "sets response.body when result is an Array of Strings" do
-    mock_app {
-      get '/' do
-        ['Hello', 'World']
-      end
-    }
+    mock_app { get('/') { ['Hello', 'World'] } }
 
     get '/'
     assert ok?
@@ -26,13 +18,13 @@ class ResultTest < Test::Unit::TestCase
   end
 
   it "sets response.body when result responds to #each" do
-    mock_app {
-      get '/' do
+    mock_app do
+      get('/') do
         res = lambda { 'Hello World' }
         def res.each ; yield call ; end
-        res
+        return res
       end
-    }
+    end
 
     get '/'
     assert ok?
@@ -40,11 +32,7 @@ class ResultTest < Test::Unit::TestCase
   end
 
   it "sets response.body to [] when result is nil" do
-    mock_app {
-      get '/' do
-        nil
-      end
-    }
+    mock_app { get( '/') { nil } }
 
     get '/'
     assert ok?
@@ -53,9 +41,7 @@ class ResultTest < Test::Unit::TestCase
 
   it "sets status, headers, and body when result is a Rack response tuple" do
     mock_app {
-      get '/' do
-        [203, {'Content-Type' => 'foo/bar'}, 'Hello World']
-      end
+      get('/') { [203, {'Content-Type' => 'foo/bar'}, 'Hello World'] }
     }
 
     get '/'
@@ -65,11 +51,7 @@ class ResultTest < Test::Unit::TestCase
   end
 
   it "sets status and body when result is a two-tuple" do
-    mock_app {
-      get '/' do
-        [409, 'formula of']
-      end
-    }
+    mock_app { get('/') { [409, 'formula of'] } }
 
     get '/'
     assert_equal 409, status
@@ -78,18 +60,14 @@ class ResultTest < Test::Unit::TestCase
 
   it "raises a ArgumentError when result is a non two or three tuple Array" do
     mock_app {
-      get '/' do
-        [409, 'formula of', 'something else', 'even more']
-      end
+      get('/') { [409, 'formula of', 'something else', 'even more'] }
     }
 
     assert_raise(ArgumentError) { get '/' }
   end
 
   it "sets status when result is a Fixnum status code" do
-    mock_app {
-      get('/') { 205 }
-    }
+    mock_app { get('/') { 205 } }
 
     get '/'
     assert_equal 205, status