bmizerany-sinatra 0.9.0.5 → 0.9.1

data/lib/sinatra/compat.rb

@@ -106,6 +106,17 @@ module Sinatra
       etag(*args, &block)
     end
 
+    # Deprecated. Use the #attachment helper and return the data as a String or
+    # Array.
+    def send_data(data, options={})
+      sinatra_warn "The 'send_data' method is deprecated. use attachment, status, content_type, etc. helpers instead."
+
+      status       options[:status]   if options[:status]
+      attachment   options[:filename] if options[:disposition] == 'attachment'
+      content_type options[:type]     if options[:type]
+      halt data
+    end
+
     # Throwing halt with a Symbol and the to_result convention are
     # deprecated. Override the invoke method to detect those types of return
     # values.

data/lib/sinatra/test.rb

@@ -1,41 +1,40 @@
 require 'sinatra/base'
 
 module Sinatra
-
   module Test
     include Rack::Utils
 
     attr_reader :app, :request, :response
 
-    def make_request(verb, path, *args)
+    def self.deprecate(framework)
+      warn <<-EOF
+Warning: support for the #{framework} testing framework is deprecated and
+will be dropped in Sinatra 1.0. See <http://sinatra.github.com/testing.html>
+for more information.
+      EOF
+    end
+
+    def make_request(verb, path, body=nil, options={})
       @app = Sinatra::Application if @app.nil? && defined?(Sinatra::Application)
       fail "@app not set - cannot make request" if @app.nil?
+
       @request = Rack::MockRequest.new(@app)
-      opts, input =
-        case args.size
-        when 2 # input, env
-          input, env = args
-          if input.kind_of?(Hash) # params, env
-            [env, param_string(input)]
-          else
-            [env, input]
-          end
-        when 1 # params
-          if (data = args.first).kind_of?(Hash)
-            env = (data.delete(:env) || {})
-            [env, param_string(data)]
-          else
-            [{}, data]
-          end
-        when 0
-          [{}, '']
-        else
-          raise ArgumentError, "zero, one, or two arguments expected"
-        end
-      opts = rack_opts(opts)
-      opts[:input] ||= input
+      options = { :lint => true }.merge(options || {})
+
+      case
+      when body.respond_to?(:to_hash)
+        options.merge! body.delete(:env) if body.key?(:env)
+        options[:input] = param_string(body)
+      when body.respond_to?(:to_str)
+        options[:input] = body
+      when body.nil?
+        options[:input] = ''
+      else
+        raise ArgumentError, "body must be a Hash, String, or nil"
+      end
+
       yield @request if block_given?
-      @response = @request.request(verb, path, opts)
+      @response = @request.request(verb, path, rack_options(options))
     end
 
     def get(path, *args, &b)  ; make_request('GET', path, *args, &b) ; end
@@ -67,18 +66,18 @@ module Sinatra
 
   private
 
-    RACK_OPT_NAMES = {
-      :accept => "HTTP_ACCEPT",
-      :agent => "HTTP_USER_AGENT",
-      :host => "HTTP_HOST",
-      :session => "HTTP_COOKIE",
-      :cookies => "HTTP_COOKIE",
-      :content_type => "CONTENT_TYPE"
+    RACK_OPTIONS = {
+      :accept       => 'HTTP_ACCEPT',
+      :agent        => 'HTTP_USER_AGENT',
+      :host         => 'HTTP_HOST',
+      :session      => 'rack.session',
+      :cookies      => 'HTTP_COOKIE',
+      :content_type => 'CONTENT_TYPE'
     }
 
-    def rack_opts(opts)
+    def rack_options(opts)
       opts.merge(:lint => true).inject({}) do |hash,(key,val)|
-        key = RACK_OPT_NAMES[key] || key
+        key = RACK_OPTIONS[key] || key
         hash[key] = val
         hash
       end

data/lib/sinatra/test/bacon.rb

@@ -1,6 +1,8 @@
 require 'bacon'
 require 'sinatra/test'
 
+Sinatra::Test.deprecate('Bacon')
+
 Sinatra::Default.set(
   :environment => :test,
   :run => false,

data/lib/sinatra/test/rspec.rb

@@ -3,6 +3,8 @@ require 'sinatra/test/unit'
 require 'spec'
 require 'spec/interop/test'
 
+Sinatra::Test.deprecate('RSpec')
+
 Sinatra::Default.set(
   :environment => :test,
   :run => false,

data/lib/sinatra/test/spec.rb

@@ -2,6 +2,8 @@ require 'test/spec'
 require 'sinatra/test'
 require 'sinatra/test/unit'
 
+Sinatra::Test.deprecate('test/spec')
+
 module Sinatra::Test
   def should
     @response.should

data/lib/sinatra/test/unit.rb

@@ -1,6 +1,8 @@
 require 'sinatra/test'
 require 'test/unit'
 
+Sinatra::Test.deprecate('test/unit')
+
 Test::Unit::TestCase.send :include, Sinatra::Test
 
 Sinatra::Default.set(

data/sinatra.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'sinatra'
-  s.version = '0.9.0.5'
-  s.date = '2009-02-10'
+  s.version = '0.9.1'
+  s.date = '2009-03-01'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
@@ -104,7 +104,7 @@ 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.has_rdoc = true
   s.homepage = "http://sinatra.rubyforge.org"

data/test/base_test.rb

@@ -1,81 +1,130 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Sinatra::Base' do
-  it 'includes Rack::Utils' do
-    assert Sinatra::Base.included_modules.include?(Rack::Utils)
+describe 'Sinatra::Base subclasses' do
+
+  class TestApp < Sinatra::Base
+    get '/' do
+      'Hello World'
+    end
+  end
+
+  it 'include Rack::Utils' do
+    assert TestApp.included_modules.include?(Rack::Utils)
   end
 
-  it 'can be used as a Rack application' do
-    mock_app {
-      get '/' do
-        'Hello World'
-      end
-    }
-    assert @app.respond_to?(:call)
+  it 'processes requests with #call' do
+    assert TestApp.respond_to?(:call)
 
-    request = Rack::MockRequest.new(@app)
+    request = Rack::MockRequest.new(TestApp)
     response = request.get('/')
     assert response.ok?
     assert_equal 'Hello World', response.body
   end
 
-  it 'can be used as Rack middleware' do
-    app = lambda { |env| [200, {}, ['Goodbye World']] }
-    mock_middleware =
-      mock_app {
-        get '/' do
-          'Hello World'
-        end
-        get '/goodbye' do
-          @app.call(request.env)
-        end
-      }
-    middleware = mock_middleware.new(app)
+  class TestApp < Sinatra::Base
+    get '/state' do
+      body = "Foo: #{@foo}"
+      @foo = 'discard'
+      body
+    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
+    end
+  end
+end
+
+describe "Sinatra::Base as Rack middleware" do
+
+  app = lambda { |env|
+    [210, {'X-Downstream' => 'true'}, ['Hello from downstream']] }
+
+  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 'exposes the downstream app' do
+    middleware = TestMiddleware.new(app)
     assert_same app, middleware.app
+  end
+
+  class TestMiddleware < Sinatra::Base
+    get '/' do
+      'Hello from middleware'
+    end
+  end
+
+  middleware = TestMiddleware.new(app)
+  request = Rack::MockRequest.new(middleware)
 
-    request = Rack::MockRequest.new(middleware)
+  it 'intercepts requests' do
     response = request.get('/')
     assert response.ok?
-    assert_equal 'Hello World', response.body
+    assert_equal 'Hello from middleware', response.body
+  end
 
-    response = request.get('/goodbye')
-    assert response.ok?
-    assert_equal 'Goodbye World', response.body
+  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 'can take multiple definitions of a route' do
-    app = mock_app {
-      user_agent(/Foo/)
-      get '/foo' do
-        'foo'
-      end
+  class TestMiddleware < Sinatra::Base
+    get '/low-level-forward' do
+      app.call(env)
+    end
+  end
 
-      get '/foo' do
-        'not foo'
-      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
 
-    request = Rack::MockRequest.new(app)
-    response = request.get('/foo', 'HTTP_USER_AGENT' => 'Foo')
-    assert response.ok?
-    assert_equal 'foo', response.body
+  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
 
-    request = Rack::MockRequest.new(app)
-    response = request.get('/foo')
-    assert response.ok?
-    assert_equal 'not foo', response.body
+  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!']}
+  class TestMiddlewareContentLength < Sinatra::Base
+    get '/forward' do
+      res = forward
+      'From after explicit forward!'
+    end
   end
 
-  it "makes redirecting back pretty" do
-    app = mock_app {
-      get '/foo' do
-        redirect back
-      end
-    }
+  middleware_content_length = TestMiddlewareContentLength.new(app_content_length)
+  request_content_length = Rack::MockRequest.new(middleware_content_length)
 
-    request  = Rack::MockRequest.new(app)
-    response = request.get('/foo', 'HTTP_REFERER' => 'http://github.com')
-    assert response.redirect?
-    assert_equal "http://github.com", response.location
+  it "sets content length for last response" do
+    response = request_content_length.get('/forward')
+    assert_equal '28', response['Content-Length']
   end
 end

data/test/erb_test.rb

@@ -47,4 +47,35 @@ describe "ERB Templates" do
     assert ok?
     assert_equal "ERB Layout!\nHello World\n", body
   end
+
+  it "renders erb with blocks" do
+    mock_app {
+      def container
+        @_out_buf << "THIS."
+        yield
+        @_out_buf << "SPARTA!"
+      end
+      def is; "IS." end
+      get '/' do
+        erb '<% container do %> <%= is %> <% end %>'
+      end
+    }
+    get '/'
+    assert ok?
+    assert_equal 'THIS. IS. SPARTA!', body
+  end
+
+  it "can be used in a nested fashion for partials and whatnot" do
+    mock_app {
+      template(:inner) { "<inner><%= 'hi' %></inner>" }
+      template(:outer) { "<outer><%= erb :inner %></outer>" }
+      get '/' do
+        erb :outer
+      end
+    }
+
+    get '/'
+    assert ok?
+    assert_equal '<outer><inner>hi</inner></outer>', body
+  end
 end

data/test/extensions_test.rb

@@ -60,4 +60,25 @@ describe 'Registering extensions' do
     assert !Sinatra::Base.respond_to?(:baz)
     assert Sinatra::Default.respond_to?(:baz)
   end
+
+  module BizzleExtension
+    def bizzle
+      bizzle_option
+    end
+
+    def self.registered(base)
+      fail "base should be BizzleApp" unless base == BizzleApp
+      fail "base should have already extended BizzleExtension" unless base.respond_to?(:bizzle)
+      base.set :bizzle_option, 'bizzle!'
+    end
+  end
+
+  class BizzleApp < Sinatra::Base
+  end
+
+  it 'sends .registered to the extension module after extending the class' do
+    BizzleApp.register BizzleExtension
+    assert_equal 'bizzle!', BizzleApp.bizzle_option
+    assert_equal 'bizzle!', BizzleApp.bizzle
+  end
 end

data/test/helper.rb

@@ -8,21 +8,40 @@ end
 libdir = File.dirname(File.dirname(__FILE__)) + '/lib'
 $LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
 
-require 'sinatra/base'
-require 'sinatra/test/unit'
+require 'test/unit'
+require 'sinatra/test'
+
+class Sinatra::Base
+  # Allow assertions in request context
+  include Test::Unit::Assertions
+end
+
+class Test::Unit::TestCase
+  include Sinatra::Test
+
+  def setup
+    Sinatra::Default.set :environment, :test
+  end
 
-module Sinatra::Test
   # Sets up a Sinatra::Base subclass defined with the block
   # given. Used in setup or individual spec methods to establish
   # the application.
   def mock_app(base=Sinatra::Base, &block)
     @app = Sinatra.new(base, &block)
   end
-end
 
-class Sinatra::Base
-  # Allow assertions in request context
-  include Test::Unit::Assertions
+  def restore_default_options
+    Sinatra::Default.set(
+      :environment => :development,
+      :raise_errors => Proc.new { test? },
+      :dump_errors => true,
+      :sessions => false,
+      :logging => Proc.new { ! test? },
+      :methodoverride => true,
+      :static => true,
+      :run => Proc.new { ! test? }
+    )
+  end
 end
 
 ##
@@ -31,7 +50,7 @@ end
 # chris@ozmm.org
 #
 def describe(*args, &block)
-  return super unless (name = args.first) && block
+  return super unless (name = args.first.capitalize) && block
   name = "#{name.gsub(/\W/, '')}Test"
   Object.send :const_set, name, Class.new(Test::Unit::TestCase)
   klass = Object.const_get(name)
@@ -44,6 +63,17 @@ def describe(*args, &block)
     def self.after(&block)  define_method(:teardown, &block) end
   end
   klass.class_eval &block
+  klass
+end
+
+def describe_option(name, &block)
+  klass = describe("Option #{name}", &block)
+  klass.before do
+    restore_default_options
+    @base    = Sinatra.new
+    @default = Class.new(Sinatra::Default)
+  end
+  klass
 end
 
 # Do not output warnings for the duration of the block.