sinatra 1.3.6 → 1.4.0.a

data/test/route_added_hook_test.rb

@@ -11,16 +11,16 @@ module RouteAddedTest
 end
 
 class RouteAddedHookTest < Test::Unit::TestCase
-  setup { 
+  setup do
     RouteAddedTest.routes.clear
     RouteAddedTest.procs.clear
-  }
+  end
 
   it "should be notified of an added route" do
-    mock_app(Class.new(Sinatra::Base)) {
+    mock_app(Class.new(Sinatra::Base)) do
       register RouteAddedTest
       get('/') {}
-    }
+    end
 
     assert_equal [["GET", "/"], ["HEAD", "/"]],
       RouteAddedTest.routes
@@ -38,22 +38,22 @@ class RouteAddedHookTest < Test::Unit::TestCase
   end
 
   it "should only run once per extension" do
-    mock_app(Class.new(Sinatra::Base)) {
+    mock_app(Class.new(Sinatra::Base)) do
       register RouteAddedTest
       register RouteAddedTest
       get('/') {}
-    }
+    end
 
     assert_equal [["GET", "/"], ["HEAD", "/"]],
       RouteAddedTest.routes
   end
-  
+
   it "should pass route blocks as an argument" do
-    mock_app(Class.new(Sinatra::Base)) {
+    mock_app(Class.new(Sinatra::Base)) do
       register RouteAddedTest
       get('/') {}
-    }
+    end
 
-    assert_kind_of Proc, RouteAddedTest.procs.first    
+    assert_kind_of Proc, RouteAddedTest.procs.first
   end
 end

data/test/routing_test.rb

@@ -70,6 +70,17 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal 'pass', response.headers['X-Cascade']
   end
 
+  it "404s and does not set X-Cascade header when no route satisfies the request and x_cascade has been disabled" do
+    mock_app {
+      disable :x_cascade
+      get('/foo') { }
+    }
+    get '/bar'
+    assert_equal 404, status
+    assert_equal nil, response.headers['X-Cascade']
+  end
+
+
   it "allows using unicode" do
     mock_app do
       get('/föö') { }
@@ -100,6 +111,19 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal "<h1>Not Found</h1>", response.body
   end
 
+  it "recalculates body length correctly for 404 response" do
+    mock_app {
+      get '/' do
+        @response["Content-Length"] = "30"
+        raise Sinatra::NotFound
+      end
+    }
+
+    get "/"
+    assert_equal "18", response["Content-Length"]
+    assert_equal 404, status
+  end
+
   it 'matches empty PATH_INFO to "/" if no route is defined for ""' do
     mock_app do
       get '/' do
@@ -377,6 +401,30 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal 'well, alright', body
   end
 
+  it "exposes params nested within arrays with indifferent hash" do
+    mock_app {
+      get '/testme' do
+        assert_equal 'baz', params['bar'][0]['foo']
+        assert_equal 'baz', params['bar'][0][:foo]
+        'well, alright'
+      end
+    }
+    get '/testme?bar[][foo]=baz'
+    assert_equal 'well, alright', body
+  end
+
+  it "supports arrays within params" do
+    mock_app {
+      get '/foo' do
+        assert_equal ['A', 'B'], params['bar']
+        'looks good'
+      end
+    }
+    get '/foo?bar[]=A&bar[]=B'
+    assert ok?
+    assert_equal 'looks good', body
+  end
+
   it "supports deeply nested params" do
     expected_params = {
       "emacs" => {
@@ -746,6 +794,31 @@ class RoutingTest < Test::Unit::TestCase
     assert !ok?
   end
 
+  it "filters by current Content-Type" do
+    mock_app do
+      before('/txt') { content_type :txt }
+      get('*', :provides => :txt) { 'txt' }
+
+      before('/html') { content_type :html }
+      get('*', :provides => :html) { 'html' }
+    end
+
+    get '/', {}, { 'HTTP_ACCEPT' => '*/*' }
+    assert ok?
+    assert_equal 'text/plain;charset=utf-8', response.headers['Content-Type']
+    assert_body 'txt'
+
+    get '/txt', {}, { 'HTTP_ACCEPT' => 'text/plain' }
+    assert ok?
+    assert_equal 'text/plain;charset=utf-8', response.headers['Content-Type']
+    assert_body 'txt'
+
+    get '/', {}, { 'HTTP_ACCEPT' => 'text/html' }
+    assert ok?
+    assert_equal 'text/html;charset=utf-8', response.headers['Content-Type']
+    assert_body 'html'
+  end
+
   it "allows multiple mime types for accept header" do
     types = ['image/jpeg', 'image/pjpeg']
 
@@ -777,7 +850,7 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal 'default', body
   end
 
-  it 'respects user agent prefferences for the content type' do
+  it 'respects user agent preferences 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'
@@ -832,6 +905,55 @@ class RoutingTest < Test::Unit::TestCase
     assert_body 'text/html;charset=utf-8'
   end
 
+  it 'supplies a default quality of 1.0' do
+    mock_app { get('/', :provides => [:png, :html]) { content_type }}
+    get '/', {}, { 'HTTP_ACCEPT' => 'image/png;q=0.5, text/*' }
+    assert_body 'text/html;charset=utf-8'
+  end
+
+  it 'orders types with equal quality by parameter count' do
+    mock_app do
+      get('/', :provides => [:png, :jpg]) { content_type }
+    end
+
+    lo_png = 'image/png;q=0.5'
+    hi_png = 'image/png;q=0.5;profile=FOGRA40;gamma=0.8'
+    jpeg   = 'image/jpeg;q=0.5;compress=0.25'
+
+    get '/', {}, { 'HTTP_ACCEPT' => "#{lo_png}, #{jpeg}" }
+    assert_body 'image/jpeg'
+    get '/', {}, { 'HTTP_ACCEPT' => "#{hi_png}, #{jpeg}" }
+    assert_body 'image/png'
+  end
+
+  it 'ignores the quality parameter when ordering by parameter count' do
+    mock_app do
+      get('/', :provides => [:png, :jpg]) { content_type }
+    end
+
+    lo_png = 'image/png'
+    hi_png = 'image/png;profile=FOGRA40;gamma=0.8'
+    jpeg   = 'image/jpeg;q=1.0;compress=0.25'
+
+    get '/', {}, { 'HTTP_ACCEPT' => "#{jpeg}, #{lo_png}" }
+    assert_body 'image/jpeg'
+    get '/', {}, { 'HTTP_ACCEPT' => "#{jpeg}, #{hi_png}" }
+    assert_body 'image/png'
+  end
+
+  it 'properly handles quoted strings in parameters' do
+    mock_app do
+      get('/', :provides => [:png, :jpg]) { content_type }
+    end
+
+    get '/', {}, { 'HTTP_ACCEPT' => 'image/png;q=0.5;profile=",image/jpeg,"' }
+    assert_body 'image/png'
+    get '/', {}, { 'HTTP_ACCEPT' => 'image/png;q=0.5,image/jpeg;q=0;x=";q=1.0"' }
+    assert_body 'image/png'
+    get '/', {}, { 'HTTP_ACCEPT' => 'image/png;q=0.5,image/jpeg;q=0;x="\";q=1.0"' }
+    assert_body 'image/png'
+  end
+
   it 'accepts both text/javascript and application/javascript for js' do
     mock_app { get('/', :provides => :js) { content_type }}
     get '/', {}, { 'HTTP_ACCEPT' => 'application/javascript' }

data/test/sass_test.rb

@@ -6,11 +6,11 @@ require 'sass'
 
 class SassTest < Test::Unit::TestCase
   def sass_app(options = {}, &block)
-    mock_app {
+    mock_app do
       set :views, File.dirname(__FILE__) + '/views'
       set options
-      get '/', &block
-    }
+      get('/', &block)
+    end
     get '/'
   end
 
@@ -36,9 +36,9 @@ class SassTest < Test::Unit::TestCase
   end
 
   it 'defaults allows setting content type globally' do
-    sass_app(:sass => { :content_type => 'html' }) do
+    sass_app(:sass => { :content_type => 'html' }) {
       sass "#sass\n  :background-color white\n"
-    end
+    }
     assert ok?
     assert_equal "text/html;charset=utf-8", response['Content-Type']
   end
@@ -56,50 +56,50 @@ class SassTest < Test::Unit::TestCase
   end
 
   it "raises error if template not found" do
-    mock_app {
-      get('/') { sass :no_such_template }
-    }
+    mock_app { get('/') { sass :no_such_template } }
     assert_raise(Errno::ENOENT) { get('/') }
   end
 
   it "passes SASS options to the Sass engine" do
-    sass_app {
-      sass "#sass\n  :background-color white\n  :color black\n",
+    sass_app do
+      sass(
+        "#sass\n  :background-color white\n  :color black\n",
         :style => :compact
-    }
+      )
+    end
     assert ok?
-    assert_equal "#sass { background-color: white; color: black; }\n", body
+    assert_equal("#sass { background-color: white; color: black; }\n", body)
   end
 
   it "passes default SASS options to the Sass engine" do
-    mock_app {
+    mock_app do
       set :sass, {:style => :compact} # default Sass style is :nested
-      get '/' do
-        sass "#sass\n  :background-color white\n  :color black\n"
-      end
-    }
+      get('/') { sass("#sass\n  :background-color white\n  :color black\n") }
+    end
     get '/'
     assert ok?
     assert_equal "#sass { background-color: white; color: black; }\n", body
   end
 
   it "merges the default SASS options with the overrides" do
-    mock_app {
+    mock_app do
       # default Sass attribute_syntax is :normal (with : in front)
       set :sass, {:style => :compact, :attribute_syntax => :alternate }
-      get '/' do
-        sass "#sass\n  background-color: white\n  color: black\n"
-      end
-      get '/raised' do
+      get('/') { sass("#sass\n  background-color: white\n  color: black\n") }
+      get('/raised') do
         # retains global attribute_syntax settings
-        sass "#sass\n  :background-color white\n  :color black\n",
+        sass(
+          "#sass\n  :background-color white\n  :color black\n",
           :style => :expanded
+        )
       end
-      get '/expanded_normal' do
-        sass "#sass\n  :background-color white\n  :color black\n",
+      get('/expanded_normal') do
+        sass(
+          "#sass\n  :background-color white\n  :color black\n",
           :style => :expanded, :attribute_syntax => :normal
+        )
       end
-    }
+    end
     get '/'
     assert ok?
     assert_equal "#sass { background-color: white; color: black; }\n", body

data/test/scss_test.rb

@@ -6,11 +6,11 @@ require 'sass'
 
 class ScssTest < Test::Unit::TestCase
   def scss_app(options = {}, &block)
-    mock_app {
+    mock_app do
       set :views, File.dirname(__FILE__) + '/views'
       set options
-      get '/', &block
-    }
+      get('/', &block)
+    end
     get '/'
   end
 
@@ -36,9 +36,9 @@ class ScssTest < Test::Unit::TestCase
   end
 
   it 'defaults allows setting content type globally' do
-    scss_app(:scss => { :content_type => 'html' }) do
+    scss_app(:scss => { :content_type => 'html' }) {
       scss "#scss {\n  background-color: white; }\n"
-    end
+    }
     assert ok?
     assert_equal "text/html;charset=utf-8", response['Content-Type']
   end
@@ -56,28 +56,28 @@ class ScssTest < Test::Unit::TestCase
   end
 
   it "raises error if template not found" do
-    mock_app {
-      get('/') { scss :no_such_template }
-    }
+    mock_app { get('/') { scss(:no_such_template) } }
     assert_raise(Errno::ENOENT) { get('/') }
   end
 
   it "passes scss options to the scss engine" do
-    scss_app {
-      scss "#scss {\n  background-color: white;\n  color: black\n}",
+    scss_app do
+      scss(
+        "#scss {\n  background-color: white;\n  color: black\n}",
         :style => :compact
-    }
+      )
+    end
     assert ok?
     assert_equal "#scss { background-color: white; color: black; }\n", body
   end
 
   it "passes default scss options to the scss engine" do
-    mock_app {
+    mock_app do
       set :scss, {:style => :compact} # default scss style is :nested
-      get '/' do
-        scss "#scss {\n  background-color: white;\n  color: black;\n}"
-      end
-    }
+      get('/') {
+        scss("#scss {\n  background-color: white;\n  color: black;\n}")
+      }
+    end
     get '/'
     assert ok?
     assert_equal "#scss { background-color: white; color: black; }\n", body

data/test/server_test.rb

@@ -21,11 +21,11 @@ end
 
 class ServerTest < Test::Unit::TestCase
   setup do
-    mock_app {
+    mock_app do
       set :server, 'mock'
       set :bind, 'foo.local'
       set :port, 9001
-    }
+    end
     $stderr = StringIO.new
   end
 

data/test/settings_test.rb

@@ -422,9 +422,20 @@ class SettingsTest < Test::Unit::TestCase
   end
 
   describe 'server' do
-    it 'is one of thin, mongrel, webrick' do
-      assert_equal %w[thin mongrel webrick], @base.server
-      assert_equal %w[thin mongrel webrick], @application.server
+    it 'includes webrick' do
+      assert @base.server.include?('webrick')
+      assert @application.server.include?('webrick')
+    end
+
+    it 'includes puma' do
+      assert @base.server.include?('puma')
+      assert @application.server.include?('puma')
+    end
+
+    it 'includes thin' do
+      next if RUBY_ENGINE == 'jruby'
+      assert @base.server.include?('thin')
+      assert @application.server.include?('thin')
     end
   end
 
@@ -435,7 +446,7 @@ class SettingsTest < Test::Unit::TestCase
     end
 
     it 'defaults to the file subclassing' do
-      assert_equal __FILE__, Sinatra.new.app_file
+      assert_equal File.expand_path(__FILE__), Sinatra.new.app_file
     end
   end
 
@@ -484,6 +495,18 @@ class SettingsTest < Test::Unit::TestCase
     end
   end
 
+  describe 'public_dir' do
+    it 'is an alias for public_folder' do
+      @base.public_dir = File.dirname(__FILE__)
+      assert_equal File.dirname(__FILE__), @base.public_dir
+      assert_equal @base.public_folder, @base.public_dir
+
+      @application.public_dir = File.dirname(__FILE__)
+      assert_equal File.dirname(__FILE__), @application.public_dir
+      assert_equal @application.public_folder, @application.public_dir
+    end
+  end
+
   describe 'lock' do
     it 'is disabled by default' do
       assert ! @base.lock?
@@ -534,5 +557,26 @@ class SettingsTest < Test::Unit::TestCase
         assert !MiddlewareTracker.used.include?(Rack::Protection::PathTraversal)
       end
     end
+
+    it 'sets up RemoteToken if sessions are enabled' do
+      MiddlewareTracker.track do
+        Sinatra.new { enable :sessions }.new
+        assert_include MiddlewareTracker.used, Rack::Protection::RemoteToken
+      end
+    end
+
+    it 'does not set up RemoteToken if sessions are disabled' do
+      MiddlewareTracker.track do
+        Sinatra.new.new
+        assert !MiddlewareTracker.used.include?(Rack::Protection::RemoteToken)
+      end
+    end
+
+    it 'sets up RemoteToken if it is configured to' do
+      MiddlewareTracker.track do
+        Sinatra.new { set :protection, :session => true }.new
+        assert_include MiddlewareTracker.used, Rack::Protection::RemoteToken
+      end
+    end
   end
 end