rtomayko-sinatra 0.8.10 → 0.9.0

data/lib/sinatra/test.rb

@@ -1,114 +1,110 @@
 require 'sinatra/base'
+require 'test/unit'
 
-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
-          [{}, '']
+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
-          raise ArgumentError, "zero, one, or two arguments expected"
+          [env, input]
         end
-      opts = rack_opts(opts)
-      opts[:input] ||= input
-      yield @request if block_given?
-      @response = @request.request(verb, path, opts)
-    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
+    yield @request if block_given?
+    @response = @request.request(verb, path, opts)
+  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 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 follow!
-      test_request 'GET', @response.location
-    end
+  def follow!
+    request 'GET', @response.location
+  end
 
-    def body ; @response.body ; end
-    def status ; @response.status ; end
+  def should
+    @response.should
+  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 body
+    @response.body
+  end
 
-    # Also check @response since we delegate there.
-    def respond_to?(symbol, include_private=false)
-      super || (@response && @response.respond_to?(symbol, include_private))
-    end
+  def status
+    @response.status
+  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
-      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
     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|
-        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
+  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
     end
-  end
 
-  class TestHarness
-    include Test
+    include Sinatra::Delegator
 
-    def initialize(app=nil)
-      @app = app || Sinatra::Application
+    # 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
     end
   end
 end

data/lib/sinatra/test/rspec.rb

@@ -1,9 +1,2 @@
 require 'sinatra/test'
 require 'spec/interop/test'
-
-Sinatra::Default.set(
-  :env => :test,
-  :run => false,
-  :raise_errors => true,
-  :logging => false
-)

data/lib/sinatra/test/spec.rb

@@ -1,9 +1,2 @@
 require 'test/spec'
 require 'sinatra/test'
-require 'sinatra/test/unit'
-
-module Sinatra::Test
-  def should
-    @response.should
-  end
-end

data/lib/sinatra/test/unit.rb

@@ -1,5 +1,5 @@
-require 'sinatra/test'
 require 'test/unit'
+require 'sinatra/test'
 
 Test::Unit::TestCase.send :include, Sinatra::Test
 

data/sinatra.gemspec

@@ -3,19 +3,17 @@ 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.8.10'
-  s.date = '2009-01-16'
+  s.version = '0.9.0'
+  s.date = '2009-01-06'
 
   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
+    ChangeLog
     LICENSE
     README.rdoc
     Rakefile
@@ -59,8 +57,8 @@ Gem::Specification.new do |s|
     lib/sinatra/images/404.png
     lib/sinatra/images/500.png
     lib/sinatra/main.rb
+    lib/sinatra/rack/methodoverride.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
@@ -71,7 +69,6 @@ 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
@@ -99,7 +96,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.0'
 
   s.has_rdoc = true
   s.homepage = "http://sinatra.rubyforge.org"

data/test/base_test.rb

@@ -1,8 +1,12 @@
-require File.dirname(__FILE__) + '/helper'
+require 'test/spec'
+require 'sinatra/base'
+require 'sinatra/test'
 
 describe 'Sinatra::Base' do
+  include Sinatra::Test
+
   it 'includes Rack::Utils' do
-    assert Sinatra::Base.included_modules.include?(Rack::Utils)
+    Sinatra::Base.should.include Rack::Utils
   end
 
   it 'can be used as a Rack application' do
@@ -11,12 +15,12 @@ describe 'Sinatra::Base' do
         'Hello World'
       end
     }
-    assert @app.respond_to?(:call)
+    @app.should.respond_to :call
 
     request = Rack::MockRequest.new(@app)
     response = request.get('/')
-    assert response.ok?
-    assert_equal 'Hello World', response.body
+    response.should.be.ok
+    response.body.should.equal 'Hello World'
   end
 
   it 'can be used as Rack middleware' do
@@ -31,38 +35,15 @@ describe 'Sinatra::Base' do
         end
       }
     middleware = mock_middleware.new(app)
-    assert_same app, middleware.app
+    middleware.app.should.be app
 
     request = Rack::MockRequest.new(middleware)
     response = request.get('/')
-    assert response.ok?
-    assert_equal 'Hello World', response.body
+    response.should.be.ok
+    response.body.should.equal 'Hello World'
 
     response = request.get('/goodbye')
-    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
+    response.should.be.ok
+    response.body.should.equal 'Goodbye World'
   end
 end

data/test/builder_test.rb

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

data/test/erb_test.rb

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