bmizerany-sinatra 0.9.0 → 0.9.0.2

data/lib/sinatra/test.rb

@@ -1,110 +1,114 @@
 require 'sinatra/base'
-require 'test/unit'
 
-module Sinatra::Test
-  include Rack::Utils
-
-  attr_reader :app, :request, :response
-
-  def mock_app(base=Sinatra::Base, &block)
-    @app = Sinatra.new(base, &block)
-  end
-
-  def request(verb, path, *args)
-    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)]
+module Sinatra
+
+  module Test
+    include Rack::Utils
+
+    attr_reader :app, :request, :response
+
+    def test_request(verb, path, *args)
+      @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
-          [{}, data]
+          raise ArgumentError, "zero, one, or two arguments expected"
         end
-      when 0
-        [{}, '']
-      else
-        raise ArgumentError, "zero, one, or two arguments expected"
-      end
-    opts = rack_opts(opts)
-    opts[:input] ||= input
-    yield @request if block_given?
-    @response = @request.request(verb, path, opts)
-  end
+      opts = rack_opts(opts)
+      opts[:input] ||= input
+      yield @request if block_given?
+      @response = @request.request(verb, path, opts)
+    end
 
-  def get(path, *args, &b)  ; request('GET', path, *args, &b) ; end
-  def head(path, *args, &b) ; request('HEAD', path, *args, &b) ; end
-  def post(path, *args, &b) ; request('POST', path, *args, &b) ; end
-  def put(path, *args, &b)  ; request('PUT', path, *args, &b) ; end
-  def delete(path, *args, &b) ; request('DELETE', path, *args, &b) ; end
+    def get(path, *args, &b)  ; test_request('GET', path, *args, &b) ; end
+    def head(path, *args, &b) ; test_request('HEAD', path, *args, &b) ; end
+    def post(path, *args, &b) ; test_request('POST', path, *args, &b) ; end
+    def put(path, *args, &b)  ; test_request('PUT', path, *args, &b) ; end
+    def delete(path, *args, &b) ; test_request('DELETE', path, *args, &b) ; end
 
-  def follow!
-    request 'GET', @response.location
-  end
+    def follow!
+      test_request 'GET', @response.location
+    end
 
-  def should
-    @response.should
-  end
+    def body ; @response.body ; end
+    def status ; @response.status ; end
 
-  def body
-    @response.body
-  end
+    # Delegate other missing methods to @response.
+    def method_missing(name, *args, &block)
+      if @response && @response.respond_to?(name)
+        @response.send(name, *args, &block)
+      else
+        super
+      end
+    end
 
-  def status
-    @response.status
-  end
+    # Also check @response since we delegate there.
+    def respond_to?(symbol, include_private=false)
+      super || (@response && @response.respond_to?(symbol, include_private))
+    end
 
-  RACK_OPT_NAMES = {
-    :accept => "HTTP_ACCEPT",
-    :agent => "HTTP_USER_AGENT",
-    :host => "HTTP_HOST",
-    :session => "HTTP_COOKIE",
-    :cookies => "HTTP_COOKIE",
-    :content_type => "CONTENT_TYPE"
-  }
-
-  def rack_opts(opts)
-    opts.inject({}) do |hash,(key,val)|
-      key = RACK_OPT_NAMES[key] || key
-      hash[key] = val
-      hash
+    RACK_OPT_NAMES = {
+      :accept => "HTTP_ACCEPT",
+      :agent => "HTTP_USER_AGENT",
+      :host => "HTTP_HOST",
+      :session => "HTTP_COOKIE",
+      :cookies => "HTTP_COOKIE",
+      :content_type => "CONTENT_TYPE"
+    }
+
+    def rack_opts(opts)
+      opts.inject({}) do |hash,(key,val)|
+        key = RACK_OPT_NAMES[key] || key
+        hash[key] = val
+        hash
+      end
     end
-  end
 
-  def env_for(opts={})
-    opts = rack_opts(opts)
-    Rack::MockRequest.env_for(opts)
-  end
+    def env_for(opts={})
+      opts = rack_opts(opts)
+      Rack::MockRequest.env_for(opts)
+    end
 
-  def param_string(hash)
-    hash.map { |pair| pair.map{|v|escape(v)}.join('=') }.join('&')
-  end
+    def param_string(hash)
+      hash.map { |pair| pair.map{|v|escape(v)}.join('=') }.join('&')
+    end
 
-  if defined? Sinatra::Compat
-    # Deprecated. Use: "get" instead of "get_it".
-    %w(get head post put delete).each do |verb|
-      alias_method "#{verb}_it", verb
-      remove_method verb
+    if defined? Sinatra::Compat
+      # Deprecated. Use: "get" instead of "get_it".
+      %w(get head post put delete).each do |verb|
+        eval <<-RUBY, binding, __FILE__, __LINE__
+        def #{verb}_it(*args, &block)
+          sinatra_warn "The #{verb}_it method is deprecated; use #{verb} instead."
+          test_request('#{verb.upcase}', *args, &block)
+        end
+        RUBY
+      end
     end
+  end
 
-    include Sinatra::Delegator
+  class TestHarness
+    include Test
 
-    # Deprecated. Tests no longer delegate missing methods to the
-    # mock response. Use: @response
-    def method_missing(name, *args, &block)
-      if @response && @response.respond_to?(name)
-        @response.send(name, *args, &block)
-      else
-        super
-      end
+    def initialize(app=nil)
+      @app = app || Sinatra::Application
     end
   end
 end

data/lib/sinatra.rb

@@ -1,3 +1,8 @@
+libdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
 require 'sinatra/base'
 require 'sinatra/main'
 require 'sinatra/compat'
+
+use_in_file_templates!

data/sinatra.gemspec

@@ -3,16 +3,18 @@ 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'
-  s.date = '2009-01-06'
+  s.version = '0.9.0.2'
+  s.date = '2009-01-18'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
 
   s.authors = ["Blake Mizerany"]
+  s.email = "sinatrarb@googlegroups.com"
 
   # = MANIFEST =
   s.files = %w[
+    AUTHORS
     CHANGES
     LICENSE
     README.rdoc
@@ -58,6 +60,7 @@ Gem::Specification.new do |s|
     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
@@ -68,6 +71,7 @@ Gem::Specification.new do |s|
     test/erb_test.rb
     test/filter_test.rb
     test/haml_test.rb
+    test/helper.rb
     test/helpers_test.rb
     test/mapped_error_test.rb
     test/middleware_test.rb
@@ -95,7 +99,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.0'
+  s.add_dependency 'rack', '>= 0.9.1'
 
   s.has_rdoc = true
   s.homepage = "http://sinatra.rubyforge.org"

data/test/base_test.rb

@@ -1,12 +1,8 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe 'Sinatra::Base' do
-  include Sinatra::Test
-
   it 'includes Rack::Utils' do
-    Sinatra::Base.should.include Rack::Utils
+    assert Sinatra::Base.included_modules.include?(Rack::Utils)
   end
 
   it 'can be used as a Rack application' do
@@ -15,12 +11,12 @@ describe 'Sinatra::Base' do
         'Hello World'
       end
     }
-    @app.should.respond_to :call
+    assert @app.respond_to?(:call)
 
     request = Rack::MockRequest.new(@app)
     response = request.get('/')
-    response.should.be.ok
-    response.body.should.equal 'Hello World'
+    assert response.ok?
+    assert_equal 'Hello World', response.body
   end
 
   it 'can be used as Rack middleware' do
@@ -35,15 +31,38 @@ describe 'Sinatra::Base' do
         end
       }
     middleware = mock_middleware.new(app)
-    middleware.app.should.be app
+    assert_same app, middleware.app
 
     request = Rack::MockRequest.new(middleware)
     response = request.get('/')
-    response.should.be.ok
-    response.body.should.equal 'Hello World'
+    assert response.ok?
+    assert_equal 'Hello World', response.body
 
     response = request.get('/goodbye')
-    response.should.be.ok
-    response.body.should.equal 'Goodbye World'
+    assert response.ok?
+    assert_equal 'Goodbye World', response.body
+  end
+
+  it 'can take multiple definitions of a route' do
+    app = mock_app {
+      user_agent(/Foo/)
+      get '/foo' do
+        'foo'
+      end
+
+      get '/foo' do
+        'not foo'
+      end
+    }
+
+    request = Rack::MockRequest.new(app)
+    response = request.get('/foo', 'HTTP_USER_AGENT' => 'Foo')
+    assert response.ok?
+    assert_equal 'foo', response.body
+
+    request = Rack::MockRequest.new(app)
+    response = request.get('/foo')
+    assert response.ok?
+    assert_equal 'not foo', response.body
   end
 end

data/test/builder_test.rb

@@ -1,10 +1,6 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe "Builder Templates" do
-  include Sinatra::Test
-
   def builder_app(&block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'
@@ -15,8 +11,8 @@ describe "Builder Templates" do
 
   it 'renders inline Builder strings' do
     builder_app { builder 'xml.instruct!' }
-    should.be.ok
-    body.should.equal %{<?xml version="1.0" encoding="UTF-8"?>\n}
+    assert ok?
+    assert_equal %{<?xml version="1.0" encoding="UTF-8"?>\n}, body
   end
 
   it 'renders inline blocks' do
@@ -26,8 +22,8 @@ describe "Builder Templates" do
         xml.couple @name
       end
     }
-    should.be.ok
-    body.should.equal "<couple>Frank &amp; Mary</couple>\n"
+    assert ok?
+    assert_equal "<couple>Frank &amp; Mary</couple>\n", body
   end
 
   it 'renders .builder files in views path' do
@@ -35,8 +31,8 @@ describe "Builder Templates" do
       @name = "Blue"
       builder :hello
     }
-    should.be.ok
-    body.should.equal %(<exclaim>You're my boy, Blue!</exclaim>\n)
+    assert ok?
+    assert_equal %(<exclaim>You're my boy, Blue!</exclaim>\n), body
   end
 
   it "renders with inline layouts" do
@@ -47,22 +43,22 @@ describe "Builder Templates" do
       get('/') { builder %(xml.em 'Hello World') }
     }
     get '/'
-    should.be.ok
-    body.should.equal "<layout>\n<em>Hello World</em>\n</layout>\n"
+    assert ok?
+    assert_equal "<layout>\n<em>Hello World</em>\n</layout>\n", body
   end
 
   it "renders with file layouts" do
     builder_app {
       builder %(xml.em 'Hello World'), :layout => :layout2
     }
-    should.be.ok
-    body.should.equal "<layout>\n<em>Hello World</em>\n</layout>\n"
+    assert ok?
+    assert_equal "<layout>\n<em>Hello World</em>\n</layout>\n", body
   end
 
   it "raises error if template not found" do
     mock_app {
       get('/') { builder :no_such_template }
     }
-    lambda { get('/') }.should.raise(Errno::ENOENT)
+    assert_raise(Errno::ENOENT) { get('/') }
   end
 end

data/test/erb_test.rb

@@ -1,10 +1,6 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe "ERB Templates" do
-  include Sinatra::Test
-
   def erb_app(&block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'
@@ -15,14 +11,14 @@ describe "ERB Templates" do
 
   it 'renders inline ERB strings' do
     erb_app { erb '<%= 1 + 1 %>' }
-    should.be.ok
-    body.should.equal '2'
+    assert ok?
+    assert_equal '2', body
   end
 
   it 'renders .erb files in views path' do
     erb_app { erb :hello }
-    should.be.ok
-    body.should.equal "Hello World\n"
+    assert ok?
+    assert_equal "Hello World\n", body
   end
 
   it 'takes a :locals option' do
@@ -30,8 +26,8 @@ describe "ERB Templates" do
       locals = {:foo => 'Bar'}
       erb '<%= foo %>', :locals => locals
     }
-    should.be.ok
-    body.should.equal 'Bar'
+    assert ok?
+    assert_equal 'Bar', body
   end
 
   it "renders with inline layouts" do
@@ -40,16 +36,15 @@ describe "ERB Templates" do
       get('/') { erb 'Sparta' }
     }
     get '/'
-    should.be.ok
-    body.should.equal 'THIS. IS. SPARTA!'
+    assert ok?
+    assert_equal 'THIS. IS. SPARTA!', body
   end
 
   it "renders with file layouts" do
     erb_app {
       erb 'Hello World', :layout => :layout2
     }
-    should.be.ok
-    body.should.equal "ERB Layout!\nHello World\n"
+    assert ok?
+    assert_equal "ERB Layout!\nHello World\n", body
   end
-
 end

data/test/filter_test.rb

@@ -1,28 +1,24 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe "Filters" do
-  include Sinatra::Test
-
   it "executes filters in the order defined" do
     count = 0
     mock_app do
       get('/') { 'Hello World' }
       before {
-        count.should.be 0
+        assert_equal 0, count
         count = 1
       }
       before {
-        count.should.be 1
+        assert_equal 1, count
         count = 2
       }
     end
 
     get '/'
-    should.be.ok
-    count.should.be 2
-    body.should.equal 'Hello World'
+    assert ok?
+    assert_equal 2, count
+    assert_equal 'Hello World', body
   end
 
   it "allows filters to modify the request" do
@@ -33,7 +29,47 @@ describe "Filters" do
     }
 
     get '/foo'
-    should.be.ok
-    body.should.be == 'bar'
+    assert ok?
+    assert_equal 'bar', body
+  end
+
+  it "can modify instance variables available to routes" do
+    mock_app {
+      before { @foo = 'bar' }
+      get('/foo') { @foo }
+    }
+
+    get '/foo'
+    assert ok?
+    assert_equal 'bar', body
+  end
+
+  it "allows redirects in filters" do
+    mock_app {
+      before { redirect '/bar' }
+      get('/foo') do
+        fail 'before block should have halted processing'
+        'ORLY?!'
+      end
+    }
+
+    get '/foo'
+    assert redirect?
+    assert_equal '/bar', response['Location']
+    assert_equal '', body
+  end
+
+  it "does not modify the response with its return value" do
+    mock_app {
+      before { 'Hello World!' }
+      get '/foo' do
+        assert_equal [], response.body
+        'cool'
+      end
+    }
+
+    get '/foo'
+    assert ok?
+    assert_equal 'cool', body
   end
 end

data/test/haml_test.rb

@@ -1,10 +1,6 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe "HAML Templates" do
-  include Sinatra::Test
-
   def haml_app(&block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'
@@ -15,14 +11,14 @@ describe "HAML Templates" do
 
   it 'renders inline HAML strings' do
     haml_app { haml '%h1 Hiya' }
-    should.be.ok
-    body.should.equal "<h1>Hiya</h1>\n"
+    assert ok?
+    assert_equal "<h1>Hiya</h1>\n", body
   end
 
   it 'renders .haml files in views path' do
     haml_app { haml :hello }
-    should.be.ok
-    body.should.equal "<h1>Hello From Haml</h1>\n"
+    assert ok?
+    assert_equal "<h1>Hello From Haml</h1>\n", body
   end
 
   it "renders with inline layouts" do
@@ -31,31 +27,31 @@ describe "HAML Templates" do
       get('/') { haml '%em Sparta' }
     }
     get '/'
-    should.be.ok
-    body.should.equal "<h1>THIS. IS. <EM>SPARTA</EM></h1>\n"
+    assert ok?
+    assert_equal "<h1>THIS. IS. <EM>SPARTA</EM></h1>\n", body
   end
 
   it "renders with file layouts" do
     haml_app {
       haml 'Hello World', :layout => :layout2
     }
-    should.be.ok
-    body.should.equal "<h1>HAML Layout!</h1>\n<p>Hello World</p>\n"
+    assert ok?
+    assert_equal "<h1>HAML Layout!</h1>\n<p>Hello World</p>\n", body
   end
 
   it "raises error if template not found" do
     mock_app {
       get('/') { haml :no_such_template }
     }
-    lambda { get('/') }.should.raise(Errno::ENOENT)
+    assert_raise(Errno::ENOENT) { get('/') }
   end
 
   it "passes HAML options to the Haml engine" do
     haml_app {
       haml "!!!\n%h1 Hello World", :options => {:format => :html5}
     }
-    should.be.ok
-    body.should.equal "<!DOCTYPE html>\n<h1>Hello World</h1>\n"
+    assert ok?
+    assert_equal "<!DOCTYPE html>\n<h1>Hello World</h1>\n", body
   end
 
   it "passes default HAML options to the Haml engine" do
@@ -66,7 +62,7 @@ describe "HAML Templates" do
       end
     }
     get '/'
-    should.be.ok
-    body.should.equal "<!DOCTYPE html>\n<h1>Hello World</h1>\n"
+    assert ok?
+    assert_equal "<!DOCTYPE html>\n<h1>Hello World</h1>\n", body
   end
 end

data/test/helper.rb

@@ -0,0 +1,25 @@
+begin
+  require 'test/spec'
+rescue LoadError
+  require 'rubygems'
+  require 'test/spec'
+end
+
+$:.unshift File.dirname(File.dirname(__FILE__)) + '/lib'
+require 'sinatra/base'
+require 'sinatra/test'
+require 'sinatra/test/spec'
+
+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
+end