sinatra 0.2.2 → 0.3.0

data/test/sass_test.rb

@@ -5,7 +5,7 @@ context "Sass" do
   setup do
     Sinatra.application = nil
   end
-  
+
   context "Templates (in general)" do
 
     setup do
@@ -23,7 +23,7 @@ context "Sass" do
       body.should.equal "#sass {\n  background_color: #FFF; }\n"
 
     end
-    
+
     specify "raise an error if template not found" do
       get '/' do
         sass :not_found
@@ -31,27 +31,27 @@ context "Sass" do
 
       lambda { get_it '/' }.should.raise(Errno::ENOENT)
     end
-    
+
     specify "ignore default layout file with .sass extension" do
       get '/' do
         sass :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
       end
-      
+
       get_it '/'
       should.be.ok
       body.should.equal "#sass {\n  background_color: #FFF; }\n"
     end
-    
+
     specify "ignore explicitly specified layout file" do
       get '/' do
         sass :foo, :layout => :layout, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
       end
-      
+
       get_it '/'
       should.be.ok
       body.should.equal "#sass {\n  background_color: #FFF; }\n"
     end
-    
+
   end
 
 end

data/test/sessions_test.rb

@@ -1,10 +1,10 @@
 require File.dirname(__FILE__) + '/helper'
 
 context "Sessions" do
-  
-  specify "should be off by default" do
-    Sinatra.application = nil
 
+  setup { Sinatra.application = nil }
+
+  specify "should be off by default" do
     get '/asdf' do
       session[:test] = true
       "asdf"
@@ -13,15 +13,14 @@ context "Sessions" do
     get '/test' do
       session[:test] == true ? "true" : "false"
     end
-    
+
     get_it '/asdf', {}, 'HTTP_HOST' => 'foo.sinatrarb.com'
     assert ok?
     assert !include?('Set-Cookie')
   end
-  
+
   specify "should be able to store data accross requests" do
-    set_options(:sessions => true)
-    Sinatra.application = nil
+    set_option :sessions, true
 
     get '/foo' do
       session[:test] = true
@@ -34,7 +33,7 @@ context "Sessions" do
 
     get_it '/foo', :env => { :host => 'foo.sinatrarb.com' }
     assert ok?
-    assert include?('Set-Cookie')    
+    assert include?('Set-Cookie')
   end
-  
+
 end

data/test/streaming_test.rb

@@ -77,10 +77,16 @@ context "Static files (by default)" do
     headers['Content-Transfer-Encoding'].should.be.nil
   end
 
+  specify "should be served even if their path is url escaped" do
+	get_it('/fo%6f.xml')
+	should.be.ok
+    body.should.equal "<foo></foo>\n"
+  end
+
 end
 
 context "SendData" do
-  
+
   setup do
     Sinatra.application = nil
   end
@@ -89,13 +95,13 @@ context "SendData" do
     get '/' do
       send_data 'asdf', :status => 500
     end
-  
+
     get_it '/'
-  
+
     should.be.server_error
     body.should.equal 'asdf'
   end
-  
+
   specify "should include a Content-Disposition header" do
     get '/' do
       send_file File.dirname(__FILE__) + '/public/foo.xml'

data/test/sym_params_test.rb

@@ -10,7 +10,7 @@ context "Symbol Params" do
     get '/' do
       params[:foo] + params['foo']
     end
-    
+
     get_it '/', :foo => "X"
     assert_equal('XX', body)
   end

data/test/template_test.rb

@@ -1,30 +1,30 @@
 require File.dirname(__FILE__) + '/helper'
 
-context "Templates (in general)" do
-  
+context "Templates" 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
-  
+
 end

data/test/use_in_file_templates_test.rb

@@ -6,42 +6,41 @@ context "Rendering in file templates" do
     Sinatra.application = nil
     use_in_file_templates!
   end
-  
+
   specify "should set template" do
     assert Sinatra.application.templates[:foo]
   end
-  
+
   specify "should set layout" do
     assert Sinatra.application.templates[:layout]
   end
-  
+
   specify "should render without layout if specified" do
     get '/' do
       haml :foo, :layout => false
     end
-    
+
     get_it '/'
     assert_equal "this is foo\n", body
   end
-    
+
   specify "should render with layout if specified" do
     get '/' do
       haml :foo
     end
-    
+
     get_it '/'
     assert_equal "X\nthis is foo\nX\n", body
   end
-  
-    
+
 end
 
 __END__
 
-## foo
+@@ foo
 this is foo
 
-## layout
+@@ layout
 X
 = yield
 X

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,57 +9,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-15 00:00:00 -07:00
+date: 2008-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mongrel
+  name: rack
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.1
+        version: 0.4.0
     version: 
 description: Classy web-development dressed in a DSL
-email: ""
+email: 
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- CHANGELOG
-- lib/sinatra/test/methods.rb
-- lib/sinatra/test/spec.rb
-- lib/sinatra/test/unit.rb
-- lib/sinatra.rb
-- LICENSE
 - README.rdoc
+- LICENSE
 files: 
-- CHANGELOG
+- ChangeLog
+- LICENSE
+- README.rdoc
+- Rakefile
 - images/404.png
 - images/500.png
-- index.html
+- lib/sinatra.rb
+- lib/sinatra/rack/handler/mongrel.rb
 - lib/sinatra/test/methods.rb
+- lib/sinatra/test/rspec.rb
 - lib/sinatra/test/spec.rb
 - lib/sinatra/test/unit.rb
-- lib/sinatra.rb
-- LICENSE
-- Manifest
-- README.rdoc
+- sinatra.gemspec
 - test/app_test.rb
 - test/application_test.rb
 - test/builder_test.rb
 - test/custom_error_test.rb
-- test/diddy_test.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/mapped_error_test.rb
+- test/pipeline_test.rb
 - test/public/foo.xml
-- test/rest_test.rb
 - test/sass_test.rb
 - test/sessions_test.rb
 - test/streaming_test.rb
@@ -82,86 +80,9 @@ files:
 - test/views/layout_test/layout.sass
 - test/views/no_layout/no_layout.builder
 - test/views/no_layout/no_layout.haml
-- vendor/rack/AUTHORS
-- vendor/rack/bin/rackup
-- vendor/rack/contrib/rack_logo.svg
-- vendor/rack/COPYING
-- vendor/rack/example/lobster.ru
-- vendor/rack/example/protectedlobster.rb
-- vendor/rack/example/protectedlobster.ru
-- vendor/rack/KNOWN-ISSUES
-- vendor/rack/lib/rack/adapter/camping.rb
-- vendor/rack/lib/rack/auth/abstract/handler.rb
-- vendor/rack/lib/rack/auth/abstract/request.rb
-- vendor/rack/lib/rack/auth/basic.rb
-- vendor/rack/lib/rack/auth/digest/md5.rb
-- vendor/rack/lib/rack/auth/digest/nonce.rb
-- vendor/rack/lib/rack/auth/digest/params.rb
-- vendor/rack/lib/rack/auth/digest/request.rb
-- vendor/rack/lib/rack/auth/openid.rb
-- vendor/rack/lib/rack/builder.rb
-- vendor/rack/lib/rack/cascade.rb
-- vendor/rack/lib/rack/commonlogger.rb
-- vendor/rack/lib/rack/file.rb
-- vendor/rack/lib/rack/handler/cgi.rb
-- vendor/rack/lib/rack/handler/fastcgi.rb
-- vendor/rack/lib/rack/handler/lsws.rb
-- vendor/rack/lib/rack/handler/mongrel.rb
-- vendor/rack/lib/rack/handler/scgi.rb
-- vendor/rack/lib/rack/handler/webrick.rb
-- vendor/rack/lib/rack/lint.rb
-- vendor/rack/lib/rack/lobster.rb
-- vendor/rack/lib/rack/mock.rb
-- vendor/rack/lib/rack/recursive.rb
-- vendor/rack/lib/rack/reloader.rb
-- vendor/rack/lib/rack/request.rb
-- vendor/rack/lib/rack/response.rb
-- vendor/rack/lib/rack/session/abstract/id.rb
-- vendor/rack/lib/rack/session/cookie.rb
-- vendor/rack/lib/rack/session/memcache.rb
-- vendor/rack/lib/rack/session/pool.rb
-- vendor/rack/lib/rack/showexceptions.rb
-- vendor/rack/lib/rack/showstatus.rb
-- vendor/rack/lib/rack/static.rb
-- vendor/rack/lib/rack/urlmap.rb
-- vendor/rack/lib/rack/utils.rb
-- vendor/rack/lib/rack.rb
-- vendor/rack/Rakefile
-- vendor/rack/README
-- vendor/rack/test/cgi/lighttpd.conf
-- vendor/rack/test/cgi/test
-- vendor/rack/test/cgi/test.fcgi
-- vendor/rack/test/cgi/test.ru
-- vendor/rack/test/spec_rack_auth_basic.rb
-- vendor/rack/test/spec_rack_auth_digest.rb
-- vendor/rack/test/spec_rack_builder.rb
-- vendor/rack/test/spec_rack_camping.rb
-- vendor/rack/test/spec_rack_cascade.rb
-- vendor/rack/test/spec_rack_cgi.rb
-- vendor/rack/test/spec_rack_commonlogger.rb
-- vendor/rack/test/spec_rack_fastcgi.rb
-- vendor/rack/test/spec_rack_file.rb
-- vendor/rack/test/spec_rack_lint.rb
-- vendor/rack/test/spec_rack_lobster.rb
-- vendor/rack/test/spec_rack_mock.rb
-- vendor/rack/test/spec_rack_mongrel.rb
-- vendor/rack/test/spec_rack_recursive.rb
-- vendor/rack/test/spec_rack_request.rb
-- vendor/rack/test/spec_rack_response.rb
-- vendor/rack/test/spec_rack_session_cookie.rb
-- vendor/rack/test/spec_rack_session_memcache.rb
-- vendor/rack/test/spec_rack_session_pool.rb
-- vendor/rack/test/spec_rack_showexceptions.rb
-- vendor/rack/test/spec_rack_showstatus.rb
-- vendor/rack/test/spec_rack_static.rb
-- vendor/rack/test/spec_rack_urlmap.rb
-- vendor/rack/test/spec_rack_utils.rb
-- vendor/rack/test/spec_rack_webrick.rb
-- vendor/rack/test/testrequest.rb
-- sinatra.gemspec
 has_rdoc: true
-homepage: http://www.sinatrarb.com
-post_install_message: "*** Be sure to checkout http://sinatrarb.com for helpful tips!***"
+homepage: http://sinatrarb.com
+post_install_message: 
 rdoc_options: 
 - --line-numbers
 - --inline-source
@@ -186,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sinatra
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Classy web-development dressed in a DSL
@@ -195,13 +116,13 @@ test_files:
 - test/application_test.rb
 - test/builder_test.rb
 - test/custom_error_test.rb
-- test/diddy_test.rb
 - test/erb_test.rb
 - test/event_context_test.rb
 - test/events_test.rb
+- test/filter_test.rb
 - test/haml_test.rb
 - test/mapped_error_test.rb
-- test/rest_test.rb
+- test/pipeline_test.rb
 - test/sass_test.rb
 - test/sessions_test.rb
 - test/streaming_test.rb

data/CHANGELOG

@@ -1,3 +0,0 @@
-v0.2.2 Including vendor which made last release bogus
-v0.2.1 File upload fix and minor tweaks
-v0.2.0 Released!

data/Manifest

@@ -1,122 +0,0 @@
-CHANGELOG
-images/404.png
-images/500.png
-index.html
-lib/sinatra/test/methods.rb
-lib/sinatra/test/spec.rb
-lib/sinatra/test/unit.rb
-lib/sinatra.rb
-LICENSE
-Manifest
-README.rdoc
-test/app_test.rb
-test/application_test.rb
-test/builder_test.rb
-test/custom_error_test.rb
-test/diddy_test.rb
-test/erb_test.rb
-test/event_context_test.rb
-test/events_test.rb
-test/haml_test.rb
-test/helper.rb
-test/mapped_error_test.rb
-test/public/foo.xml
-test/rest_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
-vendor/rack/AUTHORS
-vendor/rack/bin/rackup
-vendor/rack/contrib/rack_logo.svg
-vendor/rack/COPYING
-vendor/rack/example/lobster.ru
-vendor/rack/example/protectedlobster.rb
-vendor/rack/example/protectedlobster.ru
-vendor/rack/KNOWN-ISSUES
-vendor/rack/lib/rack/adapter/camping.rb
-vendor/rack/lib/rack/auth/abstract/handler.rb
-vendor/rack/lib/rack/auth/abstract/request.rb
-vendor/rack/lib/rack/auth/basic.rb
-vendor/rack/lib/rack/auth/digest/md5.rb
-vendor/rack/lib/rack/auth/digest/nonce.rb
-vendor/rack/lib/rack/auth/digest/params.rb
-vendor/rack/lib/rack/auth/digest/request.rb
-vendor/rack/lib/rack/auth/openid.rb
-vendor/rack/lib/rack/builder.rb
-vendor/rack/lib/rack/cascade.rb
-vendor/rack/lib/rack/commonlogger.rb
-vendor/rack/lib/rack/file.rb
-vendor/rack/lib/rack/handler/cgi.rb
-vendor/rack/lib/rack/handler/fastcgi.rb
-vendor/rack/lib/rack/handler/lsws.rb
-vendor/rack/lib/rack/handler/mongrel.rb
-vendor/rack/lib/rack/handler/scgi.rb
-vendor/rack/lib/rack/handler/webrick.rb
-vendor/rack/lib/rack/lint.rb
-vendor/rack/lib/rack/lobster.rb
-vendor/rack/lib/rack/mock.rb
-vendor/rack/lib/rack/recursive.rb
-vendor/rack/lib/rack/reloader.rb
-vendor/rack/lib/rack/request.rb
-vendor/rack/lib/rack/response.rb
-vendor/rack/lib/rack/session/abstract/id.rb
-vendor/rack/lib/rack/session/cookie.rb
-vendor/rack/lib/rack/session/memcache.rb
-vendor/rack/lib/rack/session/pool.rb
-vendor/rack/lib/rack/showexceptions.rb
-vendor/rack/lib/rack/showstatus.rb
-vendor/rack/lib/rack/static.rb
-vendor/rack/lib/rack/urlmap.rb
-vendor/rack/lib/rack/utils.rb
-vendor/rack/lib/rack.rb
-vendor/rack/Rakefile
-vendor/rack/README
-vendor/rack/test/cgi/lighttpd.conf
-vendor/rack/test/cgi/test
-vendor/rack/test/cgi/test.fcgi
-vendor/rack/test/cgi/test.ru
-vendor/rack/test/spec_rack_auth_basic.rb
-vendor/rack/test/spec_rack_auth_digest.rb
-vendor/rack/test/spec_rack_builder.rb
-vendor/rack/test/spec_rack_camping.rb
-vendor/rack/test/spec_rack_cascade.rb
-vendor/rack/test/spec_rack_cgi.rb
-vendor/rack/test/spec_rack_commonlogger.rb
-vendor/rack/test/spec_rack_fastcgi.rb
-vendor/rack/test/spec_rack_file.rb
-vendor/rack/test/spec_rack_lint.rb
-vendor/rack/test/spec_rack_lobster.rb
-vendor/rack/test/spec_rack_mock.rb
-vendor/rack/test/spec_rack_mongrel.rb
-vendor/rack/test/spec_rack_recursive.rb
-vendor/rack/test/spec_rack_request.rb
-vendor/rack/test/spec_rack_response.rb
-vendor/rack/test/spec_rack_session_cookie.rb
-vendor/rack/test/spec_rack_session_memcache.rb
-vendor/rack/test/spec_rack_session_pool.rb
-vendor/rack/test/spec_rack_showexceptions.rb
-vendor/rack/test/spec_rack_showstatus.rb
-vendor/rack/test/spec_rack_static.rb
-vendor/rack/test/spec_rack_urlmap.rb
-vendor/rack/test/spec_rack_utils.rb
-vendor/rack/test/spec_rack_webrick.rb
-vendor/rack/test/testrequest.rb