sinatra 0.1.7 → 0.2.0

data/test/helper.rb

@@ -1,17 +1,4 @@
-require File.dirname(__FILE__) + '/../lib/sinatra'
+require File.dirname(__FILE__) + "/../lib/sinatra"
+require File.dirname(__FILE__) + "/../lib/sinatra/test/spec"
 
-%w(mocha test/spec).each do |library|
-  begin
-    require library
-  rescue
-    STDERR.puts "== Sinatra's tests need #{library} to run."
-  end
-end
-
-Sinatra::Server.running = true
-Sinatra::Options.set_environment :test
-Sinatra::Environment.prepare_loggers
-
-class Test::Unit::TestCase
-  include Sinatra::TestMethods
-end
+require "mocha"

data/test/mapped_error_test.rb

@@ -0,0 +1,61 @@
+require File.dirname(__FILE__) + '/helper'
+
+class FooError < RuntimeError; end
+
+context "Mapped errors" do
+  
+  setup do
+    Sinatra.application = nil
+  end
+  
+  specify "are rescued and run in context" do
+    
+    error FooError do
+      'MAPPED ERROR!'
+    end
+    
+    get '/' do
+      raise FooError.new
+    end
+    
+    get_it '/'
+    
+    should.be.server_error
+    body.should.equal 'MAPPED ERROR!'
+          
+  end
+
+  specify "renders empty if no each method on result" do
+    
+    error FooError do
+      nil
+    end
+    
+    get '/' do
+      raise FooError.new
+    end
+    
+    get_it '/'
+    
+    should.be.server_error
+    body.should.be.empty
+          
+  end
+
+  specify "doesn't override status if set" do
+    
+    error FooError do
+      status(200)
+    end
+    
+    get '/' do
+      raise FooError.new
+    end
+    
+    get_it '/'
+    
+    should.be.ok
+          
+  end
+  
+end

data/test/public/foo.xml

@@ -0,0 +1 @@
+<foo></foo>

data/test/rest_test.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "RESTful tests" do
+
+  specify "should take xml" do
+    post '/foo.xml' do
+      request.body.string
+    end
+    
+    post_it '/foo.xml', '<myxml></myxml>'
+    assert ok?
+    assert_equal('<myxml></myxml>', body)
+  end
+
+end
+

data/test/sass_test.rb

@@ -0,0 +1,57 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Sass" do
+
+  setup do
+    Sinatra.application = nil
+  end
+  
+  context "Templates (in general)" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "are read from files if Symbols" do
+
+      get '/from_file' do
+        sass :foo, :views_directory => File.dirname(__FILE__) + "/views"
+      end
+
+      get_it '/from_file'
+      should.be.ok
+      body.should.equal "#sass {\n  background_color: #FFF; }\n"
+
+    end
+    
+    specify "raise an error if template not found" do
+      get '/' do
+        sass :not_found
+      end
+
+      lambda { get_it '/' }.should.raise(Errno::ENOENT)
+    end
+    
+    specify "ignore default layout file with .sass extension" do
+      get '/' do
+        sass :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
+      end
+      
+      get_it '/'
+      should.be.ok
+      body.should.equal "#sass {\n  background_color: #FFF; }\n"
+    end
+    
+    specify "ignore explicitly specified layout file" do
+      get '/' do
+        sass :foo, :layout => :layout, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
+      end
+      
+      get_it '/'
+      should.be.ok
+      body.should.equal "#sass {\n  background_color: #FFF; }\n"
+    end
+    
+  end
+
+end

data/test/sessions_test.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Sessions" do
+  
+  specify "should be off by default" do
+    Sinatra.application = nil
+
+    get '/asdf' do
+      session[:test] = true
+      "asdf"
+    end
+
+    get '/test' do
+      session[:test] == true ? "true" : "false"
+    end
+    
+    get_it '/asdf', {}, 'HTTP_HOST' => 'foo.sinatrarb.com'
+    assert ok?
+    assert !include?('Set-Cookie')
+  end
+  
+  specify "should be able to store data accross requests" do
+    set_options(:sessions => true)
+    Sinatra.application = nil
+
+    get '/foo' do
+      session[:test] = true
+      "asdf"
+    end
+
+    get '/bar' do
+      session[:test] == true ? "true" : "false"
+    end
+
+    get_it '/foo', :env => { :host => 'foo.sinatrarb.com' }
+    assert ok?
+    assert include?('Set-Cookie')    
+  end
+  
+end

data/test/streaming_test.rb

@@ -0,0 +1,112 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Static files (by default)" do
+
+  setup do
+    Sinatra.application = nil
+    Sinatra.application.options.public = File.dirname(__FILE__) + '/public'
+  end
+
+  specify "are served from root/public" do
+    get_it '/foo.xml'
+    should.be.ok
+    headers['Content-Length'].should.equal '12'
+    headers['Content-Type'].should.equal 'application/xml'
+    body.should.equal "<foo></foo>\n"
+  end
+
+  specify "are not served when verb is not GET or HEAD" do
+    post_it '/foo.xml'
+    # these should actually be giving back a 405 Method Not Allowed but that
+    # complicates the routing logic quite a bit.
+    should.be.not_found
+    status.should.equal 404
+  end
+
+  specify "are served when verb is HEAD but missing a body" do
+    head_it '/foo.xml'
+    should.be.ok
+    headers['Content-Length'].should.equal '12'
+    headers['Content-Type'].should.equal 'application/xml'
+    body.should.equal ""
+  end
+
+  # static files override dynamic/internal events and ...
+  specify "are served when conflicting events exists" do
+    get '/foo.xml' do
+      'this is not foo.xml!'
+    end
+    get_it '/foo.xml'
+    should.be.ok
+    body.should.equal "<foo></foo>\n"
+  end
+
+  specify "are irrelevant when request_method is not GET/HEAD" do
+    put '/foo.xml' do
+      'putted!'
+    end
+    put_it '/foo.xml'
+    should.be.ok
+    body.should.equal 'putted!'
+
+    get_it '/foo.xml'
+    should.be.ok
+    body.should.equal "<foo></foo>\n"
+  end
+
+  specify "include a Last-Modified header" do
+    last_modified = File.mtime(Sinatra.application.options.public + '/foo.xml')
+    get_it('/foo.xml')
+    should.be.ok
+    body.should.not.be.empty
+    headers['Last-Modified'].should.equal last_modified.httpdate
+  end
+
+  specify "are not served when If-Modified-Since matches" do
+    last_modified = File.mtime(Sinatra.application.options.public + '/foo.xml')
+    @request = Rack::MockRequest.new(Sinatra.application)
+    @response = @request.get('/foo.xml', 'HTTP_IF_MODIFIED_SINCE' => last_modified.httpdate)
+    status.should.equal 304
+    body.should.be.empty
+  end
+
+  specify "should omit Content-Disposition headers" do
+    get_it('/foo.xml')
+    should.be.ok
+    headers['Content-Disposition'].should.be.nil
+    headers['Content-Transfer-Encoding'].should.be.nil
+  end
+
+end
+
+context "SendData" do
+  
+  setup do
+    Sinatra.application = nil
+  end
+
+  specify "should send the data with options" do
+    get '/' do
+      send_data 'asdf', :status => 500
+    end
+  
+    get_it '/'
+  
+    should.be.server_error
+    body.should.equal 'asdf'
+  end
+  
+  specify "should include a Content-Disposition header" do
+    get '/' do
+      send_file File.dirname(__FILE__) + '/public/foo.xml'
+    end
+
+    get_it '/'
+
+    should.be.ok
+    headers['Content-Disposition'].should.not.be.nil
+    headers['Content-Disposition'].should.equal 'attachment; filename="foo.xml"'
+    headers['Content-Transfer-Encoding'].should.equal 'binary'
+  end
+
+end

data/test/sym_params_test.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Symbol Params" do
+
+  setup do
+    Sinatra.application = nil
+  end
+
+  specify "should be accessable as Strings or Symbols" do
+    get '/' do
+      params[:foo] + params['foo']
+    end
+    
+    get_it '/', :foo => "X"
+    assert_equal('XX', body)
+  end
+
+end
+

data/test/template_test.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Templates (in general)" do
+  
+  specify "are read from files if Symbols" do
+    
+    get '/from_file' do
+      @name = 'Alena'
+      erb :foo, :views_directory => File.dirname(__FILE__) + "/views"
+    end
+    
+    get_it '/from_file'
+    
+    body.should.equal 'You rock Alena!'
+    
+  end
+  
+  specify "use layout.ext by default if available" do
+    
+    get '/layout_from_file' do
+      erb :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
+    end
+    
+    get_it '/layout_from_file'
+    should.be.ok
+    body.should.equal "x This is foo! x \n"
+    
+  end
+  
+end

data/test/use_in_file_templates_test.rb

@@ -0,0 +1,48 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Rendering in file templates" do
+
+  setup do
+    Sinatra.application = nil
+    use_in_file_templates!
+  end
+  
+  specify "should set template" do
+    assert Sinatra.application.templates[:foo]
+  end
+  
+  specify "should set layout" do
+    assert Sinatra.application.templates[:layout]
+  end
+  
+  specify "should render without layout if specified" do
+    get '/' do
+      haml :foo, :layout => false
+    end
+    
+    get_it '/'
+    assert_equal "this is foo\n", body
+  end
+    
+  specify "should render with layout if specified" do
+    get '/' do
+      haml :foo
+    end
+    
+    get_it '/'
+    assert_equal "X\nthis is foo\nX\n", body
+  end
+  
+    
+end
+
+__END__
+
+## foo
+this is foo
+
+## layout
+X
+= yield
+X
+

data/test/views/foo.builder

@@ -0,0 +1 @@
+xml.exclaim "You rock #{@name}!"

data/test/views/foo.erb

@@ -0,0 +1 @@
+You rock <%= @name %>!

data/test/views/foo.haml

@@ -0,0 +1 @@
+== You rock #{@name}!

data/test/views/foo.sass

@@ -0,0 +1,2 @@
+#sass
+  :background_color #FFF

data/test/views/foo_layout.erb

@@ -0,0 +1,2 @@
+<%= @title %>
+Hi <%= yield %>

data/test/views/foo_layout.haml

@@ -0,0 +1,2 @@
+== #{@title}
+== Hi #{yield}

data/test/views/layout_test/foo.builder

@@ -0,0 +1 @@
+xml.this "is foo!"

data/test/views/layout_test/foo.erb

@@ -0,0 +1 @@
+This is foo!

data/test/views/layout_test/foo.haml

@@ -0,0 +1 @@
+This is foo!