sinatra 0.9.6 → 1.0.a

data/test/mapped_error_test.rb

@@ -101,6 +101,37 @@ class MappedErrorTest < Test::Unit::TestCase
       assert_equal 404, status
       assert_equal "Lost, are we?", body
     end
+
+    it 'inherits error mappings from base class' do
+      base = Class.new(Sinatra::Base)
+      base.error(FooError) { 'base class' }
+
+      mock_app(base) {
+        set :raise_errors, false
+        get '/' do
+          raise FooError
+        end
+      }
+
+      get '/'
+      assert_equal 'base class', body
+    end
+
+    it 'overrides error mappings in base class' do
+      base = Class.new(Sinatra::Base)
+      base.error(FooError) { 'base class' }
+
+      mock_app(base) {
+        set :raise_errors, false
+        error(FooError) { 'subclass' }
+        get '/' do
+          raise FooError
+        end
+      }
+
+      get '/'
+      assert_equal 'subclass', body
+    end
   end
 
   describe 'Custom Error Pages' do

data/test/middleware_test.rb

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

data/test/request_test.rb

@@ -15,4 +15,19 @@ class RequestTest < Test::Unit::TestCase
     )
     assert_equal 'bar', request.params['foo']
   end
+
+  it 'is secure when the url scheme is https' do
+    request = Sinatra::Request.new('rack.url_scheme' => 'https')
+    assert request.secure?
+  end
+
+  it 'is not secure when the url scheme is http' do
+    request = Sinatra::Request.new('rack.url_scheme' => 'http')
+    assert !request.secure?
+  end
+
+  it 'respects X-Forwarded-Proto header for proxied SSL' do
+    request = Sinatra::Request.new('HTTP_X_FORWARDED_PROTO' => 'https')
+    assert request.secure?
+  end
 end

data/test/routing_test.rb

@@ -60,6 +60,15 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal 404, status
   end
 
+  it "404s and sets X-Cascade header when no route satisfies the request" do
+    mock_app {
+      get('/foo') { }
+    }
+    get '/bar'
+    assert_equal 404, status
+    assert_equal 'pass', response.headers['X-Cascade']
+  end
+
   it "overrides the content-type in error handlers" do
     mock_app {
       before { content_type 'text/plain' }
@@ -462,6 +471,38 @@ class RoutingTest < Test::Unit::TestCase
     assert not_found?
   end
 
+  it "transitions to 404 and sets X-Cascade header when passed and no subsequent route matches" do
+    mock_app {
+      get '/:foo' do
+        pass
+        'Hello Foo'
+      end
+
+      get '/bar' do
+        'Hello Bar'
+      end
+    }
+
+    get '/foo'
+    assert not_found?
+    assert_equal 'pass', response.headers['X-Cascade']
+  end
+
+  it "uses optional block passed to pass as route block if no other route is found" do
+    mock_app {
+      get "/" do
+        pass do
+          "this"
+        end
+        "not this"
+      end
+    }
+
+    get "/"
+    assert ok?
+    assert "this", body
+  end
+
   it "passes when matching condition returns false" do
     mock_app {
       condition { params[:foo] == 'bar' }
@@ -781,4 +822,39 @@ class RoutingTest < Test::Unit::TestCase
     end
 
   end
+
+  it "matches routes defined in superclasses" do
+    base = Class.new(Sinatra::Base)
+    base.get('/foo') { 'foo in baseclass' }
+
+    mock_app(base) {
+      get('/bar') { 'bar in subclass' }
+    }
+
+    get '/foo'
+    assert ok?
+    assert_equal 'foo in baseclass', body
+
+    get '/bar'
+    assert ok?
+    assert_equal 'bar in subclass', body
+  end
+
+  it "matches routes in subclasses before superclasses" do
+    base = Class.new(Sinatra::Base)
+    base.get('/foo') { 'foo in baseclass' }
+    base.get('/bar') { 'bar in baseclass' }
+
+    mock_app(base) {
+      get('/foo') { 'foo in subclass' }
+    }
+
+    get '/foo'
+    assert ok?
+    assert_equal 'foo in subclass', body
+
+    get '/bar'
+    assert ok?
+    assert_equal 'bar in baseclass', body
+  end
 end

data/test/{options_test.rb → settings_test.rb}

@@ -1,26 +1,27 @@
 require File.dirname(__FILE__) + '/helper'
 
-class OptionsTest < Test::Unit::TestCase
+class SettingsTest < Test::Unit::TestCase
   setup do
-    @base    = Sinatra.new(Sinatra::Base)
+    @base = Sinatra.new(Sinatra::Base)
+    @base.set :environment, :foo
+
     @application = Sinatra.new(Sinatra::Application)
-    @base.set    :environment, :development
-    @application.set :environment, :development
+    @application.set :environment, :foo
   end
 
-  it 'sets options to literal values' do
+  it 'sets settings to literal values' do
     @base.set(:foo, 'bar')
     assert @base.respond_to?(:foo)
     assert_equal 'bar', @base.foo
   end
 
-  it 'sets options to Procs' do
+  it 'sets settings to Procs' do
     @base.set(:foo, Proc.new { 'baz' })
     assert @base.respond_to?(:foo)
     assert_equal 'baz', @base.foo
   end
 
-  it "sets multiple options with a Hash" do
+  it "sets multiple settings with a Hash" do
     @base.set :foo => 1234,
         :bar => 'Hello World',
         :baz => Proc.new { 'bizzle' }
@@ -29,7 +30,7 @@ class OptionsTest < Test::Unit::TestCase
     assert_equal 'bizzle', @base.baz
   end
 
-  it 'inherits option methods when subclassed' do
+  it 'inherits settings methods when subclassed' do
     @base.set :foo, 'bar'
     @base.set :biz, Proc.new { 'baz' }
 
@@ -40,7 +41,7 @@ class OptionsTest < Test::Unit::TestCase
     assert_equal 'baz', sub.biz
   end
 
-  it 'overrides options in subclass' do
+  it 'overrides settings in subclass' do
     @base.set :foo, 'bar'
     @base.set :biz, Proc.new { 'baz' }
     sub = Class.new(@base)
@@ -78,27 +79,42 @@ class OptionsTest < Test::Unit::TestCase
     assert_equal 'oops', @base.foo
   end
 
-  it "sets multiple options to true with #enable" do
+  it "sets multiple settings to true with #enable" do
     @base.enable :sessions, :foo, :bar
     assert @base.sessions
     assert @base.foo
     assert @base.bar
   end
 
-  it "sets multiple options to false with #disable" do
+  it "sets multiple settings to false with #disable" do
     @base.disable :sessions, :foo, :bar
     assert !@base.sessions
     assert !@base.foo
     assert !@base.bar
   end
 
-  it 'enables MethodOverride middleware when :methodoverride is enabled' do
-    @base.set :methodoverride, true
-    @base.put('/') { 'okay' }
-    @app = @base
-    post '/', {'_method'=>'PUT'}, {}
-    assert_equal 200, status
-    assert_equal 'okay', body
+
+  it 'is accessible from instances via #settings' do
+    assert_equal :foo, @base.new.settings.environment
+  end
+
+  describe 'methodoverride' do
+    it 'is disabled on Base' do
+      assert ! @base.methodoverride?
+    end
+
+    it 'is enabled on Application' do
+      assert @application.methodoverride?
+    end
+
+    it 'enables MethodOverride middleware' do
+      @base.set :methodoverride, true
+      @base.put('/') { 'okay' }
+      @app = @base
+      post '/', {'_method'=>'PUT'}, {}
+      assert_equal 200, status
+      assert_equal 'okay', body
+    end
   end
 
   describe 'clean_trace' do
@@ -152,32 +168,22 @@ class OptionsTest < Test::Unit::TestCase
       assert ! @base.run?
     end
 
-    it 'is enabled on Application when not in test environment' do
-      @application.set :environment, :development
-      assert @application.development?
+    it 'is enabled on Application except in test environment' do
       assert @application.run?
 
-      @application.set :environment, :development
-      assert @application.run?
+      @application.set :environment, :test
+      assert ! @application.run?
     end
-
-    # TODO: it 'is enabled when $0 == app_file'
   end
 
   describe 'raise_errors' do
     it 'is enabled on Base except under development' do
-      @base.environment = :test
       assert @base.raise_errors?
       @base.environment = :development
       assert !@base.raise_errors?
     end
 
     it 'is enabled on Application only in test' do
-      @application.set(:environment, :development)
-      assert @application.development?
-      assert ! @application.raise_errors?
-
-      @application.set(:environment, :production)
       assert ! @application.raise_errors?
 
       @application.set(:environment, :test)
@@ -187,22 +193,16 @@ class OptionsTest < Test::Unit::TestCase
 
   describe 'show_exceptions' do
     it 'is disabled on Base except under development' do
-      @base.environment = :test
       assert ! @base.show_exceptions?
       @base.environment = :development
       assert @base.show_exceptions?
     end
 
-    it 'is enabled on Application only in development' do
-      @base.set(:environment, :development)
-      assert @application.development?
-      assert @application.show_exceptions?
-
-      @application.set(:environment, :test)
+    it 'is disabled on Application except in development' do
       assert ! @application.show_exceptions?
 
-      @base.set(:environment, :production)
-      assert ! @base.show_exceptions?
+      @application.set(:environment, :development)
+      assert @application.show_exceptions?
     end
 
     it 'returns a friendly 500' do
@@ -224,7 +224,6 @@ class OptionsTest < Test::Unit::TestCase
 
   describe 'dump_errors' do
     it 'is disabled on Base except in development' do
-      @base.environment = :test
       assert ! @base.dump_errors?
       @base.environment = :development
       assert @base.dump_errors?
@@ -253,7 +252,7 @@ class OptionsTest < Test::Unit::TestCase
       }
 
       get '/'
-      assert body.include?("RuntimeError") && body.include?("options_test.rb")
+      assert body.include?("RuntimeError") && body.include?("settings_test.rb")
     end
   end
 
@@ -265,8 +264,6 @@ class OptionsTest < Test::Unit::TestCase
     it 'is disabled on Application' do
       assert ! @application.sessions?
     end
-
-    # TODO: it 'uses Rack::Session::Cookie when enabled' do
   end
 
   describe 'logging' do
@@ -274,18 +271,16 @@ class OptionsTest < Test::Unit::TestCase
       assert ! @base.logging?
     end
 
-    it 'is enabled on Application when not in test environment' do
+    it 'is enabled on Application except in test environment' do
       assert @application.logging?
 
       @application.set :environment, :test
       assert ! @application.logging
     end
-
-    # TODO: it 'uses Rack::CommonLogger when enabled' do
   end
 
   describe 'static' do
-    it 'is disabled on Base by Application' do
+    it 'is disabled on Base by default' do
       assert ! @base.static?
     end
 
@@ -329,8 +324,8 @@ class OptionsTest < Test::Unit::TestCase
 
   describe 'app_file' do
     it 'is nil' do
-      assert @base.app_file.nil?
-      assert @application.app_file.nil?
+      assert_nil @base.app_file
+      assert_nil @application.app_file
     end
   end
 
@@ -382,6 +377,7 @@ class OptionsTest < Test::Unit::TestCase
   describe 'lock' do
     it 'is disabled by default' do
       assert ! @base.lock?
+      assert ! @application.lock?
     end
   end
 end

data/test/static_test.rb

@@ -26,6 +26,12 @@ class StaticTest < Test::Unit::TestCase
     assert_equal File.read(__FILE__), buf1.join
   end
 
+  it 'sets the sinatra.static_file env variable if served' do
+    env = Rack::MockRequest.env_for("/#{File.basename(__FILE__)}")
+    status, headers, body = @app.call(env)
+    assert_equal File.expand_path(__FILE__), env['sinatra.static_file']
+  end
+
   it 'serves HEAD requests for files in the public directory' do
     head "/#{File.basename(__FILE__)}"
     assert ok?
@@ -34,6 +40,13 @@ class StaticTest < Test::Unit::TestCase
     assert response.headers.include?('Last-Modified')
   end
 
+  %w[POST PUT DELETE].each do |verb|
+    it "does not serve #{verb} requests" do
+      send verb.downcase, "/#{File.basename(__FILE__)}"
+      assert_equal 404, status
+    end
+  end
+
   it 'serves files in preference to custom routes' do
     @app.get("/#{File.basename(__FILE__)}") { 'Hello World' }
     get "/#{File.basename(__FILE__)}"

data/test/templates_test.rb

@@ -1,12 +1,20 @@
 require File.dirname(__FILE__) + '/helper'
 
+class TestTemplate < Tilt::Template
+  def compile!
+  end
+
+  def evaluate(scope, locals={}, &block)
+    inner = block ? block.call : ''
+    data + inner
+  end
+
+  Tilt.register 'test', self
+end
+
 class TemplatesTest < Test::Unit::TestCase
-  def render_app(&block)
-    mock_app {
-      def render_test(template, data, options, locals, &block)
-        inner = block ? block.call : ''
-        data + inner
-      end
+  def render_app(base=Sinatra::Base, &block)
+    mock_app(base) {
       set :views, File.dirname(__FILE__) + '/views'
       get '/', &block
       template(:layout3) { "Layout 3!\n" }
@@ -68,12 +76,12 @@ class TemplatesTest < Test::Unit::TestCase
     assert_equal "Layout 3!\nHello World!\n", body
   end
 
-  it 'loads templates from source file with inline templates' do
+  it 'loads templates from source file with inline_templates enabled' do
     mock_app {
       enable :inline_templates
     }
-    assert_equal "this is foo\n\n", @app.templates[:foo][:template]
-    assert_equal "X\n= yield\nX\n", @app.templates[:layout][:template]
+    assert_equal "this is foo\n\n", @app.templates[:foo][0]
+    assert_equal "X\n= yield\nX\n", @app.templates[:layout][0]
   end
 
   it 'loads templates from specified views directory' do
@@ -82,7 +90,7 @@ class TemplatesTest < Test::Unit::TestCase
     assert_equal "from another views directory\n", body
   end
 
-  test 'inline_templates simply ignores IO errors' do
+  test 'use_in_file_templates simply ignores IO errors' do
     assert_nothing_raised {
       mock_app {
         set :inline_templates, '/foo/bar'
@@ -107,6 +115,31 @@ class TemplatesTest < Test::Unit::TestCase
     assert ok?
     assert_equal 'Hello Mike!<p>content</p>', body
   end
+
+  it 'loads templates defined in subclasses' do
+    base = Class.new(Sinatra::Base)
+    base.template(:foo) { 'bar' }
+    render_app(base) { render :test, :foo }
+    assert ok?
+    assert_equal 'bar', body
+  end
+
+  it 'uses templates in superclasses before subclasses' do
+    base = Class.new(Sinatra::Base)
+    base.template(:foo) { 'template in superclass' }
+    assert_equal 'template in superclass', base.templates[:foo].first.call
+
+    mock_app(base) {
+      set :views, File.dirname(__FILE__) + '/views'
+      template(:foo) { 'template in subclass' }
+      get('/') { render :test, :foo }
+    }
+    assert_equal 'template in subclass', @app.templates[:foo].first.call
+
+    get '/'
+    assert ok?
+    assert_equal 'template in subclass', body
+  end
 end
 
 # __END__ : this is not the real end of the script.