sinatra 1.3.0.d → 1.3.0.e

data/lib/sinatra/version.rb

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

data/sinatra.gemspec

@@ -1,132 +1,16 @@
-Gem::Specification.new do |s|
-  s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+load './lib/sinatra/version.rb'
 
-  s.name = 'sinatra'
-  s.version = '1.3.0.d'
-  s.date = '2011-04-30'
+Gem::Specification.new 'sinatra', Sinatra::VERSION do |s|
+  s.description       = "Classy web-development dressed in a DSL"
+  s.summary           = s.description
+  s.authors           = ["Blake Mizerany", "Ryan Tomayko", "Simon Rozet", "Konstantin Haase"]
+  s.email             = "sinatrarb@googlegroups.com"
+  s.homepage          = "http://www.sinatrarb.com/"
+  s.files             = `git ls-files`.split("\n")
+  s.test_files        = s.files.select { |p| p =~ /^test\/.*_test.rb/ }
+  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.description = "Classy web-development dressed in a DSL"
-  s.summary     = "Classy web-development dressed in a DSL"
-
-  s.authors = ["Blake Mizerany", "Ryan Tomayko", "Simon Rozet", "Konstantin Haase"]
-  s.email = "sinatrarb@googlegroups.com"
-
-  # = MANIFEST =
-  s.files = %w[
-    AUTHORS
-    CHANGES
-    Gemfile
-    LICENSE
-    README.de.rdoc
-    README.es.rdoc
-    README.fr.rdoc
-    README.hu.rdoc
-    README.jp.rdoc
-    README.pt-br.rdoc
-    README.pt-pt.rdoc
-    README.rdoc
-    README.ru.rdoc
-    README.zh.rdoc
-    Rakefile
-    lib/sinatra.rb
-    lib/sinatra/base.rb
-    lib/sinatra/images/404.png
-    lib/sinatra/images/500.png
-    lib/sinatra/main.rb
-    lib/sinatra/rack.rb
-    lib/sinatra/showexceptions.rb
-    sinatra.gemspec
-    test/base_test.rb
-    test/builder_test.rb
-    test/coffee_test.rb
-    test/contest.rb
-    test/creole_test.rb
-    test/delegator_test.rb
-    test/encoding_test.rb
-    test/erb_test.rb
-    test/extensions_test.rb
-    test/filter_test.rb
-    test/haml_test.rb
-    test/helper.rb
-    test/helpers_test.rb
-    test/less_test.rb
-    test/liquid_test.rb
-    test/mapped_error_test.rb
-    test/markaby_test.rb
-    test/markdown_test.rb
-    test/middleware_test.rb
-    test/nokogiri_test.rb
-    test/public/favicon.ico
-    test/radius_test.rb
-    test/rdoc_test.rb
-    test/request_test.rb
-    test/response_test.rb
-    test/result_test.rb
-    test/route_added_hook_test.rb
-    test/routing_test.rb
-    test/sass_test.rb
-    test/scss_test.rb
-    test/server_test.rb
-    test/settings_test.rb
-    test/sinatra_test.rb
-    test/slim_test.rb
-    test/static_test.rb
-    test/templates_test.rb
-    test/textile_test.rb
-    test/views/a/in_a.str
-    test/views/ascii.erb
-    test/views/b/in_b.str
-    test/views/calc.html.erb
-    test/views/error.builder
-    test/views/error.erb
-    test/views/error.haml
-    test/views/error.sass
-    test/views/explicitly_nested.str
-    test/views/foo/hello.test
-    test/views/hello.builder
-    test/views/hello.coffee
-    test/views/hello.creole
-    test/views/hello.erb
-    test/views/hello.haml
-    test/views/hello.less
-    test/views/hello.liquid
-    test/views/hello.mab
-    test/views/hello.md
-    test/views/hello.nokogiri
-    test/views/hello.radius
-    test/views/hello.rdoc
-    test/views/hello.sass
-    test/views/hello.scss
-    test/views/hello.slim
-    test/views/hello.str
-    test/views/hello.test
-    test/views/hello.textile
-    test/views/layout2.builder
-    test/views/layout2.erb
-    test/views/layout2.haml
-    test/views/layout2.liquid
-    test/views/layout2.mab
-    test/views/layout2.nokogiri
-    test/views/layout2.radius
-    test/views/layout2.slim
-    test/views/layout2.str
-    test/views/layout2.test
-    test/views/nested.str
-    test/views/utf8.erb
-  ]
-  # = MANIFEST =
-
-  s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
-
-  s.extra_rdoc_files = %w[README.rdoc README.de.rdoc README.jp.rdoc README.fr.rdoc README.es.rdoc README.hu.rdoc README.zh.rdoc LICENSE]
-  s.add_dependency 'rack', '~> 1.2'
+  s.add_dependency 'rack', '~> 1.3'
   s.add_dependency 'tilt', '~> 1.3'
-  s.add_development_dependency 'shotgun', '~> 0.6'
-
-  s.homepage = "http://sinatra.rubyforge.org"
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Sinatra", "--main", "README.rdoc"]
-  s.require_paths = %w[lib]
-  s.rubyforge_project = 'sinatra'
-  s.rubygems_version = '1.1.1'
 end

data/test/base_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class BaseTest < Test::Unit::TestCase
   def test_default

data/test/builder_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 begin
 require 'builder'

data/test/coffee_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 begin
 require 'coffee-script'

data/test/creole_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 begin
 require 'creole'

data/test/delegator_test.rb

@@ -1,3 +1,5 @@
+require File.expand_path('../helper', __FILE__)
+
 class DelegatorTest < Test::Unit::TestCase
   class Mirror
     attr_reader :last_call
@@ -10,18 +12,18 @@ class DelegatorTest < Test::Unit::TestCase
   def self.delegates(name)
     it "delegates #{name}" do
       m = mirror { send name }
-      assert_equal m.last_call, [name.to_s]
+      assert_equal [name.to_s], m.last_call
     end
 
     it "delegates #{name} with arguments" do
       m = mirror { send name, "foo", "bar" }
-      assert_equal m.last_call, [name.to_s, "foo", "bar"]
+      assert_equal [name.to_s, "foo", "bar"], m.last_call
     end
 
     it "delegates #{name} with block" do
       block = proc { }
       m = mirror { send(name, &block) }
-      assert_equal m.last_call, [name.to_s, block]
+      assert_equal [name.to_s, block], m.last_call
     end
   end
 
@@ -55,7 +57,7 @@ class DelegatorTest < Test::Unit::TestCase
   end
 
   it 'defaults to Sinatra::Application as target' do
-    assert_equal Sinatra::Delegator.target, Sinatra::Application
+    assert_equal Sinatra::Application, Sinatra::Delegator.target
   end
 
   %w[get put post delete options patch].each do |verb|
@@ -91,19 +93,19 @@ class DelegatorTest < Test::Unit::TestCase
   it "registers extensions with the delegation target" do
     app, mixin = mirror, Module.new
     Sinatra.register mixin
-    assert_equal app.last_call, ["register", mixin.to_s ]
+    assert_equal ["register", mixin.to_s], app.last_call
   end
 
   it "registers helpers with the delegation target" do
     app, mixin = mirror, Module.new
     Sinatra.helpers mixin
-    assert_equal app.last_call, ["helpers", mixin.to_s ]
+    assert_equal ["helpers", mixin.to_s], app.last_call
   end
 
   it "registers helpers with the delegation target" do
     app, mixin = mirror, Module.new
     Sinatra.use mixin
-    assert_equal app.last_call, ["use", mixin.to_s ]
+    assert_equal ["use", mixin.to_s], app.last_call
   end
 
   it "should work with method_missing proxies for options" do

data/test/encoding_test.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 require 'erb'
 
 class BaseTest < Test::Unit::TestCase

data/test/erb_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class ERBTest < Test::Unit::TestCase
   def engine

data/test/extensions_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class ExtensionsTest < Test::Unit::TestCase
   module FooExtensions

data/test/filter_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class BeforeFilterTest < Test::Unit::TestCase
   it "executes filters in the order defined" do
@@ -221,9 +221,12 @@ class AfterFilterTest < Test::Unit::TestCase
     count = 2
     base = Class.new(Sinatra::Base)
     base.after { count *= 2 }
-    mock_app(base) {
-      get('/foo') { count += 2 }
-    }
+    mock_app(base) do
+      get('/foo') do
+        count += 2
+        "ok"
+      end
+    end
 
     get '/foo'
     assert_equal 8, count

data/test/haml_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 begin
 require 'haml'

data/test/helper.rb

@@ -38,6 +38,13 @@ class Test::Unit::TestCase
 
   class << self
     alias_method :it, :test
+    alias_method :section, :context
+  end
+
+  def self.example(desc = nil, &block)
+    @example_count = 0 unless instance_variable_defined? :@example_count
+    @example_count += 1
+    it(desc || "Example #{@example_count}", &block)
   end
 
   alias_method :response, :last_response
@@ -66,7 +73,7 @@ class Test::Unit::TestCase
   end
 
   def assert_like(a,b)
-    pattern = /\s*\n\s*| id=['"][^"']*["']/
+    pattern = /id=['"][^"']*["']|\s+/
     assert_equal a.strip.gsub(pattern, ""), b.strip.gsub(pattern, "")
   end
 
@@ -74,6 +81,14 @@ class Test::Unit::TestCase
     assert str.include?(substr), "expected #{str.inspect} to include #{substr.inspect}"
   end
 
+  def options(uri, params = {}, env = {}, &block)
+    request(uri, env.merge(:method => "OPTIONS", :params => params), &block)
+  end
+
+  def patch(uri, params = {}, env = {}, &block)
+    request(uri, env.merge(:method => "PATCH", :params => params), &block)
+  end
+
   # Delegate other missing methods to response.
   def method_missing(name, *args, &block)
     if response && response.respond_to?(name)

data/test/helpers_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 require 'date'
 
 class HelpersTest < Test::Unit::TestCase
@@ -446,6 +446,7 @@ class HelpersTest < Test::Unit::TestCase
           assert_equal content_type(:xml),    'application/xml;charset=utf-8'
           assert_equal content_type(:xhtml),  'application/xhtml+xml;charset=utf-8'
           assert_equal content_type(:js),     'application/javascript;charset=utf-8'
+          assert_equal content_type(:json),   'application/json;charset=utf-8'
           assert_equal content_type(:bar),    'application/bar'
           assert_equal content_type(:png),    'image/png'
           assert_equal content_type(:baz),    'application/baz;charset=utf-8'
@@ -852,6 +853,16 @@ class HelpersTest < Test::Unit::TestCase
       get '/'
       assert_equal 'W/"FOO"', response['ETag']
     end
+
+    it 'raises an ArgumentError for an invalid strength' do
+      mock_app do
+        get '/' do
+          etag 'FOO', :w00t
+          "that's weak, dude."
+        end
+      end
+      assert_raise(ArgumentError) { get '/' }
+    end
   end
 
   describe 'back' do

data/test/less_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 begin
 require 'less'

data/test/liquid_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 begin
 require 'liquid'

data/test/mapped_error_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class FooError < RuntimeError
 end
@@ -39,6 +39,36 @@ class MappedErrorTest < Test::Unit::TestCase
       assert_equal 'Exception!', body
     end
 
+    it 'walks down inheritance chain for errors' do
+      mock_app {
+        set :raise_errors, false
+        error(RuntimeError) { 'Exception!' }
+        get '/' do
+          raise FooError
+        end
+      }
+
+      get '/'
+      assert_equal 500, status
+      assert_equal 'Exception!', body
+    end
+
+    it 'favors subclass handler over superclass handler if available' do
+      mock_app {
+        set :raise_errors, false
+        error(Exception) { 'Exception!' }
+        error(FooError) { 'FooError!' }
+        error(RuntimeError) { 'Exception!' }
+        get '/' do
+          raise FooError
+        end
+      }
+
+      get '/'
+      assert_equal 500, status
+      assert_equal 'FooError!', body
+    end
+
     it "sets env['sinatra.error'] to the rescued exception" do
       mock_app {
         set :raise_errors, false
@@ -172,6 +202,19 @@ class MappedErrorTest < Test::Unit::TestCase
       assert_equal 'Error: 507', body
     end
 
+    it 'allows passing more than one range' do
+      mock_app {
+        set :raise_errors, false
+        error(409..411, 503..509) { "Error: #{response.status}" }
+        get '/' do
+          [507, {}, 'A very special error']
+        end
+      }
+      get '/'
+      assert_equal 507, status
+      assert_equal 'Error: 507', body
+    end
+
     class FooError < RuntimeError
     end
 

data/test/markaby_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 begin
 require 'markaby'

data/test/markdown_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 MarkdownTest = proc do
   def markdown_app(&block)

data/test/middleware_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class MiddlewareTest < Test::Unit::TestCase
   setup do