sinatra 0.3.3 → 0.9.0

data/lib/sinatra/test/unit.rb

@@ -1,13 +1,11 @@
+require 'sinatra/test'
 require 'test/unit'
-require File.dirname(__FILE__) + '/methods'
 
-Test::Unit::TestCase.send(:include, Sinatra::Test::Methods)
+Test::Unit::TestCase.send :include, Sinatra::Test
 
-Sinatra::Application.default_options.merge!(
+Sinatra::Default.set(
   :env => :test,
   :run => false,
   :raise_errors => true,
   :logging => false
 )
-
-Sinatra.application = nil

data/sinatra.gemspec

@@ -3,70 +3,103 @@ 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.3.3'
-  s.date = "2008-11-02"
+  s.version = '0.9.0'
+  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[
-    ChangeLog
+    AUTHORS
+    CHANGES
     LICENSE
     README.rdoc
     Rakefile
-    images/404.png
-    images/500.png
+    compat/app_test.rb
+    compat/application_test.rb
+    compat/builder_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/test/methods.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
     sinatra.gemspec
-    test/app_test.rb
-    test/application_test.rb
+    test/base_test.rb
     test/builder_test.rb
-    test/custom_error_test.rb
+    test/data/reload_app_file.rb
     test/erb_test.rb
-    test/event_context_test.rb
-    test/events_test.rb
     test/filter_test.rb
     test/haml_test.rb
     test/helper.rb
+    test/helpers_test.rb
     test/mapped_error_test.rb
-    test/pipeline_test.rb
-    test/public/foo.xml
+    test/middleware_test.rb
+    test/options_test.rb
+    test/reload_test.rb
+    test/request_test.rb
+    test/result_test.rb
+    test/routing_test.rb
     test/sass_test.rb
-    test/sessions_test.rb
-    test/streaming_test.rb
-    test/sym_params_test.rb
-    test/template_test.rb
-    test/use_in_file_templates_test.rb
-    test/views/foo.builder
-    test/views/foo.erb
-    test/views/foo.haml
-    test/views/foo.sass
-    test/views/foo_layout.erb
-    test/views/foo_layout.haml
-    test/views/layout_test/foo.builder
-    test/views/layout_test/foo.erb
-    test/views/layout_test/foo.haml
-    test/views/layout_test/foo.sass
-    test/views/layout_test/layout.builder
-    test/views/layout_test/layout.erb
-    test/views/layout_test/layout.haml
-    test/views/layout_test/layout.sass
-    test/views/no_layout/no_layout.builder
-    test/views/no_layout/no_layout.haml
+    test/sinatra_test.rb
+    test/static_test.rb
+    test/templates_test.rb
+    test/views/hello.builder
+    test/views/hello.erb
+    test/views/hello.haml
+    test/views/hello.sass
+    test/views/hello.test
+    test/views/layout2.builder
+    test/views/layout2.erb
+    test/views/layout2.haml
+    test/views/layout2.test
   ]
   # = MANIFEST =
 
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
 
   s.extra_rdoc_files = %w[README.rdoc LICENSE]
-  s.add_dependency 'rack', '~> 0.4.0'
+  s.add_dependency 'rack', '>= 0.9.1'
 
   s.has_rdoc = true
   s.homepage = "http://sinatra.rubyforge.org"

data/test/base_test.rb

@@ -0,0 +1,68 @@
+require File.dirname(__FILE__) + '/helper'
+
+describe 'Sinatra::Base' do
+  it 'includes Rack::Utils' do
+    assert Sinatra::Base.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)
+
+    request = Rack::MockRequest.new(@app)
+    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)
+    assert_same app, middleware.app
+
+    request = Rack::MockRequest.new(middleware)
+    response = request.get('/')
+    assert response.ok?
+    assert_equal 'Hello World', response.body
+
+    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
+  end
+end

data/test/builder_test.rb

@@ -1,101 +1,64 @@
 require File.dirname(__FILE__) + '/helper'
 
-context "Builder" do
-
-  setup do
-    Sinatra.application = nil
+describe "Builder Templates" do
+  def builder_app(&block)
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    }
+    get '/'
   end
 
-  context "without layouts" do
-
-    setup do
-      Sinatra.application = nil
-    end
-
-    specify "should render" do
-
-      get '/no_layout' do
-        builder 'xml.instruct!'
-      end
-
-      get_it '/no_layout'
-      should.be.ok
-      body.should == %(<?xml version="1.0" encoding="UTF-8"?>\n)
-
-    end
-
-    specify "should render inline block" do
-
-      get '/no_layout_and_inlined' do
-        @name = "Frank & Mary"
-        builder do |xml|
-          xml.couple @name
-        end
-      end
-
-      get_it '/no_layout_and_inlined'
-      should.be.ok
-      body.should == %(<couple>Frank &amp; Mary</couple>\n)
-
-    end
-
+  it 'renders inline Builder strings' do
+    builder_app { builder 'xml.instruct!' }
+    assert ok?
+    assert_equal %{<?xml version="1.0" encoding="UTF-8"?>\n}, body
   end
 
-
-
-  context "Templates (in general)" do
-
-    setup do
-      Sinatra.application = nil
-    end
-
-    specify "are read from files if Symbols" do
-
-      get '/from_file' do
-        @name = 'Blue'
-        builder :foo, :views_directory => File.dirname(__FILE__) + "/views"
+  it 'renders inline blocks' do
+    builder_app {
+      @name = "Frank & Mary"
+      builder do |xml|
+        xml.couple @name
       end
+    }
+    assert ok?
+    assert_equal "<couple>Frank &amp; Mary</couple>\n", body
+  end
 
-      get_it '/from_file'
-      should.be.ok
-      body.should.equal %(<exclaim>You rock Blue!</exclaim>\n)
-
-    end
-
-    specify "use layout.ext by default if available" do
-
-      get '/' do
-        builder :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
-      end
-
-      get_it '/'
-      should.be.ok
-      body.should.equal "<layout>\n<this>is foo!</this>\n</layout>\n"
-
-    end
-
-    specify "renders without layout" do
-
-      get '/' do
-        builder :no_layout, :views_directory => File.dirname(__FILE__) + "/views/no_layout"
-      end
-
-      get_it '/'
-      should.be.ok
-      body.should.equal "<foo>No Layout!</foo>\n"
-
-    end
-
-    specify "raises error if template not found" do
+  it 'renders .builder files in views path' do
+    builder_app {
+      @name = "Blue"
+      builder :hello
+    }
+    assert ok?
+    assert_equal %(<exclaim>You're my boy, Blue!</exclaim>\n), body
+  end
 
-      get '/' do
-        builder :not_found
+  it "renders with inline layouts" do
+    mock_app {
+      layout do
+        %(xml.layout { xml << yield })
       end
+      get('/') { builder %(xml.em 'Hello World') }
+    }
+    get '/'
+    assert ok?
+    assert_equal "<layout>\n<em>Hello World</em>\n</layout>\n", body
+  end
 
-      lambda { get_it '/' }.should.raise(Errno::ENOENT)
-
-    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
   end
 
+  it "raises error if template not found" do
+    mock_app {
+      get('/') { builder :no_such_template }
+    }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
 end

data/test/data/reload_app_file.rb

@@ -0,0 +1,3 @@
+$reload_count += 1
+
+$reload_app.get('/') { 'Hello from reload file' }

data/test/erb_test.rb

@@ -1,136 +1,50 @@
 require File.dirname(__FILE__) + '/helper'
 
-context "Erb" do
-
-  setup do
-    Sinatra.application = nil
+describe "ERB Templates" do
+  def erb_app(&block)
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    }
+    get '/'
   end
 
-  context "without layouts" do
-
-    setup do
-      Sinatra.application = nil
-    end
-
-    specify "should render" do
-
-      get '/no_layout' do
-        erb '<%= 1 + 1 %>'
-      end
-
-      get_it '/no_layout'
-      should.be.ok
-      body.should == '2'
-
-    end
-
-    specify "should take an options hash with :locals set with a string" do
-      get '/locals' do
-        erb '<%= foo %>', :locals => {:foo => "Bar"}
-      end
-
-      get_it '/locals'
-      should.be.ok
-      body.should == 'Bar'
-    end
-
-    specify "should take an options hash with :locals set with a complex object" do
-      get '/locals-complex' do
-        erb '<%= foo[0] %>', :locals => {:foo => ["foo", "bar", "baz"]}
-      end
-
-      get_it '/locals-complex'
-      should.be.ok
-      body.should == 'foo'
-    end
+  it 'renders inline ERB strings' do
+    erb_app { erb '<%= 1 + 1 %>' }
+    assert ok?
+    assert_equal '2', body
   end
 
-  context "with layouts" do
-
-    setup do
-      Sinatra.application = nil
-    end
-
-    specify "can be inline" do
-
-      layout do
-        %Q{This is <%= yield %>!}
-      end
-
-      get '/lay' do
-        erb 'Blake'
-      end
-
-      get_it '/lay'
-      should.be.ok
-      body.should.equal 'This is Blake!'
-
-    end
-
-    specify "can use named layouts" do
-
-      layout :pretty do
-        %Q{<h1><%= yield %></h1>}
-      end
-
-      get '/pretty' do
-        erb 'Foo', :layout => :pretty
-      end
-
-      get '/not_pretty' do
-        erb 'Bar'
-      end
-
-      get_it '/pretty'
-      body.should.equal '<h1>Foo</h1>'
-
-      get_it '/not_pretty'
-      body.should.equal 'Bar'
-
-    end
-
-    specify "can be read from a file if they're not inlined" do
-
-      get '/foo' do
-        @title = 'Welcome to the Hello Program'
-        erb 'Blake', :layout => :foo_layout,
-                     :views_directory => File.dirname(__FILE__) + "/views"
-      end
-
-      get_it '/foo'
-      body.should.equal "Welcome to the Hello Program\nHi Blake\n"
-
-    end
-
+  it 'renders .erb files in views path' do
+    erb_app { erb :hello }
+    assert ok?
+    assert_equal "Hello World\n", body
   end
 
-  context "Templates (in general)" do
-
-    specify "are read from files if Symbols" do
-
-      get '/from_file' do
-        @name = 'Alena'
-        erb :foo, :views_directory => File.dirname(__FILE__) + "/views"
-      end
-
-      get_it '/from_file'
-
-      body.should.equal 'You rock Alena!'
-
-    end
-
-    specify "use layout.ext by default if available" do
-
-      get '/layout_from_file' do
-        erb :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
-      end
-
-      get_it '/layout_from_file'
-      should.be.ok
-      body.should.equal "x This is foo! x \n"
-
-    end
+  it 'takes a :locals option' do
+    erb_app {
+      locals = {:foo => 'Bar'}
+      erb '<%= foo %>', :locals => locals
+    }
+    assert ok?
+    assert_equal 'Bar', body
+  end
 
+  it "renders with inline layouts" do
+    mock_app {
+      layout { 'THIS. IS. <%= yield.upcase %>!' }
+      get('/') { erb 'Sparta' }
+    }
+    get '/'
+    assert ok?
+    assert_equal 'THIS. IS. SPARTA!', body
   end
 
+  it "renders with file layouts" do
+    erb_app {
+      erb 'Hello World', :layout => :layout2
+    }
+    assert ok?
+    assert_equal "ERB Layout!\nHello World\n", body
+  end
 end