sinatra 1.3.0.e → 1.3.0.f

data/lib/sinatra/main.rb

@@ -16,7 +16,7 @@ module Sinatra
         op.on('-x')        {       set :lock, true }
         op.on('-e env')    { |val| set :environment, val.to_sym }
         op.on('-s server') { |val| set :server, val }
-        op.on('-p port')   { |val| set :port, val.to_i }
+        op.on('-p port')   { |val| set :port, Integer(val) }
         op.on('-o addr')   { |val| set :bind, val }
       }.parse!(ARGV.dup)
     end

data/lib/sinatra/showexceptions.rb

@@ -252,7 +252,7 @@ TEMPLATE = <<-HTML # :nodoc:
 
     <div id="get">
       <h3 id="get-info">GET</h3>
-      <% unless req.GET.empty? %>
+      <% if req.GET and not req.GET.empty? %>
         <table class="req">
           <tr>
             <th>Variable</th>
@@ -273,7 +273,7 @@ TEMPLATE = <<-HTML # :nodoc:
 
     <div id="post">
       <h3 id="post-info">POST</h3>
-      <% unless req.POST.empty? %>
+      <% if req.POST and not req.POST.empty? %>
         <table class="req">
           <tr>
             <th>Variable</th>

data/lib/sinatra/version.rb

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '1.3.0.e'
+  VERSION = '1.3.0.f'
 end

data/sinatra.gemspec

@@ -1,8 +1,9 @@
-load './lib/sinatra/version.rb'
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'sinatra/version'
 
 Gem::Specification.new 'sinatra', Sinatra::VERSION do |s|
-  s.description       = "Classy web-development dressed in a DSL"
-  s.summary           = s.description
+  s.description       = "Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort."
+  s.summary           = "Classy web-development dressed in a DSL"
   s.authors           = ["Blake Mizerany", "Ryan Tomayko", "Simon Rozet", "Konstantin Haase"]
   s.email             = "sinatrarb@googlegroups.com"
   s.homepage          = "http://www.sinatrarb.com/"
@@ -11,6 +12,7 @@ Gem::Specification.new 'sinatra', Sinatra::VERSION do |s|
   s.extra_rdoc_files  = s.files.select { |p| p =~ /^README/ } << 'LICENSE'
   s.rdoc_options      = %w[--line-numbers --inline-source --title Sinatra --main README.rdoc]
 
-  s.add_dependency 'rack', '~> 1.3'
-  s.add_dependency 'tilt', '~> 1.3'
+  s.add_dependency 'rack',            '~> 1.3'
+  s.add_dependency 'rack-protection', '~> 1.1'
+  s.add_dependency 'tilt',            '~> 1.3'
 end

data/test/contest.rb

@@ -1,38 +1,67 @@
+# Copyright (c) 2009 Damian Janowski and Michel Martens for Citrusbyte
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 require "test/unit"
 
-# Test::Unit loads a default test if the suite is empty, and the only
-# purpose of that test is to fail. As having empty contexts is a common
-# practice, we decided to overwrite TestSuite#empty? in order to
-# allow them. Having a failure when no tests have been defined seems
-# counter-intuitive.
+# Test::Unit loads a default test if the suite is empty, whose purpose is to
+# fail. Since having empty contexts is a common practice, we decided to
+# overwrite TestSuite#empty? in order to allow them. Having a failure when no
+# tests have been defined seems counter-intuitive.
 class Test::Unit::TestSuite
-  unless method_defined?(:empty?)
-    def empty?
-      false
-    end
+  def empty?
+    false
   end
 end
 
-# We added setup, test and context as class methods, and the instance
-# method setup now iterates on the setup blocks. Note that all setup
-# blocks must be defined with the block syntax. Adding a setup instance
-# method defeats the purpose of this library.
+# Contest adds +teardown+, +test+ and +context+ as class methods, and the
+# instance methods +setup+ and +teardown+ now iterate on the corresponding
+# blocks. Note that all setup and teardown blocks must be defined with the
+# block syntax. Adding setup or teardown instance methods defeats the purpose
+# of this library.
 class Test::Unit::TestCase
-  def self.setup(&block)
-    setup_blocks << block
+  def self.setup(&block)     setup_blocks    << block  end
+  def self.teardown(&block)  teardown_blocks << block  end
+  def self.setup_blocks()    @setup_blocks    ||= []   end
+  def self.teardown_blocks() @teardown_blocks ||= []   end
+
+  def setup_blocks(base = self.class)
+    setup_blocks base.superclass if base.superclass.respond_to? :setup_blocks
+    base.setup_blocks.each do |block|
+      instance_eval(&block)
+    end
   end
 
-  def setup
-    self.class.setup_blocks.each do |block|
+  def teardown_blocks(base = self.class)
+    teardown_blocks base.superclass if base.superclass.respond_to? :teardown_blocks
+    base.teardown_blocks.each do |block|
       instance_eval(&block)
     end
   end
 
-  def self.context(name, &block)
-    subclass = Class.new(self.superclass)
-    subclass.setup_blocks.unshift(*setup_blocks)
-    subclass.class_eval(&block)
-    const_set(context_name(name), subclass)
+  alias setup setup_blocks
+  alias teardown teardown_blocks
+
+  def self.context(*name, &block)
+    subclass = Class.new(self)
+    remove_tests(subclass)
+    subclass.class_eval(&block) if block_given?
+    const_set(context_name(name.join(" ")), subclass)
   end
 
   def self.test(name, &block)
@@ -46,12 +75,10 @@ class Test::Unit::TestCase
 
 private
 
-  def self.setup_blocks
-    @setup_blocks ||= []
-  end
-
   def self.context_name(name)
-    "Test#{sanitize_name(name).gsub(/(^| )(\w)/) { $2.upcase }}".to_sym
+    # "Test#{sanitize_name(name).gsub(/(^| )(\w)/) { $2.upcase }}".to_sym
+    name = "Test#{sanitize_name(name).gsub(/(^| )(\w)/) { $2.upcase }}"
+    name.tr(" ", "_").to_sym
   end
 
   def self.test_name(name)
@@ -59,6 +86,13 @@ private
   end
 
   def self.sanitize_name(name)
-    name.gsub(/\W+/, ' ').strip
+    # name.gsub(/\W+/, ' ').strip
+    name.gsub(/\W+/, ' ')
+  end
+
+  def self.remove_tests(subclass)
+    subclass.public_instance_methods.grep(/^test_/).each do |meth|
+      subclass.send(:undef_method, meth.to_sym)
+    end
   end
 end

data/test/filter_test.rb

@@ -114,7 +114,7 @@ class BeforeFilterTest < Test::Unit::TestCase
     mock_app {
       before { ran_filter = true }
       set :static, true
-      set :public, File.dirname(__FILE__)
+      set :public_folder, File.dirname(__FILE__)
     }
     get "/#{File.basename(__FILE__)}"
     assert ok?
@@ -237,7 +237,7 @@ class AfterFilterTest < Test::Unit::TestCase
     mock_app {
       after { ran_filter = true }
       set :static, true
-      set :public, File.dirname(__FILE__)
+      set :public_folder, File.dirname(__FILE__)
     }
     get "/#{File.basename(__FILE__)}"
     assert ok?

data/test/helpers_test.rb

@@ -6,22 +6,117 @@ class HelpersTest < Test::Unit::TestCase
     assert true
   end
 
-  describe 'status' do
-    setup do
-      mock_app {
-        get '/' do
-          status 207
-          nil
-        end
-      }
+  def status_app(code, &block)
+    code += 2 if [204, 205, 304].include? code
+    block ||= proc { }
+    mock_app do
+      get '/' do
+        status code
+        instance_eval(&block).inspect
+      end
     end
+    get '/'
+  end
 
+  describe 'status' do
     it 'sets the response status code' do
-      get '/'
+      status_app 207
       assert_equal 207, response.status
     end
   end
 
+  describe 'not_found?' do
+    it 'is true for status == 404' do
+      status_app(404) { not_found? }
+      assert_body 'true'
+    end
+
+    it 'is false for status > 404' do
+      status_app(405) { not_found? }
+      assert_body 'false'
+    end
+
+    it 'is false for status < 404' do
+      status_app(403) { not_found? }
+      assert_body 'false'
+    end
+  end
+
+  describe 'informational?' do
+    it 'is true for 1xx status' do
+      status_app(100 + rand(100)) { informational? }
+      assert_body 'true'
+    end
+
+    it 'is false for status > 199' do
+      status_app(200 + rand(400)) { informational? }
+      assert_body 'false'
+    end
+  end
+
+  describe 'success?' do
+    it 'is true for 2xx status' do
+      status_app(200 + rand(100)) { success? }
+      assert_body 'true'
+    end
+
+    it 'is false for status < 200' do
+      status_app(100 + rand(100)) { success? }
+      assert_body 'false'
+    end
+
+    it 'is false for status > 299' do
+      status_app(300 + rand(300)) { success? }
+      assert_body 'false'
+    end
+  end
+
+  describe 'redirect?' do
+    it 'is true for 3xx status' do
+      status_app(300 + rand(100)) { redirect? }
+      assert_body 'true'
+    end
+
+    it 'is false for status < 300' do
+      status_app(200 + rand(100)) { redirect? }
+      assert_body 'false'
+    end
+
+    it 'is false for status > 399' do
+      status_app(400 + rand(200)) { redirect? }
+      assert_body 'false'
+    end
+  end
+
+  describe 'client_error?' do
+    it 'is true for 4xx status' do
+      status_app(400 + rand(100)) { client_error? }
+      assert_body 'true'
+    end
+
+    it 'is false for status < 400' do
+      status_app(200 + rand(200)) { client_error? }
+      assert_body 'false'
+    end
+
+    it 'is false for status > 499' do
+      status_app(500 + rand(100)) { client_error? }
+      assert_body 'false'
+    end
+  end
+
+  describe 'server_error?' do
+    it 'is true for 5xx status' do
+      status_app(500 + rand(100)) { server_error? }
+      assert_body 'true'
+    end
+
+    it 'is false for status < 500' do
+      status_app(200 + rand(300)) { server_error? }
+      assert_body 'false'
+    end
+  end
+
   describe 'body' do
     it 'takes a block for defered body generation' do
       mock_app {
@@ -112,6 +207,22 @@ class HelpersTest < Test::Unit::TestCase
       assert_equal 'http://example.org:444/foo', response['Location']
     end
 
+    it 'uses 303 for post requests if request is HTTP 1.1' do
+      mock_app { post('/') { redirect '/'} }
+      post '/', {}, 'HTTP_VERSION' => 'HTTP/1.1'
+      assert_equal 303, status
+      assert_equal '', body
+      assert_equal 'http://example.org/', response['Location']
+    end
+
+    it 'uses 302 for post requests if request is HTTP 1.0' do
+      mock_app { post('/') { redirect '/'} }
+      post '/', {}, 'HTTP_VERSION' => 'HTTP/1.0'
+      assert_equal 302, status
+      assert_equal '', body
+      assert_equal 'http://example.org/', response['Location']
+    end
+
     it 'works behind a reverse proxy' do
       mock_app do
         get '/' do
@@ -269,7 +380,7 @@ class HelpersTest < Test::Unit::TestCase
         enable :sessions
 
         get '/' do
-          assert session.empty?
+          assert session[:foo].nil?
           session[:foo] = 'bar'
           redirect '/hi'
         end
@@ -481,6 +592,45 @@ class HelpersTest < Test::Unit::TestCase
     end
   end
 
+  describe 'attachment' do
+    def attachment_app(filename=nil)
+      mock_app {       
+        get '/attachment' do
+          attachment filename
+          response.write("<sinatra></sinatra>")
+        end
+      }
+    end
+    
+    it 'sets the Content-Type response header' do
+      attachment_app('test.xml')
+      get '/attachment'
+      assert_equal 'application/xml;charset=utf-8', response['Content-Type']
+      assert_equal '<sinatra></sinatra>', body
+    end 
+    
+    it 'sets the Content-Type response header without extname' do
+      attachment_app('test')
+      get '/attachment'
+      assert_equal 'text/html;charset=utf-8', response['Content-Type']
+      assert_equal '<sinatra></sinatra>', body   
+    end
+    
+    it 'sets the Content-Type response header without extname' do
+      mock_app do
+        get '/attachment' do
+          content_type :atom
+          attachment 'test.xml'
+          response.write("<sinatra></sinatra>")
+        end
+      end
+      get '/attachment'
+      assert_equal 'application/atom+xml', response['Content-Type']
+      assert_equal '<sinatra></sinatra>', body   
+    end
+    
+  end
+
   describe 'send_file' do
     setup do
       @file = File.dirname(__FILE__) + '/file.txt'
@@ -663,7 +813,7 @@ class HelpersTest < Test::Unit::TestCase
         end
 
         get '/boom' do
-          expires '1000'
+          expires '9999'
         end
       end
     end
@@ -719,7 +869,7 @@ class HelpersTest < Test::Unit::TestCase
             end
           end
           wrapper = Object.new.extend Sinatra::Helpers
-          @last_modified_time = wrapper.send :time_for, last_modified_time
+          @last_modified_time = wrapper.time_for last_modified_time
         end
 
         # fixes strange missing test error when running complete test suite.
@@ -817,6 +967,11 @@ class HelpersTest < Test::Unit::TestCase
           etag 'FOO'
           'Boo!'
         end
+
+        post '/' do
+          etag 'FOO'
+          'Matches!'
+        end
       }
     end
 
@@ -831,6 +986,24 @@ class HelpersTest < Test::Unit::TestCase
       assert_equal 'Boo!', body
     end
 
+    it 'returns a body when posting with no If-None-Match header' do
+      post '/'
+      assert_equal 200, status
+      assert_equal 'Matches!', body
+    end
+
+    it 'returns a body when conditional post matches' do
+      post '/', {}, { 'HTTP_IF_NONE_MATCH' => '"FOO"' }
+      assert_equal 200, status
+      assert_equal 'Matches!', body
+    end
+
+    it 'halts with 412 when conditional post misses' do
+      post '/', {}, { 'HTTP_IF_NONE_MATCH' => '"BAR"' }
+      assert_equal 412, status
+      assert_equal '', body
+    end
+
     it 'halts when a conditional GET matches' do
       get '/', {}, { 'HTTP_IF_NONE_MATCH' => '"FOO"' }
       assert_equal 304, status