darkhelmet-sinatra 0.9.1.1 → 0.10.1

data/sinatra.gemspec

@@ -2,14 +2,14 @@ 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=
 
-  s.name = 'sinatra'
-  s.version = '0.9.1.1'
-  s.date = '2009-03-09'
+  s.name = 'darkhelmet-sinatra'
+  s.version = '0.10.1'
+  s.date = '2009-12-13'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
 
-  s.authors = ["Blake Mizerany"]
+  s.authors = ["Blake Mizerany", "Ryan Tomayko", "Simon Rozet"]
   s.email = "sinatrarb@googlegroups.com"
 
   # = MANIFEST =
@@ -17,59 +17,22 @@ Gem::Specification.new do |s|
     AUTHORS
     CHANGES
     LICENSE
+    README.jp.rdoc
     README.rdoc
     Rakefile
-    compat/app_test.rb
-    compat/application_test.rb
-    compat/builder_test.rb
-    compat/compat_test.rb
-    compat/custom_error_test.rb
-    compat/erb_test.rb
-    compat/events_test.rb
-    compat/filter_test.rb
-    compat/haml_test.rb
-    compat/helper.rb
-    compat/mapped_error_test.rb
-    compat/pipeline_test.rb
-    compat/public/foo.xml
-    compat/sass_test.rb
-    compat/sessions_test.rb
-    compat/streaming_test.rb
-    compat/sym_params_test.rb
-    compat/template_test.rb
-    compat/use_in_file_templates_test.rb
-    compat/views/foo.builder
-    compat/views/foo.erb
-    compat/views/foo.haml
-    compat/views/foo.sass
-    compat/views/foo_layout.erb
-    compat/views/foo_layout.haml
-    compat/views/layout_test/foo.builder
-    compat/views/layout_test/foo.erb
-    compat/views/layout_test/foo.haml
-    compat/views/layout_test/foo.sass
-    compat/views/layout_test/layout.builder
-    compat/views/layout_test/layout.erb
-    compat/views/layout_test/layout.haml
-    compat/views/layout_test/layout.sass
-    compat/views/no_layout/no_layout.builder
-    compat/views/no_layout/no_layout.haml
     lib/sinatra.rb
     lib/sinatra/base.rb
-    lib/sinatra/compat.rb
     lib/sinatra/images/404.png
     lib/sinatra/images/500.png
     lib/sinatra/main.rb
-    lib/sinatra/test.rb
-    lib/sinatra/test/bacon.rb
-    lib/sinatra/test/rspec.rb
-    lib/sinatra/test/spec.rb
-    lib/sinatra/test/unit.rb
+    lib/sinatra/showexceptions.rb
+    lib/sinatra/tilt.rb
     sinatra.gemspec
     test/base_test.rb
     test/builder_test.rb
-    test/data/reload_app_file.rb
+    test/contest.rb
     test/erb_test.rb
+    test/erubis_test.rb
     test/extensions_test.rb
     test/filter_test.rb
     test/haml_test.rb
@@ -77,25 +40,31 @@ Gem::Specification.new do |s|
     test/helpers_test.rb
     test/mapped_error_test.rb
     test/middleware_test.rb
-    test/options_test.rb
-    test/reload_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/server_test.rb
     test/sinatra_test.rb
     test/static_test.rb
     test/templates_test.rb
-    test/test_test.rb
+    test/views/error.builder
+    test/views/error.erb
+    test/views/error.erubis
+    test/views/error.haml
+    test/views/error.sass
+    test/views/foo/hello.test
     test/views/hello.builder
     test/views/hello.erb
+    test/views/hello.erubis
     test/views/hello.haml
     test/views/hello.sass
     test/views/hello.test
     test/views/layout2.builder
     test/views/layout2.erb
+    test/views/layout2.erubis
     test/views/layout2.haml
     test/views/layout2.test
   ]
@@ -104,8 +73,9 @@ Gem::Specification.new do |s|
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
 
   s.extra_rdoc_files = %w[README.rdoc LICENSE]
-  s.add_dependency 'rack', '>= 0.9.1'
-  s.add_dependency 'rack', '>= 0.9.1', '< 1.0'
+  s.add_dependency 'rack',    '>= 1.0'
+  s.add_development_dependency 'shotgun', '>= 0.3',   '< 1.0'
+  s.add_development_dependency 'rack-test', '>= 0.3.0'
 
   s.has_rdoc = true
   s.homepage = "http://sinatra.rubyforge.org"

data/test/base_test.rb

@@ -1,130 +1,160 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Sinatra::Base subclasses' do
+class BaseTest < Test::Unit::TestCase
+  def test_default
+    assert true
+  end
 
-  class TestApp < Sinatra::Base
-    get '/' do
-      'Hello World'
+  describe 'Sinatra::Base subclasses' do
+    class TestApp < Sinatra::Base
+      get '/' do
+        'Hello World'
+      end
     end
-  end
 
-  it 'include Rack::Utils' do
-    assert TestApp.included_modules.include?(Rack::Utils)
-  end
+    it 'include Rack::Utils' do
+      assert TestApp.included_modules.include?(Rack::Utils)
+    end
 
-  it 'processes requests with #call' do
-    assert TestApp.respond_to?(:call)
+    it 'processes requests with #call' do
+      assert TestApp.respond_to?(:call)
 
-    request = Rack::MockRequest.new(TestApp)
-    response = request.get('/')
-    assert response.ok?
-    assert_equal 'Hello World', response.body
-  end
+      request = Rack::MockRequest.new(TestApp)
+      response = request.get('/')
+      assert response.ok?
+      assert_equal 'Hello World', response.body
+    end
 
-  class TestApp < Sinatra::Base
-    get '/state' do
-      body = "Foo: #{@foo}"
-      @foo = 'discard'
-      body
+    class TestApp < Sinatra::Base
+      get '/state' do
+        @foo ||= "new"
+        body = "Foo: #{@foo}"
+        @foo = 'discard'
+        body
+      end
     end
-  end
 
-  it 'does not maintain state between requests' do
-    request = Rack::MockRequest.new(TestApp)
-    2.times do
-      response = request.get('/state')
-      assert response.ok?
-      assert_equal 'Foo: ', response.body
+    it 'does not maintain state between requests' do
+      request = Rack::MockRequest.new(TestApp)
+      2.times do
+        response = request.get('/state')
+        assert response.ok?
+        assert_equal 'Foo: new', response.body
+      end
+    end
+
+    it "passes the subclass to configure blocks" do
+      ref = nil
+      TestApp.configure { |app| ref = app }
+      assert_equal TestApp, ref
+    end
+
+    it "allows the configure block arg to be omitted and does not change context" do
+      context = nil
+      TestApp.configure { context = self }
+      assert_equal self, context
     end
   end
-end
 
-describe "Sinatra::Base as Rack middleware" do
+  describe "Sinatra::Base as Rack middleware" do
+    app = lambda { |env|
+      headers = {'X-Downstream' => 'true'}
+      headers['X-Route-Missing'] = env['sinatra.route-missing'] || ''
+      [210, headers, ['Hello from downstream']] }
 
-  app = lambda { |env|
-    [210, {'X-Downstream' => 'true'}, ['Hello from downstream']] }
+    class TestMiddleware < Sinatra::Base
+    end
 
-  class TestMiddleware < Sinatra::Base
-  end
+    it 'creates a middleware that responds to #call with .new' do
+      middleware = TestMiddleware.new(app)
+      assert middleware.respond_to?(:call)
+    end
 
-  it 'creates a middleware that responds to #call with .new' do
-    middleware = TestMiddleware.new(app)
-    assert middleware.respond_to?(:call)
-  end
+    it 'exposes the downstream app' do
+      middleware = TestMiddleware.new(app)
+      assert_same app, middleware.app
+    end
+
+    class TestMiddleware < Sinatra::Base
+      def route_missing
+        env['sinatra.route-missing'] = '1'
+        super
+      end
+
+      get '/' do
+        'Hello from middleware'
+      end
+    end
 
-  it 'exposes the downstream app' do
     middleware = TestMiddleware.new(app)
-    assert_same app, middleware.app
-  end
+    request = Rack::MockRequest.new(middleware)
 
-  class TestMiddleware < Sinatra::Base
-    get '/' do
-      'Hello from middleware'
+    it 'intercepts requests' do
+      response = request.get('/')
+      assert response.ok?
+      assert_equal 'Hello from middleware', response.body
     end
-  end
 
-  middleware = TestMiddleware.new(app)
-  request = Rack::MockRequest.new(middleware)
+    it 'automatically forwards requests downstream when no matching route found' do
+      response = request.get('/missing')
+      assert_equal 210, response.status
+      assert_equal 'Hello from downstream', response.body
+    end
 
-  it 'intercepts requests' do
-    response = request.get('/')
-    assert response.ok?
-    assert_equal 'Hello from middleware', response.body
-  end
+    it 'calls #route_missing before forwarding downstream' do
+      response = request.get('/missing')
+      assert_equal '1', response['X-Route-Missing']
+    end
 
-  it 'automatically forwards requests downstream when no matching route found' do
-    response = request.get('/missing')
-    assert_equal 210, response.status
-    assert_equal 'Hello from downstream', response.body
-  end
+    class TestMiddleware < Sinatra::Base
+      get '/low-level-forward' do
+        app.call(env)
+      end
+    end
 
-  class TestMiddleware < Sinatra::Base
-    get '/low-level-forward' do
-      app.call(env)
+    it 'can call the downstream app directly and return result' do
+      response = request.get('/low-level-forward')
+      assert_equal 210, response.status
+      assert_equal 'true', response['X-Downstream']
+      assert_equal 'Hello from downstream', response.body
     end
-  end
 
-  it 'can call the downstream app directly and return result' do
-    response = request.get('/low-level-forward')
-    assert_equal 210, response.status
-    assert_equal 'true', response['X-Downstream']
-    assert_equal 'Hello from downstream', response.body
-  end
+    class TestMiddleware < Sinatra::Base
+      get '/explicit-forward' do
+        response['X-Middleware'] = 'true'
+        res = forward
+        assert_nil res
+        assert_equal 210, response.status
+        assert_equal 'true', response['X-Downstream']
+        assert_equal ['Hello from downstream'], response.body
+        'Hello after explicit forward'
+      end
+    end
 
-  class TestMiddleware < Sinatra::Base
-    get '/explicit-forward' do
-      response['X-Middleware'] = 'true'
-      res = forward
-      assert_nil res
+    it 'forwards the request downstream and integrates the response into the current context' do
+      response = request.get('/explicit-forward')
       assert_equal 210, response.status
       assert_equal 'true', response['X-Downstream']
-      assert_equal ['Hello from downstream'], response.body
-      'Hello after explicit forward'
+      assert_equal 'Hello after explicit forward', response.body
+      assert_equal '28', response['Content-Length']
     end
-  end
 
-  it 'forwards the request downstream and integrates the response into the current context' do
-    response = request.get('/explicit-forward')
-    assert_equal 210, response.status
-    assert_equal 'true', response['X-Downstream']
-    assert_equal 'Hello after explicit forward', response.body
-    assert_equal '28', response['Content-Length']
-  end
+    app_content_length = lambda {|env|
+      [200, {'Content-Length' => '16'}, 'From downstream!']}
 
-  app_content_length = lambda {|env|
-    [200, {'Content-Length' => '16'}, 'From downstream!']}
-  class TestMiddlewareContentLength < Sinatra::Base
-    get '/forward' do
-      res = forward
-      'From after explicit forward!'
+    class TestMiddlewareContentLength < Sinatra::Base
+      get '/forward' do
+        res = forward
+        'From after explicit forward!'
+      end
     end
-  end
 
-  middleware_content_length = TestMiddlewareContentLength.new(app_content_length)
-  request_content_length = Rack::MockRequest.new(middleware_content_length)
+    middleware_content_length = TestMiddlewareContentLength.new(app_content_length)
+    request_content_length = Rack::MockRequest.new(middleware_content_length)
 
-  it "sets content length for last response" do
-    response = request_content_length.get('/forward')
-    assert_equal '28', response['Content-Length']
+    it "sets content length for last response" do
+      response = request_content_length.get('/forward')
+      assert_equal '28', response['Content-Length']
+    end
   end
 end

data/test/builder_test.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/helper'
+require 'builder'
 
-describe "Builder Templates" do
+class BuilderTest < Test::Unit::TestCase
   def builder_app(&block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'

data/test/contest.rb

@@ -0,0 +1,64 @@
+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.
+class Test::Unit::TestSuite
+  unless method_defined?(:empty?)
+    def empty?
+      false
+    end
+  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.
+class Test::Unit::TestCase
+  def self.setup(&block)
+    setup_blocks << block
+  end
+
+  def setup
+    self.class.setup_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)
+  end
+
+  def self.test(name, &block)
+    define_method(test_name(name), &block)
+  end
+
+  class << self
+    alias_method :should, :test
+    alias_method :describe, :context
+  end
+
+private
+
+  def self.setup_blocks
+    @setup_blocks ||= []
+  end
+
+  def self.context_name(name)
+    "Test#{sanitize_name(name).gsub(/(^| )(\w)/) { $2.upcase }}".to_sym
+  end
+
+  def self.test_name(name)
+    "test_#{sanitize_name(name).gsub(/\s+/,'_')}".to_sym
+  end
+
+  def self.sanitize_name(name)
+    name.gsub(/\W+/, ' ').strip
+  end
+end