sinatra 0.2.2 → 0.3.0

data/{vendor/rack/lib → lib/sinatra}/rack/handler/mongrel.rb

@@ -1,6 +1,7 @@
 require 'mongrel'
 require 'stringio'
 
+
 module Rack
   module Handler
     class Mongrel < ::Mongrel::HttpHandler
@@ -65,9 +66,15 @@ module Rack
               response.header[k] = v
             }
           }
-          body.each { |part|
-            response.body << part
-          }
+          # taken from Merb until we have a better solution that conforms
+          # to the Rack::Standard
+          if Proc === body
+            body.call(response)
+          else
+            body.each { |part|
+              response.body << part
+            }
+          end
           response.finished
         ensure
           body.close  if body.respond_to? :close

data/lib/sinatra/test/methods.rb

@@ -1,56 +1,76 @@
-class Rack::MockRequest
-  class << self
-    alias :env_for_without_env :env_for
-    def env_for(uri = "", opts = {})
-      env = { 'HTTP_USER_AGENT' => opts.delete(:agent) }
-      env_for_without_env(uri, opts).merge(env)
-    end
-  end
-end
-
 module Sinatra
-  
+
   module Test
-    
+
     module Methods
+      include Rack::Utils
+
+      ENV_KEY_NAMES = {
+        :accept => "HTTP_ACCEPT",
+        :agent => "HTTP_USER_AGENT",
+        :host => "HTTP_HOST",
+        :session => "HTTP_COOKIE",
+        :cookies => "HTTP_COOKIE",
+        :content_type => "CONTENT_TYPE"
+      }
 
-      def easy_env_map
-        {
-          :accept => 'HTTP_ACCEPT',
-          :agent => 'HTTP_AGENT',
-          :host => 'HTTP_POST'
-        }
+      def session(data, key = 'rack.session')
+        data = data.from_params if data.respond_to?(:from_params)
+        "#{escape(key)}=#{[Marshal.dump(data)].pack("m*")}"
       end
-    
-      def map_easys(params)
-        easy_env_map.inject(params.dup) do |m, (from, to)|
-          m[to] = m.delete(from) if m.has_key?(from); m
+
+      def normalize_rack_environment(env)
+        env.inject({}) do |hash,(k,v)|
+          hash[ENV_KEY_NAMES[k] || k] = v
+          hash
         end
       end
 
-      %w(get head post put delete).each do |m|
-        define_method("#{m}_it") do |path, *args|
-          request = Rack::MockRequest.new(Sinatra.build_application)
-          env, input = if args.size == 2
-            [args.last, args.first]
-          elsif args.size == 1
-            data = args.first
-            data.is_a?(Hash) ? [data.delete(:env), data.to_params] : [nil, data]
-          end
-          @response = request.request(m.upcase, path, {:input => input}.merge(env || {}))
+      def hash_to_param_string(hash)
+        hash.map { |pair| pair.map{|v|escape(v)}.join('=') }.join('&')
+      end
+
+      %w(get head post put delete).each do |verb|
+        http_method = verb.upcase
+        define_method("#{verb}_it") do |path, *args|
+          @request = Rack::MockRequest.new(Sinatra.build_application)
+          opts, input =
+            case args.size
+            when 2 # input, env
+              input, env = args
+              [env, input]
+            when 1 # params
+              if (data = args.first).kind_of?(Hash)
+                env = (data.delete(:env) || {})
+                [env, hash_to_param_string(data)]
+              else
+                [{}, data]
+              end
+            when 0
+              [{}, '']
+            else
+              raise ArgumentError, "zero, one, or two arguments expected"
+            end
+          opts = normalize_rack_environment(opts)
+          opts[:input] ||= input
+          @response = @request.request(http_method, path, opts)
         end
       end
-      
+
       def follow!
         get_it(@response.location)
       end
 
       def method_missing(name, *args)
-        @response.send(name, *args)
+        if @response.respond_to?(name)
+          @response.send(name, *args)
+        else
+          super
+        end
       end
-      
+
     end
 
   end
-  
+
 end

data/lib/sinatra/test/rspec.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/unit'
+require 'spec/interop/test'
+
+class Test::Unit::TestCase
+
+  def should
+    @response.should
+  end
+
+end

data/lib/sinatra/test/spec.rb

@@ -2,9 +2,9 @@ require File.dirname(__FILE__) + '/unit'
 require 'test/spec'
 
 class Test::Unit::TestCase
-  
+
   def should
     @response.should
   end
-  
+
 end

data/lib/sinatra/test/unit.rb

@@ -10,4 +10,4 @@ Sinatra::Application.default_options.merge!(
   :logging => false
 )
 
-Sinatra.application.options = nil
+Sinatra.application = nil

data/sinatra.gemspec

@@ -1,50 +1,78 @@
-
-# Gem::Specification for Sinatra-0.2.2
-# Originally generated by Echoe
-
 Gem::Specification.new do |s|
-  s.name = %q{sinatra}
-  s.version = "0.2.2"
-
   s.specification_version = 2 if s.respond_to? :specification_version=
-
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+
+  s.name = 'sinatra'
+  s.version = '0.3.0'
+  s.date = "2008-08-31"
+
+  s.description = "Classy web-development dressed in a DSL"
+  s.summary     = "Classy web-development dressed in a DSL"
+
   s.authors = ["Blake Mizerany"]
-  s.date = %q{2008-04-15}
-  s.description = %q{Classy web-development dressed in a DSL}
-  s.email = %q{}
-  s.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"]
-  s.files = ["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", "sinatra.gemspec"]
-  s.has_rdoc = true
-  s.homepage = %q{http://www.sinatrarb.com}
-  s.post_install_message = %q{*** Be sure to checkout http://sinatrarb.com for helpful tips!***}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Sinatra", "--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{sinatra}
-  s.rubygems_version = %q{1.0.1}
-  s.summary = %q{Classy web-development dressed in a DSL}
-  s.test_files = ["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/mapped_error_test.rb", "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"]
 
-  s.add_dependency(%q<mongrel>, [">= 1.0.1"])
-end
+  # = MANIFEST =
+  s.files = %w[
+    ChangeLog
+    LICENSE
+    README.rdoc
+    Rakefile
+    images/404.png
+    images/500.png
+    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
+    sinatra.gemspec
+    test/app_test.rb
+    test/application_test.rb
+    test/builder_test.rb
+    test/custom_error_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/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
+  ]
+  # = 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'
 
-# # Original Rakefile source (requires the Echoe gem):
-# 
-# require 'rubygems'
-# require 'rake/testtask'
-# require 'rake/rdoctask'
-# require 'echoe'
-# 
-# task :default => :test
-# 
-# Echoe.new("sinatra") do |p|
-#   p.files = Dir[File.dirname(__FILE__) + "/{lib,vendor}/**/*"]
-#   p.author = "Blake Mizerany"
-#   p.summary = "Classy web-development dressed in a DSL"
-#   p.url = "http://www.sinatrarb.com"
-#   p.docs_host = "sinatrarb.com:/var/www/blakemizerany.com/public/docs/"
-#   p.dependencies = ["mongrel >=1.0.1"]
-#   p.install_message = "*** Be sure to checkout http://sinatrarb.com for helpful tips!***"
-# end
-# 
+  s.has_rdoc = true
+  s.homepage = "http://sinatrarb.com"
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Sinatra", "--main", "README.rdoc"]
+  s.require_paths = %w[lib]
+  s.rubyforge_project = 'sinatra'
+  s.rubygems_version = '1.1.1'
+end

data/test/app_test.rb

@@ -1,50 +1,112 @@
 require File.dirname(__FILE__) + '/helper'
 
 context "Sinatra" do
-  
+
   setup do
     Sinatra.application = nil
   end
-  
+
+  specify "should put all DSL methods on (main)" do
+    object = Object.new
+    Sinatra::Application::FORWARD_METHODS.each do |method|
+      object.private_methods.should.include(method)
+    end
+  end
+
   specify "should handle result of nil" do
     get '/' do
       nil
     end
-    
+
     get_it '/'
     should.be.ok
     body.should == ''
   end
-  
+
   specify "handles events" do
     get '/:name' do
       'Hello ' + params["name"]
     end
-    
+
     get_it '/Blake'
-    
+
     should.be.ok
     body.should.equal 'Hello Blake'
   end
-  
+
+
+  specify "handles splats" do
+    get '/hi/*' do
+      params["splat"].kind_of?(Array).should.equal true
+      params["splat"].first
+    end
+
+    get_it '/hi/Blake'
+
+    should.be.ok
+    body.should.equal 'Blake'
+  end
+
+  specify "handles multiple splats" do
+    get '/say/*/to/*' do
+      params["splat"].join(' ')
+    end
+
+    get_it '/say/hello/to/world'
+
+    should.be.ok
+    body.should.equal 'hello world'
+  end
+
+  specify "allow empty splats" do
+    get '/say/*/to*/*' do
+      params["splat"].join(' ')
+    end
+
+    get_it '/say/hello/to/world'
+
+    should.be.ok
+    body.should.equal 'hello  world' # second splat is empty
+
+    get_it '/say/hello/tomy/world'
+
+    should.be.ok
+    body.should.equal 'hello my world'
+  end
+
+  specify "gives access to underlying response header Hash" do
+    get '/' do
+      header['X-Test'] = 'Is this thing on?'
+      headers 'X-Test2' => 'Foo', 'X-Test3' => 'Bar'
+      ''
+    end
+
+    get_it '/'
+    should.be.ok
+    headers.should.include 'X-Test'
+    headers['X-Test'].should.equal 'Is this thing on?'
+    headers.should.include 'X-Test3'
+    headers['X-Test3'].should.equal 'Bar'
+  end
+
   specify "follows redirects" do
     get '/' do
       redirect '/blake'
     end
-    
+
     get '/blake' do
       'Mizerany'
     end
-    
+
     get_it '/'
     should.be.redirection
     body.should.equal ''
-    
+
     follow!
     should.be.ok
     body.should.equal 'Mizerany'
   end
-  
+
   specify "renders a body with a redirect" do
     Sinatra::EventContext.any_instance.expects(:foo).returns('blah')
     get "/" do
@@ -55,36 +117,111 @@ context "Sinatra" do
     headers['Location'].should.equal 'foo'
     body.should.equal 'blah'
   end
-  
-  specify "body sets content and ends event" do
-    
+
+  specify "redirects permanently with 301 status code" do
+    get "/" do
+      redirect 'foo', 301
+    end
+    get_it '/'
+    should.be.redirection
+    headers['Location'].should.equal 'foo'
+    status.should.equal 301
+    body.should.be.empty
+  end
+
+  specify "stop sets content and ends event" do
+
     Sinatra::EventContext.any_instance.expects(:foo).never
-    
+
     get '/set_body' do
       stop 'Hello!'
       stop 'World!'
       foo
     end
-    
+
     get_it '/set_body'
-    
+
     should.be.ok
     body.should.equal 'Hello!'
-    
+
   end
-  
+
   specify "should set status then call helper with a var" do
     Sinatra::EventContext.any_instance.expects(:foo).once.with(1).returns('bah!')
-    
+
     get '/set_body' do
       stop [404, [:foo, 1]]
     end
-    
+
     get_it '/set_body'
-    
+
     should.be.not_found
     body.should.equal 'bah!'
-    
+
+  end
+
+  specify "should easily set response Content-Type" do
+    get '/foo.html' do
+      content_type 'text/html', :charset => 'utf-8'
+      "<h1>Hello, World</h1>"
+    end
+
+    get_it '/foo.html'
+    should.be.ok
+    headers['Content-Type'].should.equal 'text/html;charset=utf-8'
+    body.should.equal '<h1>Hello, World</h1>'
+
+    get '/foo_test.xml' do
+      content_type :xml
+      "<feed></feed>"
+    end
+
+    get_it '/foo_test.xml'
+    should.be.ok
+    headers['Content-Type'].should.equal 'application/xml'
+    body.should.equal '<feed></feed>'
+  end
+
+  specify "supports conditional GETs with last_modified" do
+    modified_at = Time.now
+    get '/maybe' do
+      last_modified modified_at
+      'response body, maybe'
+    end
+
+    get_it '/maybe'
+    should.be.ok
+    body.should.equal 'response body, maybe'
+
+    get_it '/maybe', :env => { 'HTTP_IF_MODIFIED_SINCE' => modified_at.httpdate }
+    status.should.equal 304
+    body.should.equal ''
+  end
+
+  specify "supports conditional GETs with entity_tag" do
+    get '/strong' do
+      entity_tag 'FOO'
+      'foo response'
+    end
+
+    get_it '/strong'
+    should.be.ok
+    body.should.equal 'foo response'
+
+    get_it '/strong', {},
+      'HTTP_IF_NONE_MATCH' => '"BAR"'
+    should.be.ok
+    body.should.equal 'foo response'
+
+    get_it '/strong', {},
+      'HTTP_IF_NONE_MATCH' => '"FOO"'
+    status.should.equal 304
+    body.should.equal ''
+
+    get_it '/strong', {},
+      'HTTP_IF_NONE_MATCH' => '"BAR", *'
+    status.should.equal 304
+    body.should.equal ''
   end
 
   specify "delegates HEAD requests to GET handlers" do
@@ -98,26 +235,26 @@ context "Sinatra" do
     body.should.equal ''
   end
 
-  
-  specify "put'n with POST" do
+
+  specify "supports PUT" do
     put '/' do
       'puted'
     end
-    post_it '/', :_method => 'PUT'
+    put_it '/'
     assert_equal 'puted', body
   end
 
-  specify "put'n wth PUT" do
+  specify "rewrites POSTs with _method param to PUT" do
     put '/' do
       'puted'
     end
-    put_it '/'
+    post_it '/', :_method => 'PUT'
     assert_equal 'puted', body
   end
 
-  # Some Ajax libraries downcase the _method parameter value. Make 
+  # Some Ajax libraries downcase the _method parameter value. Make
   # sure we can handle that.
-  specify "put'n with POST and lowercase _method param" do
+  specify "rewrites POSTs with lowercase _method param to PUT" do
     put '/' do
       'puted'
     end
@@ -126,7 +263,7 @@ context "Sinatra" do
   end
 
   # Ignore any _method parameters specified in GET requests or on the query string in POST requests.
-  specify "not put'n with GET" do
+  specify "does not rewrite GETs with _method param to PUT" do
     get '/' do
       'getted'
     end
@@ -135,7 +272,7 @@ context "Sinatra" do
     body.should.equal 'getted'
   end
 
-  specify "_method query string parameter ignored on POST" do
+  specify "ignores _method query string parameter on non-POST requests" do
     post '/' do
       'posted'
     end
@@ -147,4 +284,16 @@ context "Sinatra" do
     body.should.equal 'posted'
   end
 
+  specify "does not read body if content type is not url encoded" do
+    post '/foo.xml' do
+      request.env['CONTENT_TYPE'].should.be == 'application/xml'
+      request.content_type.should.be == 'application/xml'
+      request.body.read
+    end
+
+    post_it '/foo.xml', '<foo></foo>', :content_type => 'application/xml'
+    @response.should.be.ok
+    @response.body.should.be == '<foo></foo>'
+  end
+
 end