sinatra-sinatra 0.9.0.5 → 0.9.1

data/test/options_test.rb

@@ -1,7 +1,10 @@
 require File.dirname(__FILE__) + '/helper'
 
 describe 'Options' do
-  before { @app = Class.new(Sinatra::Base) }
+  before do
+    restore_default_options
+    @app = Sinatra.new
+  end
 
   it 'sets options to literal values' do
     @app.set(:foo, 'bar')
@@ -96,17 +99,17 @@ describe 'Options' do
   end
 end
 
-describe 'Backtrace Cleaning (clean_trace option)' do
-  before do
-    @app = Class.new(Sinatra::Base)
+describe_option 'clean_trace' do
+  def clean_backtrace(trace)
+    @base.new.send(:clean_backtrace, trace)
   end
 
-  def clean_backtrace(trace)
-    @app.new.send(:clean_backtrace, trace)
+  it 'is enabled on Base' do
+    assert @base.clean_trace?
   end
 
-  it 'is enabled by default' do
-    assert @app.clean_trace
+  it 'is enabled on Default' do
+    assert @default.clean_trace?
   end
 
   it 'does nothing when disabled' do
@@ -115,7 +118,7 @@ describe 'Backtrace Cleaning (clean_trace option)' do
       "./myapp:42",
       ("#{Gem.dir}/some/lib.rb" if defined?(Gem))
     ].compact
-    @app.set :clean_trace, false
+    @base.set :clean_trace, false
     assert_equal backtrace, clean_backtrace(backtrace)
   end
 
@@ -138,3 +141,234 @@ describe 'Backtrace Cleaning (clean_trace option)' do
     end
   end
 end
+
+describe_option 'run' do
+  it 'is disabled on Base' do
+    assert ! @base.run?
+  end
+
+  it 'is enabled on Default when not in test environment' do
+    assert @default.development?
+    assert @default.run?
+
+    @default.set :environment, :development
+    assert @default.run?
+  end
+
+  # TODO: it 'is enabled when $0 == app_file'
+end
+
+describe_option 'raise_errors' do
+  it 'is enabled on Base' do
+    assert @base.raise_errors?
+  end
+
+  it 'is enabled on Default only in test' do
+    @default.set(:environment, :development)
+    assert @default.development?
+    assert ! @default.raise_errors?, "disabled development"
+
+    @default.set(:environment, :production)
+    assert ! @default.raise_errors?
+
+    @default.set(:environment, :test)
+    assert @default.raise_errors?
+  end
+end
+
+describe_option 'dump_errors' do
+  it 'is disabled on Base' do
+    assert ! @base.dump_errors?
+  end
+
+  it 'is enabled on Default' do
+    assert @default.dump_errors?
+  end
+
+  it 'dumps exception with backtrace to rack.errors' do
+    Sinatra::Default.disable(:raise_errors)
+
+    mock_app(Sinatra::Default) {
+      error do
+        error = @env['rack.errors'].instance_variable_get(:@error)
+        error.rewind
+
+        error.read
+      end
+
+      get '/' do
+        raise
+      end
+    }
+
+    get '/'
+    assert body.include?("RuntimeError") && body.include?("options_test.rb")
+  end
+end
+
+describe_option 'sessions' do
+  it 'is disabled on Base' do
+    assert ! @base.sessions?
+  end
+
+  it 'is disabled on Default' do
+    assert ! @default.sessions?
+  end
+
+  # TODO: it 'uses Rack::Session::Cookie when enabled' do
+end
+
+describe_option 'logging' do
+  it 'is disabled on Base' do
+    assert ! @base.logging?
+  end
+
+  it 'is enabled on Default when not in test environment' do
+    assert @default.logging?
+
+    @default.set :environment, :test
+    assert ! @default.logging
+  end
+
+  # TODO: it 'uses Rack::CommonLogger when enabled' do
+end
+
+describe_option 'static' do
+  it 'is disabled on Base' do
+    assert ! @base.static?
+  end
+
+  it 'is enabled on Default' do
+    assert @default.static?
+  end
+
+  # TODO: it setup static routes if public is enabled
+  # TODO: however, that's already tested in static_test so...
+end
+
+describe_option 'host' do
+  it 'defaults to 0.0.0.0' do
+    assert_equal '0.0.0.0', @base.host
+    assert_equal '0.0.0.0', @default.host
+  end
+end
+
+describe_option 'port' do
+  it 'defaults to 4567' do
+    assert_equal 4567, @base.port
+    assert_equal 4567, @default.port
+  end
+end
+
+describe_option 'server' do
+  it 'is one of thin, mongrel, webrick' do
+    assert_equal %w[thin mongrel webrick], @base.server
+    assert_equal %w[thin mongrel webrick], @default.server
+  end
+end
+
+describe_option 'app_file' do
+  it 'is nil' do
+    assert @base.app_file.nil?
+    assert @default.app_file.nil?
+  end
+end
+
+describe_option 'root' do
+  it 'is nil if app_file is not set' do
+    assert @base.root.nil?
+    assert @default.root.nil?
+  end
+
+  it 'is equal to the expanded basename of app_file' do
+    @base.app_file = __FILE__
+    assert_equal File.expand_path(File.dirname(__FILE__)), @base.root
+
+    @default.app_file = __FILE__
+    assert_equal File.expand_path(File.dirname(__FILE__)), @default.root
+  end
+end
+
+describe_option 'views' do
+  it 'is nil if root is not set' do
+    assert @base.views.nil?
+    assert @default.views.nil?
+  end
+
+  it 'is set to root joined with views/' do
+    @base.root = File.dirname(__FILE__)
+    assert_equal File.dirname(__FILE__) + "/views", @base.views
+
+    @default.root = File.dirname(__FILE__)
+    assert_equal File.dirname(__FILE__) + "/views", @default.views
+  end
+end
+
+describe_option 'public' do
+  it 'is nil if root is not set' do
+    assert @base.public.nil?
+    assert @default.public.nil?
+  end
+
+  it 'is set to root joined with public/' do
+    @base.root = File.dirname(__FILE__)
+    assert_equal File.dirname(__FILE__) + "/public", @base.public
+
+    @default.root = File.dirname(__FILE__)
+    assert_equal File.dirname(__FILE__) + "/public", @default.public
+  end
+end
+
+describe_option 'reload' do
+  it 'is enabled when
+        app_file is set,
+        is not a rackup file,
+        and we are in development' do
+    @base.app_file = __FILE__
+    @base.set(:environment, :development)
+    assert @base.reload?
+
+    @default.app_file = __FILE__
+    @default.set(:environment, :development)
+    assert @default.reload?
+  end
+
+  it 'is disabled if app_file is not set' do
+    assert ! @base.reload?
+    assert ! @default.reload?
+  end
+
+  it 'is disabled if app_file is a rackup file' do
+    @base.app_file = 'config.ru'
+    assert ! @base.reload?
+
+    @default.app_file = 'config.ru'
+    assert ! @base.reload?
+  end
+
+  it 'is disabled if we are not in development' do
+    @base.set(:environment, :foo)
+    assert ! @base.reload
+
+    @default.set(:environment, :bar)
+    assert ! @default.reload
+  end
+end
+
+describe_option 'lock' do
+  it 'is enabled when reload is enabled' do
+    @base.enable(:reload)
+    assert @base.lock?
+
+    @default.enable(:reload)
+    assert @default.lock?
+  end
+
+  it 'is disabled when reload is disabled' do
+    @base.disable(:reload)
+    assert ! @base.lock?
+
+    @default.disable(:reload)
+    assert ! @default.lock?
+  end
+end

data/test/routing_test.rb

@@ -44,6 +44,27 @@ describe "Routing" do
     assert_equal 404, status
   end
 
+  it 'takes multiple definitions of a route' do
+    mock_app {
+      user_agent(/Foo/)
+      get '/foo' do
+        'foo'
+      end
+
+      get '/foo' do
+        'not foo'
+      end
+    }
+
+    get '/foo', {}, 'HTTP_USER_AGENT' => 'Foo'
+    assert ok?
+    assert_equal 'foo', body
+
+    get '/foo'
+    assert ok?
+    assert_equal 'not foo', body
+  end
+
   it "exposes params with indifferent hash" do
     mock_app {
       get '/:foo' do
@@ -139,6 +160,32 @@ describe "Routing" do
     assert ok?
   end
 
+  it "matches a dot ('.') as part of a named param" do
+    mock_app {
+      get '/:foo/:bar' do
+        params[:foo]
+      end
+    }
+
+    get '/user@example.com/name'
+    assert_equal 200, response.status
+    assert_equal 'user@example.com', body
+  end
+
+  it "matches a literal dot ('.') outside of named params" do
+    mock_app {
+      get '/:file.:ext' do
+        assert_equal 'pony', params[:file]
+        assert_equal 'jpg', params[:ext]
+        'right on'
+      end
+    }
+
+    get '/pony.jpg'
+    assert_equal 200, response.status
+    assert_equal 'right on', body
+  end
+
   it "literally matches . in paths" do
     route_def '/test.bar'
 
@@ -158,7 +205,7 @@ describe "Routing" do
   it "literally matches + in paths" do
     route_def '/te+st/'
 
-    get '/te+st/'
+    get '/te%2Bst/'
     assert ok?
     get '/teeeeeeest/'
     assert not_found?
@@ -243,7 +290,7 @@ describe "Routing" do
     assert_equal 'looks good', body
   end
 
-  it "supports paths that include spaces" do
+  it "matches paths that include spaces encoded with %20" do
     mock_app {
       get '/path with spaces' do
         'looks good'
@@ -255,6 +302,18 @@ describe "Routing" do
     assert_equal 'looks good', body
   end
 
+  it "matches paths that include spaces encoded with +" do
+    mock_app {
+      get '/path with spaces' do
+        'looks good'
+      end
+    }
+
+    get '/path+with+spaces'
+    assert ok?
+    assert_equal 'looks good', body
+  end
+
   it "URL decodes named parameters and splats" do
     mock_app {
       get '/:foo/*' do

data/test/test_test.rb

@@ -1,21 +1,138 @@
+require 'yaml'
 require File.dirname(__FILE__) + '/helper'
 
-describe "Sinatra::Test" do
-  it "support nested parameters" do
+describe 'Sinatra::Test' do
+  def request
+    YAML.load(body)
+  end
+
+  def request_body
+    request['test.body']
+  end
+
+  def request_params
+    YAML.load(request['test.params'])
+  end
+
+  before do
     mock_app {
+      %w[get head post put delete].each { |verb|
+        send(verb, '/') do
+          redirect '/redirected' if params[:redirect]
+          env.update('test.body'   => request.body.read)
+          env.update('test.params' => params.to_yaml)
+          env.to_yaml
+        end
+      }
+
+      get '/redirected' do
+        "you've been redirected"
+      end
+    }
+  end
+
+  it 'allows GET/HEAD/POST/PUT/DELETE' do
+    get '/'
+    assert_equal('GET', request['REQUEST_METHOD'])
+
+    post '/'
+    assert_equal('POST', request['REQUEST_METHOD'])
+
+    put '/'
+    assert_equal('PUT', request['REQUEST_METHOD'])
+
+    delete '/'
+    assert_equal('DELETE', request['REQUEST_METHOD'])
+
+    head '/'
+    assert_equal('596', response.headers['Content-Length'])
+    assert_equal('', response.body)
+  end
+
+  it 'allows to specify a body' do
+    post '/', '42'
+    assert_equal '42', request_body
+  end
+
+  it 'allows to specify params' do
+    get '/', :foo => 'bar'
+    assert_equal 'bar', request_params['foo']
+  end
+
+  it 'supports nested params' do
+    get '/', :foo => { :x => 'y', :chunky => 'bacon' }
+    assert_equal "y", request_params['foo']['x']
+    assert_equal "bacon", request_params['foo']['chunky']
+  end
+
+  it 'provides easy access to response status and body' do
+    get '/'
+    assert_equal 200, status
+    assert body =~ /^---/
+  end
+
+  it 'delegates methods to @response' do
+    get '/'
+    assert ok?
+  end
+
+  it 'follows redirect' do
+    get '/', :redirect => true
+    follow!
+    assert_equal "you've been redirected", body
+  end
+
+  it 'provides sugar for common HTTP headers' do
+    get '/', :env => { :accept => 'text/plain' }
+    assert_equal 'text/plain', request['HTTP_ACCEPT']
+
+    get '/', :env => { :agent => 'TATFT' }
+    assert_equal 'TATFT', request['HTTP_USER_AGENT']
+
+    get '/', :env => { :host => '1.2.3.4' }
+    assert_equal '1.2.3.4', request['HTTP_HOST']
+
+    get '/', :env => { :session => 'foo' }
+    assert_equal 'foo', request['rack.session']
+
+    get '/', :env => { :cookies => 'foo' }
+    assert_equal 'foo', request['HTTP_COOKIE']
+
+    get '/', :env => { :content_type => 'text/plain' }
+    assert_equal 'text/plain', request['CONTENT_TYPE']
+  end
+
+  it 'allow to test session easily' do
+    app = mock_app(Sinatra::Default) {
       get '/' do
-        params[:post][:title]
+        session['foo'] = 'bar'
+        200
       end
 
       post '/' do
-        params[:post][:content]
+        assert_equal 'bar', session['foo']
+        session['foo'] || "blah"
       end
     }
 
-    get '/', :post => { :title => 'My Post Title' }
-    assert_equal 'My Post Title', body
+    browser = Sinatra::TestHarness.new(app)
+    browser.get '/'
+    browser.post '/', {}, :session => { 'foo' => 'bar' }
+    assert_equal 'bar', browser.response.body
+  end
+
+  it 'yields the request object to the block before invoking the application' do
+    called = false
+    get '/' do |req|
+      called = true
+      assert req.kind_of?(Rack::MockRequest)
+    end
+    assert called
+  end
 
-    post '/', :post => { :content => 'Post Content' }
-    assert_equal 'Post Content', body
+  def test_TestHarness
+    session  = Sinatra::TestHarness.new(@app)
+    response = session.get('/')
+    assert_equal 200, response.status
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.9.0.5
+  version: 0.9.1
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,17 +9,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-10 00:00:00 -08:00
+date: 2009-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.9.1
+    - - <
+      - !ruby/object:Gem::Version 
+        version: "1.0"
     version: 
 description: Classy web-development dressed in a DSL
 email: sinatrarb@googlegroups.com