sinatra 0.9.6 → 1.0.a

data/sinatra.gemspec

@@ -3,13 +3,13 @@ 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.6'
-  s.date = '2010-03-07'
+  s.version = '1.0.a'
+  s.date = '2010-01-28'
 
   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,60 +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/showexceptions.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/tilt.rb
     sinatra.gemspec
     test/base_test.rb
     test/builder_test.rb
     test/contest.rb
     test/erb_test.rb
+    test/erubis_test.rb
     test/extensions_test.rb
     test/filter_test.rb
     test/haml_test.rb
@@ -78,9 +40,7 @@ Gem::Specification.new do |s|
     test/helpers_test.rb
     test/mapped_error_test.rb
     test/middleware_test.rb
-    test/options_test.rb
     test/public/favicon.ico
-    test/render_backtrace_test.rb
     test/request_test.rb
     test/response_test.rb
     test/result_test.rb
@@ -88,22 +48,25 @@ Gem::Specification.new do |s|
     test/routing_test.rb
     test/sass_test.rb
     test/server_test.rb
+    test/settings_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
   ]
@@ -112,9 +75,12 @@ 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_development_dependency 'shotgun', '>= 0.2',   '< 1.0'
+  s.add_dependency 'rack',    '>= 1.0'
+  s.add_development_dependency 'shotgun', '>= 0.6',   '< 1.0'
   s.add_development_dependency 'rack-test', '>= 0.3.0'
+  s.add_development_dependency 'haml'
+  s.add_development_dependency 'builder'
+  s.add_development_dependency 'erubis'
 
   s.has_rdoc = true
   s.homepage = "http://sinatra.rubyforge.org"

data/test/erubis_test.rb

@@ -0,0 +1,82 @@
+require File.dirname(__FILE__) + '/helper'
+require 'erubis'
+
+class ERubisTest < Test::Unit::TestCase
+  def erubis_app(&block)
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    }
+    get '/'
+  end
+
+  it 'renders inline ERubis strings' do
+    erubis_app { erubis '<%= 1 + 1 %>' }
+    assert ok?
+    assert_equal '2', body
+  end
+
+  it 'renders .erubis files in views path' do
+    erubis_app { erubis :hello }
+    assert ok?
+    assert_equal "Hello World\n", body
+  end
+
+  it 'takes a :locals option' do
+    erubis_app {
+      locals = {:foo => 'Bar'}
+      erubis '<%= foo %>', :locals => locals
+    }
+    assert ok?
+    assert_equal 'Bar', body
+  end
+
+  it "renders with inline layouts" do
+    mock_app {
+      layout { 'THIS. IS. <%= yield.upcase %>!' }
+      get('/') { erubis 'Sparta' }
+    }
+    get '/'
+    assert ok?
+    assert_equal 'THIS. IS. SPARTA!', body
+  end
+
+  it "renders with file layouts" do
+    erubis_app {
+      erubis 'Hello World', :layout => :layout2
+    }
+    assert ok?
+    assert_equal "ERubis Layout!\nHello World\n", body
+  end
+
+  it "renders erubis with blocks" do
+    mock_app {
+      def container
+        @_out_buf << "THIS."
+        yield
+        @_out_buf << "SPARTA!"
+      end
+      def is; "IS." end
+      get '/' do
+        erubis '<% 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><%= erubis :inner %></outer>" }
+      get '/' do
+        erubis :outer
+      end
+    }
+
+    get '/'
+    assert ok?
+    assert_equal '<outer><inner>hi</inner></outer>', body
+  end
+end

data/test/extensions_test.rb

@@ -71,7 +71,7 @@ class ExtensionsTest < Test::Unit::TestCase
     assert !Sinatra::Delegator.private_instance_methods.include?("quux")
   end
 
-  it 'will extend the Sinatra::Application by default' do
+  it 'will extend the Sinatra::Application application by default' do
     Sinatra.register BazExtensions
     assert !Sinatra::Base.respond_to?(:baz)
     assert Sinatra::Application.respond_to?(:baz)

data/test/filter_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-class FilterTest < Test::Unit::TestCase
+class BeforeFilterTest < Test::Unit::TestCase
   it "executes filters in the order defined" do
     count = 0
     mock_app do
@@ -21,7 +21,7 @@ class FilterTest < Test::Unit::TestCase
     assert_equal 'Hello World', body
   end
 
-  it "allows filters to modify the request" do
+  it "can modify the request" do
     mock_app {
       get('/foo') { 'foo' }
       get('/bar') { 'bar' }
@@ -44,7 +44,7 @@ class FilterTest < Test::Unit::TestCase
     assert_equal 'bar', body
   end
 
-  it "allows redirects in filters" do
+  it "allows redirects" do
     mock_app {
       before { redirect '/bar' }
       get('/foo') do
@@ -96,4 +96,126 @@ class FilterTest < Test::Unit::TestCase
     assert ok?
     assert_equal 'cool', body
   end
+
+  it "runs filters defined in superclasses" do
+    base = Class.new(Sinatra::Base)
+    base.before { @foo = 'hello from superclass' }
+
+    mock_app(base) {
+      get('/foo') { @foo }
+    }
+
+    get '/foo'
+    assert_equal 'hello from superclass', body
+  end
+
+  it 'does not run before filter when serving static files' do
+    ran_filter = false
+    mock_app {
+      before { ran_filter = true }
+      set :static, true
+      set :public, File.dirname(__FILE__)
+    }
+    get "/#{File.basename(__FILE__)}"
+    assert ok?
+    assert_equal File.read(__FILE__), body
+    assert !ran_filter
+  end
+end
+
+class AfterFilterTest < Test::Unit::TestCase
+  it "executes filters in the order defined" do
+    invoked = 0
+    mock_app do
+      before   { invoked = 2 }
+      get('/') { invoked += 2 }
+      after    { invoked *= 2 }
+    end
+
+    get '/'
+    assert ok?
+
+    assert_equal 8, invoked
+  end
+
+  it "executes filters in the order defined" do
+    count = 0
+    mock_app do
+      get('/') { 'Hello World' }
+      after {
+        assert_equal 0, count
+        count = 1
+      }
+      after {
+        assert_equal 1, count
+        count = 2
+      }
+    end
+
+    get '/'
+    assert ok?
+    assert_equal 2, count
+    assert_equal 'Hello World', body
+  end
+
+  it "allows redirects" do
+    mock_app {
+      get('/foo') { 'ORLY' }
+      after { redirect '/bar' }
+    }
+
+    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 {
+      get('/foo') { 'cool' }
+      after { 'Hello World!' }
+    }
+
+    get '/foo'
+    assert ok?
+    assert_equal 'cool', body
+  end
+
+  it "does modify the response with halt" do
+    mock_app {
+      get '/foo' do
+        "should not be returned"
+      end
+      after { halt 302, 'Hi' }
+    }
+
+    get '/foo'
+    assert_equal 302, response.status
+    assert_equal 'Hi', body
+  end
+
+  it "runs filters defined in superclasses" do
+    count = 2
+    base = Class.new(Sinatra::Base)
+    base.after { count *= 2 }
+    mock_app(base) {
+      get('/foo') { count += 2 }
+    }
+
+    get '/foo'
+    assert_equal 8, count
+  end
+
+  it 'does not run after filter when serving static files' do
+    ran_filter = false
+    mock_app {
+      after { ran_filter = true }
+      set :static, true
+      set :public, File.dirname(__FILE__)
+    }
+    get "/#{File.basename(__FILE__)}"
+    assert ok?
+    assert_equal File.read(__FILE__), body
+    assert !ran_filter
+  end
 end

data/test/helpers_test.rb

@@ -142,6 +142,19 @@ class HelpersTest < Test::Unit::TestCase
       assert_equal 404, status
       assert_equal '', body
     end
+
+    it 'does not set a X-Cascade header' do
+      mock_app {
+        get '/' do
+          not_found
+          fail 'not_found should halt'
+        end
+      }
+
+      get '/'
+      assert_equal 404, status
+      assert_equal nil, response.headers['X-Cascade']
+    end
   end
 
   describe 'headers' do
@@ -188,15 +201,22 @@ class HelpersTest < Test::Unit::TestCase
 
     it 'creates a new session when none provided' do
       mock_app {
+        enable :sessions
+
         get '/' do
           assert session.empty?
           session[:foo] = 'bar'
-          'Hi'
+          redirect '/hi'
+        end
+
+        get '/hi' do
+          "hi #{session[:foo]}"
         end
       }
 
       get '/'
-      assert_equal 'Hi', body
+      follow_redirect!
+      assert_equal 'hi bar', body
     end
   end
 
@@ -365,6 +385,43 @@ class HelpersTest < Test::Unit::TestCase
     end
   end
 
+  describe 'cache_control' do
+    setup do
+      mock_app {
+        get '/' do
+          cache_control :public, :no_cache, :max_age => 60
+          'Hello World'
+        end
+      }
+    end
+
+    it 'sets the Cache-Control header' do
+      get '/'
+      assert_equal ['public', 'no-cache', 'max-age=60'], response['Cache-Control'].split(', ')
+    end
+  end
+
+  describe 'expires' do
+    setup do
+      mock_app {
+        get '/' do
+          expires 60, :public, :no_cache
+          'Hello World'
+        end
+      }
+    end
+
+    it 'sets the Cache-Control header' do
+      get '/'
+      assert_equal ['public', 'no-cache', 'max-age=60'], response['Cache-Control'].split(', ')
+    end
+
+    it 'sets the Expires header' do
+      get '/'
+      assert_not_nil response['Expires']
+    end
+  end
+
   describe 'last_modified' do
     setup do
       now = Time.now