sinatra 1.2.9 → 1.3.0.a

data/README.zh.rdoc

@@ -843,8 +843,8 @@ Session被用来在请求之间保持状态。如果被激活，每一个用户
 。简单的使用 +call+ 可以做到这一点:
 
   get '/foo' do
-    status, headers, body = call env.merge("PATH_INFO" => '/bar')
-    [status, headers, body.map(&:upcase)]
+    status, headers, body = call request.env.merge("PATH_INFO" => '/bar')
+    [status, body.upcase]
   end
 
   get '/bar' do
@@ -884,7 +884,7 @@ Session被用来在请求之间保持状态。如果被激活，每一个用户
   get '/foo' do
     status 418
     headers \
-      "Allow"   => "BREW, POST, GET, PROPFIND, WHEN",
+      "Allow"   => "BREW, POST, GET, PROPFIND, WHEN"
       "Refresh" => "Refresh: 20; http://www.ietf.org/rfc/rfc2324.txt"
     body "I'm a tea pot!"
   end
@@ -948,7 +948,7 @@ Sinatra并不理解。使用 +mime_type+ 通过文件扩展名来注册它们：
 
 或者使用session:
 
-  enable :sessions
+  enable :session
 
   get '/foo' do
     session[:secret] = 'foo'
@@ -1314,7 +1314,7 @@ Sinatra会自动处理range请求。
 自定义错误：
 
   error MyCustomError do
-    'So what happened was...' + env['sinatra.error'].message
+    'So what happened was...' + request.env['sinatra.error'].message
   end
 
 那么，当这个发生的时候：
@@ -1500,7 +1500,7 @@ Sinatra::Base子类可用的方法实际上就是通过顶层 DSL
 或者使用一个 <tt>config.ru</tt>，允许你使用任何Rack处理器:
 
   # config.ru
-  require './my_app'
+  require 'my_app'
   run MyApp
 
 运行:
@@ -1520,7 +1520,7 @@ Sinatra::Base子类可用的方法实际上就是通过顶层 DSL
 
 加入相应的 <tt>config.ru</tt>:
 
-  require './app'
+  require 'app'
   run Sinatra::Application
 
 === 什么时候用 config.ru?

data/Rakefile

@@ -3,12 +3,6 @@ require 'rake/testtask'
 require 'fileutils'
 require 'date'
 
-# CI Reporter is only needed for the CI
-begin
-  require 'ci/reporter/rake/test_unit'
-rescue LoadError
-end
-
 task :default => :test
 task :spec => :test
 
@@ -43,16 +37,6 @@ Rake::TestTask.new(:test) do |t|
   t.ruby_opts << '-I.'
 end
 
-Rake::TestTask.new(:"test:core") do |t|
-  core_tests = %w[base delegator encoding extensions filter
-     helpers mapped_error middleware radius rdoc
-     readme request response result route_added_hook
-     routing server settings sinatra static templates]
-  t.test_files = core_tests.map {|n| "test/#{n}_test.rb"}
-  t.ruby_opts = ["-rubygems"] if defined? Gem
-  t.ruby_opts << "-I."
-end
-
 # Rcov ================================================================
 
 namespace :test do
@@ -83,7 +67,7 @@ task :add_template, [:name] do |t, args|
         puts "Liquid not found in #{file}"
       else
         puts "Adding section to #{file}"
-        template = template.gsub(/Liquid/, args.name.capitalize).gsub(/liquid/, args.name.downcase)
+        template = template.gsub(/Liquid/, args.name.capitalize).gsub(/liquid/, args.name.downcase)        
         code.gsub! /^(\s*===.*CoffeeScript)/, "\n" << template << "\n\\1"
         File.open(file, "w") { |f| f << code }
       end
@@ -106,22 +90,18 @@ task :thanks, [:release,:backports] do |t, a|
     "(based on commits included in #{a.release}, but not in #{a.backports})"
 end
 
-desc "list of authors"
-task :authors, [:commit_range, :format, :sep] do |t, a|
-  a.with_defaults :format => "%s (%d)", :sep => ", ", :commit_range => '--all'
+task :authors, [:format, :sep] do |t, a|
+  a.with_defaults :format => "%s (%d)", :sep => ', '
   authors = Hash.new { |h,k| h[k] = 0 }
   blake   = "Blake Mizerany"
-  overall = 0
   mapping = {
     "blake.mizerany@gmail.com" => blake, "bmizerany" => blake,
     "a_user@mac.com" => blake, "ichverstehe" => "Harry Vangberg",
     "Wu Jiang (nouse)" => "Wu Jiang" }
-  `git shortlog -s #{a.commit_range}`.lines.map do |line|
+  `git shortlog -s`.lines.map do |line|
     num, name = line.split("\t", 2).map(&:strip)
     authors[mapping[name] || name] += num.to_i
-    overall += num.to_i
   end
-  puts "#{overall} commits by #{authors.count} authors:"
   puts authors.sort_by { |n,c| -c }.map { |e| a.format % e }.join(a.sep)
 end
 
@@ -167,8 +147,9 @@ if defined?(Gem)
     # read spec file and split out manifest section
     spec = File.read(f.name)
     head, manifest, tail = spec.split("  # = MANIFEST =\n")
-    # replace version
+    # replace version and date
     head.sub!(/\.version = '.*'/, ".version = '#{source_version}'")
+    head.sub!(/\.date = '.*'/, ".date = '#{Date.today.to_s}'")
     # determine file list from git ls-files
     files = `git ls-files`.
       split("\n").
@@ -185,10 +166,6 @@ if defined?(Gem)
   end
 
   task 'release' => ['test', package('.gem')] do
-    if File.read("CHANGES") =~ /= \d\.\d\.\d . not yet released$/i
-      fail 'please update changes first'
-    end
-
     sh <<-SH
       gem install #{package('.gem')} --local &&
       gem push #{package('.gem')}  &&

data/lib/sinatra.rb

@@ -1,3 +1,6 @@
+libdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
 require 'sinatra/base'
 require 'sinatra/main'
 

data/lib/sinatra/base.rb

@@ -1,70 +1,38 @@
 require 'thread'
 require 'time'
 require 'uri'
-require 'rack'
-require 'rack/builder'
+require 'sinatra/rack'
 require 'sinatra/showexceptions'
 require 'tilt'
-require 'backports'
-
-warn "WARNING: Sinatra 1.2.x has reached its EOL. Please upgrade."
 
 module Sinatra
-  VERSION = '1.2.9'
+  VERSION = '1.3.0.a'
 
   # The request object. See Rack::Request for more info:
   # http://rack.rubyforge.org/doc/classes/Rack/Request.html
   class Request < Rack::Request
     # Returns an array of acceptable media types for the response
     def accept
-      @env['sinatra.accept'] ||= begin
-        entries = @env['HTTP_ACCEPT'].to_s.split(',')
-        entries.map { |e| accept_entry(e) }.sort_by { |e| e.last }.map { |e| e.first }
-      end
+      @env['HTTP_ACCEPT'].to_s.split(',').map { |a| a.split(';')[0].strip }
     end
 
-    def preferred_type(*types)
-      return accept.first if types.empty?
-      types.flatten!
-      accept.detect do |pattern|
-        type = types.detect { |t| File.fnmatch(pattern, t) }
-        return type if type
-      end
-    end
-
-    if Rack.release <= "1.2"
-      # Whether or not the web server (or a reverse proxy in front of it) is
-      # using SSL to communicate with the client.
-      def secure?
-        @env['HTTPS'] == 'on' or
-        @env['HTTP_X_FORWARDED_PROTO'] == 'https' or
-        @env['rack.url_scheme'] == 'https'
-      end
-    else
-      alias secure? ssl?
-    end
+    alias secure? ssl?
 
     def forwarded?
       @env.include? "HTTP_X_FORWARDED_HOST"
     end
 
     def route
-      @route ||= Rack::Utils.unescape(path_info)
+      @route ||= begin
+        path = Rack::Utils.unescape(path_info)
+        path.empty? ? "/" : path
+      end
     end
 
     def path_info=(value)
       @route = nil
       super
     end
-
-    private
-
-    def accept_entry(entry)
-      type, *options = entry.gsub(/\s/, '').split(';')
-      quality = 0 # we sort smalles first
-      options.delete_if { |e| quality = 1 - e[2..-1].to_f if e =~ /^q=/ }
-      [type, [quality, type.count('*'), 1 - options.size]]
-    end
   end
 
   # The response object. See Rack::Response and Rack::ResponseHelpers for
@@ -72,16 +40,16 @@ module Sinatra
   # http://rack.rubyforge.org/doc/classes/Rack/Response.html
   # http://rack.rubyforge.org/doc/classes/Rack/Response/Helpers.html
   class Response < Rack::Response
-    def finish(&block)
+    def finish
+      @body = block if block_given?
       if [204, 304].include?(status.to_i)
         header.delete "Content-Type"
-        header.delete "Content-Length"
         [status.to_i, header.to_hash, []]
       else
-        body = block || @body || []
-        body = [body] if String === body
-        if Array === body
-          header["Content-Length"] = body.
+        body = @body || []
+        body = [body] if body.respond_to? :to_str
+        if body.respond_to?(:to_ary)
+          header["Content-Length"] = body.to_ary.
             inject(0) { |len, part| len + Rack::Utils.bytesize(part) }.to_s
         end
         [status.to_i, header.to_hash, body]
@@ -130,7 +98,9 @@ module Sinatra
       return addr if addr =~ /\A[A-z][A-z0-9\+\.\-]*:/
       uri = [host = ""]
       if absolute
-        host << "http#{'s' if request.secure?}://"
+        host << 'http'
+        host << 's' if request.secure?
+        host << "://"
         if request.forwarded? or request.port != (request.secure? ? 443 : 80)
           host << request.host_with_port
         else
@@ -168,6 +138,11 @@ module Sinatra
       request.session
     end
 
+    # Access shared logger object.
+    def logger
+      request.logger
+    end
+
     # Look up a media type by file extension in Rack's mime registry.
     def mime_type(type)
       Base.mime_type(type)
@@ -175,8 +150,7 @@ module Sinatra
 
     # Set the Content-Type of the response body given a media type or file
     # extension.
-    def content_type(type = nil, params={})
-      return response['Content-Type'] unless type
+    def content_type(type, params={})
       default = params.delete :default
       mime_type = mime_type(type) || default
       fail "Unknown media type: %p" % type if mime_type.nil?
@@ -184,11 +158,7 @@ module Sinatra
       unless params.include? :charset or settings.add_charset.all? { |p| not p === mime_type }
         params[:charset] = params.delete('charset') || settings.default_encoding
       end
-      params.delete :charset if mime_type.include? 'charset'
-      unless params.empty?
-        mime_type << (mime_type.include?(';') ? ', ' : ';')
-        mime_type << params.map { |kv| kv.join('=') }.join(', ')
-      end
+      mime_type << ";#{params.map { |kv| kv.join('=') }.join(', ')}" unless params.empty?
       response['Content-Type'] = mime_type
     end
 
@@ -241,11 +211,6 @@ module Sinatra
 
       attr_accessor :range  # a Range or nil
 
-      def initialize(*args)
-        super(*args)
-        @range = nil
-      end
-
       # Checks for byte-ranges in the request and sets self.range appropriately.
       # Returns false if the ranges are unsatisfiable and the request should return 416.
       def parse_ranges(env, size)
@@ -287,10 +252,6 @@ module Sinatra
         ranges
       end
 
-      def close
-        super unless closed?
-      end
-
       CHUNK_SIZE = 8192
 
       def each
@@ -351,8 +312,8 @@ module Sinatra
     def expires(amount, *values)
       values << {} unless values.last.kind_of?(Hash)
 
-      if amount.is_a? Integer
-        time    = Time.now + amount.to_i
+      if Integer === amount
+        time    = Time.now + amount
         max_age = amount
       else
         time    = time_for amount
@@ -377,7 +338,7 @@ module Sinatra
       time = time_for time
       response['Last-Modified'] = time.httpdate
       # compare based on seconds since epoch
-      halt 304 if Time.httpdate(env['HTTP_IF_MODIFIED_SINCE']).to_i >= time.to_i
+      halt 304 if Time.httpdate(request.env['HTTP_IF_MODIFIED_SINCE']).to_i >= time.to_i
     rescue ArgumentError
     end
 
@@ -416,7 +377,7 @@ module Sinatra
     def time_for(value)
       if value.respond_to? :to_time
         value.to_time
-      elsif value.is_a? Time
+      elsif Time === value
         value
       elsif value.respond_to? :new_offset
         # DateTime#to_time does the same on 1.9
@@ -426,13 +387,13 @@ module Sinatra
       elsif value.respond_to? :mday
         # Date#to_time does the same on 1.9
         Time.local(value.year, value.mon, value.mday)
-      elsif value.is_a? Numeric
+      elsif Numeric === value
         Time.at value
       else
         Time.parse value.to_s
       end
     rescue ArgumentError => boom
-      raise boom
+      raise boom.to_s
     rescue Exception
       raise ArgumentError, "unable to convert #{value.inspect} to a Time object"
     end
@@ -461,11 +422,6 @@ module Sinatra
       attr_accessor :content_type
     end
 
-    def initialize
-      super
-      @default_layout = :layout
-    end
-
     def erb(template, options={}, locals={})
       render :erb, template, options, locals
     end
@@ -539,9 +495,8 @@ module Sinatra
     # Calls the given block for every possible template file in views,
     # named name.ext, where ext is registered on engine.
     def find_template(views, name, engine)
-      yield ::File.join(views, "#{name}.#{@preferred_extension}")
-      Tilt.mappings.each do |ext, engines|
-        next unless ext != @preferred_extension and Array(engines).include? engine
+      Tilt.mappings.each do |ext, klass|
+        next unless klass == engine
         yield ::File.join(views, "#{name}.#{ext}")
       end
     end
@@ -563,6 +518,7 @@ module Sinatra
       # extract generic options
       locals          = options.delete(:locals) || locals         || {}
       views           = options.delete(:views)  || settings.views || "./views"
+      @default_layout = :layout if @default_layout.nil?
       layout          = options.delete(:layout)
       eat_errors      = layout.nil?
       layout          = @default_layout if layout.nil? or layout == true
@@ -571,14 +527,11 @@ module Sinatra
       scope           = options.delete(:scope)         || self
 
       # compile and render template
-      begin
-        layout_was      = @default_layout
-        @default_layout = false
-        template        = compile_template(engine, data, options, views)
-        output          = template.render(scope, locals, &block)
-      ensure
-        @default_layout = layout_was
-      end
+      layout_was      = @default_layout
+      @default_layout = false
+      template        = compile_template(engine, data, options, views)
+      output          = template.render(scope, locals, &block)
+      @default_layout = layout_was
 
       # render layout
       if layout
@@ -598,13 +551,12 @@ module Sinatra
 
         case
         when data.is_a?(Symbol)
-          body, path, line = settings.templates[data]
+          body, path, line = self.class.templates[data]
           if body
             body = body.call if body.respond_to?(:call)
             template.new(path, line.to_i, options) { body }
           else
             found = false
-            @preferred_extension = engine.to_s
             find_template(views, data, template) do |file|
               path ||= file # keep the initial path rather than the last one
               if found = File.exists?(file)
@@ -617,7 +569,7 @@ module Sinatra
           end
         when data.is_a?(Proc) || data.is_a?(String)
           body = data.is_a?(String) ? Proc.new { data } : data
-          path, line = settings.caller_locations.first
+          path, line = self.class.caller_locations.first
           template.new(path, line.to_i, options, &body)
         else
           raise ArgumentError
@@ -636,7 +588,6 @@ module Sinatra
     attr_reader   :template_cache
 
     def initialize(app=nil)
-      super()
       @app = app
       @template_cache = Tilt::Cache.new
       yield self if block_given?
@@ -662,14 +613,24 @@ module Sinatra
       invoke { dispatch! }
       invoke { error_block!(response.status) }
       unless @response['Content-Type']
-        if Array === body and body.first.respond_to? :content_type
+        if body.respond_to?(:to_ary) and body.first.respond_to? :content_type
           content_type body.first.content_type
         else
           content_type :html
         end
       end
 
-      @response.finish
+      status, header, body = @response.finish
+
+      # Never produce a body on HEAD requests. Do retain the Content-Length
+      # unless it's "0", in which case we assume it was calculated erroneously
+      # for a manual HEAD response and remove it entirely.
+      if @env['REQUEST_METHOD'] == 'HEAD'
+        body = []
+        header.delete('Content-Length') if header['Content-Length'] == '0'
+      end
+
+      [status, header, body]
     end
 
     # Access settings defined with Base.set.
@@ -704,7 +665,7 @@ module Sinatra
     # Forward the request to the downstream app -- middleware only.
     def forward
       fail "downstream app not set" unless @app.respond_to? :call
-      status, headers, body = @app.call env
+      status, headers, body = @app.call(@request.env)
       @response.status = status
       @response.body = body
       @response.headers.merge! headers
@@ -713,13 +674,13 @@ module Sinatra
 
   private
     # Run filters defined on the class and all superclasses.
-    def filter!(type, base = settings)
+    def filter!(type, base = self.class)
       filter! type, base.superclass if base.superclass.respond_to?(:filters)
       base.filters[type].each { |block| instance_eval(&block) }
     end
 
     # Run routes defined on the class and all superclasses.
-    def route!(base = settings, pass_block=nil)
+    def route!(base=self.class, pass_block=nil)
       if routes = base.routes[@request.request_method]
         routes.each do |pattern, keys, conditions, block|
           pass_block = process_route(pattern, keys, conditions) do
@@ -749,9 +710,7 @@ module Sinatra
     # Returns pass block.
     def process_route(pattern, keys, conditions)
       @original_params ||= @params
-      route = @request.route
-      route = '/' if route.empty? and not settings.empty_path_info?
-      if match = pattern.match(route)
+      if match = pattern.match(@request.route)
         values = match.captures.to_a
         params =
           if keys.any?
@@ -800,8 +759,7 @@ module Sinatra
       public_dir = File.expand_path(public_dir)
 
       path = File.expand_path(public_dir + unescape(request.path_info))
-      return if path[0, public_dir.length] != public_dir
-      return unless File.file?(path)
+      return unless path.start_with?(public_dir) and File.file?(path)
 
       env['sinatra.static_file'] = path
       send_file path, :disposition => nil
@@ -822,14 +780,15 @@ module Sinatra
     end
 
     # Run the block with 'throw :halt' support and apply result to the response.
-    def invoke
-      res = catch(:halt) { yield }
+    def invoke(&block)
+      res = catch(:halt) { instance_eval(&block) }
       return if res.nil?
 
       case
       when res.respond_to?(:to_str)
         @response.body = [res]
-      when Array === res
+      when res.respond_to?(:to_ary)
+        res = res.to_ary
         if Fixnum === res.first
           if res.length == 3
             @response.status, headers, body = res
@@ -895,7 +854,7 @@ module Sinatra
     # Find an custom error block for the key(s) specified.
     def error_block!(*keys)
       keys.each do |key|
-        base = settings
+        base = self.class
         while base.respond_to?(:errors)
           if block = base.errors[key]
             # found a handler, eval and return result
@@ -956,15 +915,14 @@ module Sinatra
 
       # Sets an option to the given value.  If the value is a proc,
       # the proc will be called every time the option is accessed.
-      def set(option, value = (not_set = true), &block)
-        raise ArgumentError if block and !not_set
+      def set(option, value=self, &block)
+        raise ArgumentError if block && value != self
         value = block if block
         if value.kind_of?(Proc)
           metadef(option, &value)
           metadef("#{option}?") { !!__send__(option) }
           metadef("#{option}=") { |val| metadef(option, &Proc.new{val}) }
-        elsif not_set
-          raise ArgumentError unless option.respond_to?(:each)
+        elsif value == self && option.respond_to?(:each)
           option.each { |k,v| set(k, v) }
         elsif respond_to?("#{option}=")
           __send__ "#{option}=", value
@@ -1048,14 +1006,6 @@ module Sinatra
         Rack::Mime::MIME_TYPES[type] = value
       end
 
-      # provides all mime types matching type, including deprecated types:
-      #   mime_types :html # => ['text/html']
-      #   mime_types :js   # => ['application/javascript', 'text/javascript']
-      def mime_types(type)
-        type = mime_type type
-        type =~ /^application\/(xml|javascript)$/ ? [type, "text/#$1"] : [type]
-      end
-
       # Define a before filter; runs before all requests within the same
       # context as route handlers and may access/modify the request and
       # response.
@@ -1086,16 +1036,7 @@ module Sinatra
         @conditions << block
       end
 
-      def public=(value)
-        set :public_folder, value
-      end
-
-      def public(*)
-        super
-        public_folder
-      end
-
-    private
+   private
       # Condition for matching host name. Parameter might be String or Regexp.
       def host_name(pattern)
         condition { pattern === request.host }
@@ -1117,11 +1058,12 @@ module Sinatra
 
       # Condition for matching mimetypes. Accepts file extensions.
       def provides(*types)
-        types.map! { |t| mime_types(t) }
-        types.flatten!
+        types.map! { |t| mime_type(t) }
+
         condition do
-          if type = request.preferred_type(types)
-            content_type(type)
+          matching_types = (request.accept & types)
+          unless matching_types.empty?
+            content_type matching_types.first
             true
           else
             false
@@ -1145,12 +1087,12 @@ module Sinatra
       def delete(path, opts={}, &bk)  route 'DELETE',  path, opts, &bk end
       def head(path, opts={}, &bk)    route 'HEAD',    path, opts, &bk end
       def options(path, opts={}, &bk) route 'OPTIONS', path, opts, &bk end
+      def patch(path, opts={}, &bk)   route 'PATCH',   path, opts, &bk end
 
     private
       def route(verb, path, options={}, &block)
         # Because of self.options.host
         host_name(options.delete(:host)) if options.key?(:host)
-        enable :empty_path_info if path == "" and empty_path_info.nil?
 
         block, pattern, keys, conditions = compile! verb, path, block, options
         invoke_hook(:route_added, verb, path, block)
@@ -1212,7 +1154,7 @@ module Sinatra
       # Makes the methods defined in the block and in the Modules given
       # in `extensions` available to the handlers and templates
       def helpers(*extensions, &block)
-        class_eval(&block)   if block_given?
+        class_eval(&block)  if block_given?
         include(*extensions) if extensions.any?
       end
 
@@ -1246,7 +1188,7 @@ module Sinatra
       def quit!(server, handler_name)
         # Use Thin's hard #stop! if available, otherwise just #stop.
         server.respond_to?(:stop!) ? server.stop! : server.stop
-        $stderr.puts "\n== Sinatra has ended his set (crowd applauds)" unless handler_name =~/cgi/i
+        puts "\n== Sinatra has ended his set (crowd applauds)" unless handler_name =~/cgi/i
       end
 
       # Run the Sinatra app as a self-hosted server using
@@ -1255,14 +1197,14 @@ module Sinatra
         set options
         handler      = detect_rack_handler
         handler_name = handler.name.gsub(/.*::/, '')
-        $stderr.puts "== Sinatra/#{Sinatra::VERSION} has taken the stage " +
+        puts "== Sinatra/#{Sinatra::VERSION} has taken the stage " +
           "on #{port} for #{environment} with backup from #{handler_name}" unless handler_name =~/cgi/i
         handler.run self, :Host => bind, :Port => port do |server|
           [:INT, :TERM].each { |sig| trap(sig) { quit!(server, handler_name) } }
           set :running, true
         end
       rescue Errno::EADDRINUSE => e
-        $stderr.puts "== Someone is already performing on port #{port}!"
+        puts "== Someone is already performing on port #{port}!"
       end
 
       # The prototype instance used to process requests.
@@ -1284,11 +1226,10 @@ module Sinatra
       # an instance of this class as end point.
       def build(*args, &bk)
         builder = Rack::Builder.new
+        setup_logging  builder
+        setup_sessions builder
         builder.use Rack::MethodOverride if method_override?
         builder.use ShowExceptions       if show_exceptions?
-        builder.use Rack::CommonLogger   if logging?
-        builder.use Rack::Head
-        setup_sessions builder
         middleware.each { |c,a,b| builder.use(c, *a, &b) }
         builder.run new!(*args, &bk)
         builder
@@ -1299,16 +1240,31 @@ module Sinatra
       end
 
     private
+      def setup_logging(builder)
+        if logging?
+          builder.use Rack::CommonLogger
+          if logging.respond_to? :to_int
+            builder.use Rack::Logger, logging
+          else
+            builder.use Rack::Logger
+          end
+        else
+          builder.use Rack::NullLogger
+        end
+      end
+
       def setup_sessions(builder)
         return unless sessions?
-        builder.use Rack::Session::Cookie, :secret => session_secret
+        options = { :secret => session_secret }
+        options.merge! sessions.to_hash if sessions.respond_to? :to_hash
+        builder.use Rack::Session::Cookie, options
       end
 
       def detect_rack_handler
         servers = Array(server)
         servers.each do |server_name|
           begin
-            return Rack::Handler.get(server_name)
+            return Rack::Handler.get(server_name.downcase)
           rescue LoadError
           rescue NameError
           end
@@ -1339,18 +1295,15 @@ module Sinatra
       CALLERS_TO_IGNORE = [ # :nodoc:
         /\/sinatra(\/(base|main|showexceptions))?\.rb$/, # all sinatra code
         /lib\/tilt.*\.rb$/,                              # all tilt code
-        /^\(.*\)$/,                                      # generated code
+        /\(.*\)/,                                        # generated code
         /rubygems\/custom_require\.rb$/,                 # rubygems require hacks
         /active_support/,                                # active_support require hacks
         /bundler(\/runtime)?\.rb/,                       # bundler require hacks
         /<internal:/                                     # internal in ruby >= 1.9.2
       ]
 
-      # contrary to what the comment said previously, rubinius never supported this
-      if defined?(RUBY_IGNORE_CALLERS)
-        warn "RUBY_IGNORE_CALLERS is deprecated and will no longer be supported by Sinatra 2.0"
-        CALLERS_TO_IGNORE.concat(RUBY_IGNORE_CALLERS)
-      end
+      # add rubinius (and hopefully other VM impls) ignore patterns ...
+      CALLERS_TO_IGNORE.concat(RUBY_IGNORE_CALLERS) if defined?(RUBY_IGNORE_CALLERS)
 
       # Like Kernel#caller but excluding certain magic entries and without
       # line / method information; the resulting array contains filenames only.
@@ -1379,7 +1332,7 @@ module Sinatra
       def self.force_encoding(data, encoding = default_encoding)
         return if data == settings || data.is_a?(Tempfile)
         if data.respond_to? :force_encoding
-          data.force_encoding(encoding).encode!
+          data.force_encoding encoding
         elsif data.respond_to? :each_value
           data.each_value { |v| force_encoding(v, encoding) }
         elsif data.respond_to? :each
@@ -1389,7 +1342,7 @@ module Sinatra
       end
     else
       def self.force_encoding(data, *) data end
-    end
+      end
 
     reset!
 
@@ -1401,8 +1354,7 @@ module Sinatra
     set :logging, false
     set :method_override, false
     set :default_encoding, "utf-8"
-    set :add_charset, %w[javascript xml xhtml+xml json].map { |t| "application/#{t}" }
-    settings.add_charset << /^text\//
+    set :add_charset, [/^text\//, 'application/javascript', 'application/xml', 'application/xhtml+xml']
 
     # explicitly generating this eagerly to play nice with preforking
     set :session_secret, '%x' % rand(2**255)
@@ -1420,15 +1372,14 @@ module Sinatra
 
     set :absolute_redirects, true
     set :prefixed_redirects, false
-    set :empty_path_info, nil
 
     set :app_file, nil
     set :root, Proc.new { app_file && File.expand_path(File.dirname(app_file)) }
     set :views, Proc.new { root && File.join(root, 'views') }
-    set :reload_templates, Proc.new { development? or RUBY_VERSION < '1.8.7' }
+    set :reload_templates, Proc.new { development? }
     set :lock, false
 
-    set :public_folder, Proc.new { root && File.join(root, 'public') }
+    set :public, Proc.new { root && File.join(root, 'public') }
     set :static, Proc.new { public && File.exist?(public) }
 
     error ::Exception do
@@ -1458,8 +1409,8 @@ module Sinatra
           </style>
         </head>
         <body>
-          <h2>Sinatra doesn&rsquo;t know this ditty.</h2>
-          <img src='#{uri "/__sinatra__/404.png"}'>
+          <h2>Sinatra doesn't know this ditty.</h2>
+          <img src='/__sinatra__/404.png'>
           <div id="c">
             Try this:
             <pre>#{request.request_method.downcase} '#{request.path_info}' do\n  "Hello World"\nend</pre>
@@ -1476,13 +1427,12 @@ module Sinatra
   #
   # The Application class should not be subclassed, unless you want to
   # inherit all settings, routes, handlers, and error pages from the
-  # top-level. Subclassing Sinatra::Base is highly recommended for
+  # top-level. Subclassing Sinatra::Base is heavily recommended for
   # modular applications.
   class Application < Base
     set :logging, Proc.new { ! test? }
     set :method_override, true
     set :run, Proc.new { ! test? }
-    set :session_secret, Proc.new { super() unless development? }
 
     def self.register(*extensions, &block) #:nodoc:
       added_methods = extensions.map {|m| m.public_instance_methods }.flatten
@@ -1495,32 +1445,18 @@ module Sinatra
   # methods to be delegated to the Sinatra::Application class. Used primarily
   # at the top-level.
   module Delegator #:nodoc:
-    TEMPLATE = <<-RUBY
-      def %1$s(*args, &b)
-        return super if respond_to? :%1$s
-        ::Sinatra::Delegator.target.send("%2$s", *args, &b)
-      end
-    RUBY
-
     def self.delegate(*methods)
       methods.each do |method_name|
-        # Replaced with way shorter and better implementation in 1.3.0
-        # using define_method instead, however, blocks cannot take block
-        # arguments on 1.8.6.
-        begin
-          code = TEMPLATE % [method_name, method_name]
-          eval code, binding, '(__DELEGATE__)', 1
-        rescue SyntaxError
-          code  = TEMPLATE % [:_delegate, method_name]
-          eval code, binding, '(__DELEGATE__)', 1
-          alias_method method_name, :_delegate
-          undef_method :_delegate
-        end
-        private method_name
+        eval <<-RUBY, binding, '(__DELEGATE__)', 1
+          def #{method_name}(*args, &b)
+            ::Sinatra::Delegator.target.send(#{method_name.inspect}, *args, &b)
+          end
+          private #{method_name.inspect}
+        RUBY
       end
     end
 
-    delegate :get, :put, :post, :delete, :head, :options, :template, :layout,
+    delegate :get, :patch, :put, :post, :delete, :head, :options, :template, :layout,
              :before, :after, :error, :not_found, :configure, :set, :mime_type,
              :enable, :disable, :use, :development?, :test?, :production?,
              :helpers, :settings
@@ -1542,11 +1478,11 @@ module Sinatra
 
   # Extend the top-level DSL with the modules provided.
   def self.register(*extensions, &block)
-    Delegator.target.register(*extensions, &block)
+    Application.register(*extensions, &block)
   end
 
   # Include the helper modules provided in Sinatra's request context.
   def self.helpers(*extensions, &block)
-    Delegator.target.helpers(*extensions, &block)
+    Application.helpers(*extensions, &block)
   end
 end