sinatra 0.9.1.1 → 0.9.2

data/test/server_test.rb

@@ -14,8 +14,8 @@ class Rack::Handler::Mock
   end
 end
 
-describe 'Sinatra::Base.run!' do
-  before do
+class ServerTest < Test::Unit::TestCase
+  setup do
     mock_app {
       set :server, 'mock'
       set :host, 'foo.local'
@@ -24,7 +24,9 @@ describe 'Sinatra::Base.run!' do
     $stdout = File.open('/dev/null', 'wb')
   end
 
-  after { $stdout = STDOUT }
+  def teardown
+    $stdout = STDOUT
+  end
 
   it "locates the appropriate Rack handler and calls ::run" do
     @app.run!

data/test/sinatra_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Sinatra' do
+class SinatraTest < Test::Unit::TestCase
   it 'creates a new Sinatra::Base subclass on new' do
     app =
       Sinatra.new do

data/test/static_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Static' do
-  before do
+class StaticTest < Test::Unit::TestCase
+  setup do
     mock_app {
       set :static, true
       set :public, File.dirname(__FILE__)

data/test/templates_test.rb

@@ -1,9 +1,9 @@
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Templating' do
+class TemplatesTest < Test::Unit::TestCase
   def render_app(&block)
     mock_app {
-      def render_test(template, data, options, &block)
+      def render_test(template, data, options, locals, &block)
         inner = block ? block.call : ''
         data + inner
       end
@@ -72,11 +72,23 @@ describe 'Templating' do
     mock_app {
       use_in_file_templates!
     }
-    assert_equal "this is foo\n\n", @app.templates[:foo]
-    assert_equal "X\n= yield\nX\n", @app.templates[:layout]
+    assert_equal "this is foo\n\n", @app.templates[:foo][:template]
+    assert_equal "X\n= yield\nX\n", @app.templates[:layout][:template]
+  end
+
+  test 'use_in_file_templates simply ignores IO errors' do
+    assert_nothing_raised {
+      mock_app {
+        use_in_file_templates!('/foo/bar')
+      }
+    }
+
+    assert @app.templates.empty?
   end
 end
 
+# __END__ : this is not the real end of the script.
+
 __END__
 
 @@ foo

data/test/test_test.rb

@@ -1,7 +1,15 @@
-require 'yaml'
 require File.dirname(__FILE__) + '/helper'
 
-describe 'Sinatra::Test' do
+require 'yaml'
+
+# silence deprecation warning when requiring sinatra/test
+$VERBOSE, v = nil, $VERBOSE
+require 'sinatra/test'
+$VERBOSE = v
+
+class TestTest < Test::Unit::TestCase
+  include Sinatra::Test
+
   def request
     YAML.load(body)
   end
@@ -14,7 +22,7 @@ describe 'Sinatra::Test' do
     YAML.load(request['test.params'])
   end
 
-  before do
+  setup do
     mock_app {
       %w[get head post put delete].each { |verb|
         send(verb, '/') do
@@ -45,8 +53,8 @@ describe 'Sinatra::Test' do
     assert_equal('DELETE', request['REQUEST_METHOD'])
 
     head '/'
-    assert_equal('596', response.headers['Content-Length'])
-    assert_equal('', response.body)
+    assert response.headers['Content-Length'].to_i > 0
+    assert_equal('', body)
   end
 
   it 'allows to specify a body' do
@@ -92,8 +100,8 @@ describe 'Sinatra::Test' do
     get '/', :env => { :host => '1.2.3.4' }
     assert_equal '1.2.3.4', request['HTTP_HOST']
 
-    get '/', :env => { :session => 'foo' }
-    assert_equal 'foo', request['rack.session']
+    get '/', :env => { :session => {'foo' => 'bar'} }
+    assert_equal({'foo' => 'bar'}, request['rack.session'])
 
     get '/', :env => { :cookies => 'foo' }
     assert_equal 'foo', request['HTTP_COOKIE']

data/test/views/error.builder

@@ -0,0 +1,3 @@
+xml.error do
+  raise "goodbye"
+end

data/test/views/error.erb

@@ -0,0 +1,3 @@
+Hello <%= 'World' %>
+<% raise 'Goodbye' unless defined?(french) && french %>
+<% raise 'Au revoir' if defined?(french) && french %>

data/test/views/error.haml

@@ -0,0 +1,3 @@
+%h1 Hello From Haml
+= raise 'goodbye' unless defined?(french) && french
+= raise 'au revoir' if defined?(french) && french

data/test/views/error.sass

@@ -0,0 +1,2 @@
+#sass
+  +argle-bargle

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.9.1.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-09 00:00:00 -07:00
+date: 2009-05-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,10 +21,30 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.9.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: shotgun
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.2"
     - - <
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
 description: Classy web-development dressed in a DSL
 email: sinatrarb@googlegroups.com
 executables: []
@@ -81,6 +101,7 @@ files:
 - 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
@@ -89,6 +110,7 @@ files:
 - sinatra.gemspec
 - test/base_test.rb
 - test/builder_test.rb
+- test/contest.rb
 - test/data/reload_app_file.rb
 - test/erb_test.rb
 - test/extensions_test.rb
@@ -99,10 +121,11 @@ files:
 - test/mapped_error_test.rb
 - test/middleware_test.rb
 - test/options_test.rb
-- test/reload_test.rb
+- test/render_backtrace_test.rb
 - test/request_test.rb
 - test/response_test.rb
 - test/result_test.rb
+- test/route_added_hook_test.rb
 - test/routing_test.rb
 - test/sass_test.rb
 - test/server_test.rb
@@ -110,6 +133,10 @@ files:
 - test/static_test.rb
 - test/templates_test.rb
 - test/test_test.rb
+- test/views/error.builder
+- test/views/error.erb
+- test/views/error.haml
+- test/views/error.sass
 - test/views/hello.builder
 - test/views/hello.erb
 - test/views/hello.haml
@@ -161,10 +188,11 @@ test_files:
 - test/mapped_error_test.rb
 - test/middleware_test.rb
 - test/options_test.rb
-- test/reload_test.rb
+- test/render_backtrace_test.rb
 - test/request_test.rb
 - test/response_test.rb
 - test/result_test.rb
+- test/route_added_hook_test.rb
 - test/routing_test.rb
 - test/sass_test.rb
 - test/server_test.rb

data/test/reload_test.rb

@@ -1,68 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-$reload_count = 0
-$reload_app = nil
-
-describe "Reloading" do
-  before {
-    @app = mock_app(Sinatra::Default)
-    $reload_app = @app
-  }
-
-  after {
-    $reload_app = nil
-  }
-
-  it 'is enabled by default when in development and the app_file is set' do
-    @app.set :app_file, __FILE__
-    @app.set :environment, :development
-    assert_same true, @app.reload
-    assert_same true, @app.reload?
-  end
-
-  it 'is disabled by default when running in non-development environment' do
-    @app.set :app_file, __FILE__
-    @app.set :environment, :test
-    assert !@app.reload
-    assert_same false, @app.reload?
-  end
-
-  it 'is disabled by default when no app_file is available' do
-    @app.set :app_file, nil
-    @app.set :environment, :development
-    assert !@app.reload
-    assert_same false, @app.reload?
-  end
-
-  it 'is disabled when app_file is a rackup (.ru) file' do
-    @app.set :app_file, __FILE__.sub(/\.rb$/, '.ru')
-    @app.set :environment, :development
-    assert !@app.reload
-    assert_same false, @app.reload?
-  end
-
-  it 'can be turned off explicitly' do
-    @app.set :app_file, __FILE__
-    @app.set :environment, :development
-    assert_same true, @app.reload
-    @app.set :reload, false
-    assert_same false, @app.reload
-    assert_same false, @app.reload?
-  end
-
-  it 'reloads the app_file each time a request is made' do
-    @app.set :app_file, File.dirname(__FILE__) + '/data/reload_app_file.rb'
-    @app.set :reload, true
-    @app.get('/') { 'Hello World' }
-
-    get '/'
-    assert_equal 200, status
-    assert_equal 'Hello from reload file', body
-    assert_equal 1, $reload_count
-
-    get '/'
-    assert_equal 200, status
-    assert_equal 'Hello from reload file', body
-    assert_equal 2, $reload_count
-  end
-end