rack 1.3.10 → 1.4.0

data/lib/rack/static.rb

@@ -22,6 +22,12 @@ module Rack
   #
   #     use Rack::Static, :urls => {"/" => 'index.html'}, :root => 'public'
   #
+  # Serve all requests normally from the folder "public" in the current
+  # directory but uses index.html as default route for "/"
+  #
+  #     use Rack::Static, :urls => [""], :root => 'public', :index =>
+  #     'public/index.html'
+  #
   # Set a fixed Cache-Control header for all served files:
   #
   #     use Rack::Static, :root => 'public', :cache_control => 'public'
@@ -32,22 +38,29 @@ module Rack
     def initialize(app, options={})
       @app = app
       @urls = options[:urls] || ["/favicon.ico"]
+      @index = options[:index] || "index.html"
       root = options[:root] || Dir.pwd
       cache_control = options[:cache_control]
       @file_server = Rack::File.new(root, cache_control)
     end
 
+    def overwrite_file_path(path)
+      @urls.kind_of?(Hash) && @urls.key?(path) || @index && path == '/'
+    end
+
+    def route_file(path)
+      @urls.kind_of?(Array) && @urls.any? { |url| path.index(url) == 0 }
+    end
+
+    def can_serve(path)
+      route_file(path) || overwrite_file_path(path)
+    end
+
     def call(env)
       path = env["PATH_INFO"]
 
-      unless @urls.kind_of? Hash
-        can_serve = @urls.any? { |url| path.index(url) == 0 }
-      else
-        can_serve = @urls.key? path
-      end
-
-      if can_serve
-        env["PATH_INFO"] = @urls[path] if @urls.kind_of? Hash
+      if can_serve(path)
+        env["PATH_INFO"] = (path == '/' ? @index : @urls[path]) if overwrite_file_path(path)
         @file_server.call(env)
       else
         @app.call(env)

data/lib/rack/urlmap.rb

@@ -19,9 +19,6 @@ module Rack
     end
 
     def remap(map)
-      longest_path_first = lambda do |(host, location, _, _)|
-        [host ? -host.size : NEGATIVE_INFINITY, -location.size]
-      end
       @mapping = map.map { |location, app|
         if location =~ %r{\Ahttps?://(.*?)(/.*)}
           host, location = $1, $2
@@ -32,28 +29,46 @@ module Rack
         unless location[0] == ?/
           raise ArgumentError, "paths need to start with /"
         end
+
         location = location.chomp('/')
         match = Regexp.new("^#{Regexp.quote(location).gsub('/', '/+')}(.*)", nil, 'n')
 
         [host, location, match, app]
-      }.sort_by(&longest_path_first)
+      }.sort_by do |(host, location, _, _)|
+        [host ? -host.size : NEGATIVE_INFINITY, -location.size]
+      end
     end
 
     def call(env)
       path = env["PATH_INFO"]
       script_name = env['SCRIPT_NAME']
-      hHost, sName, sPort = env.values_at('HTTP_HOST','SERVER_NAME','SERVER_PORT')
-      @mapping.each { |host, location, match, app|
-        next unless (hHost == host || sName == host \
-          || (host.nil? && (hHost == sName || hHost == sName+':'+sPort)))
-        next unless path.to_s =~ match && rest = $1
-        next unless rest.empty? || rest[0] == ?/
-        env.merge!('SCRIPT_NAME' => (script_name + location), 'PATH_INFO' => rest)
+      hHost = env['HTTP_HOST']
+      sName = env['SERVER_NAME']
+      sPort = env['SERVER_PORT']
+
+      @mapping.each do |host, location, match, app|
+        unless hHost == host \
+            || sName == host \
+            || (!host && (hHost == sName || hHost == sName+':'+sPort))
+          next
+        end
+
+        next unless m = match.match(path.to_s)
+
+        rest = m[1]
+        next unless !rest || rest.empty? || rest[0] == ?/
+
+        env['SCRIPT_NAME'] = (script_name + location)
+        env['PATH_INFO'] = rest
+
         return app.call(env)
-      }
+      end
+
       [404, {"Content-Type" => "text/plain", "X-Cascade" => "pass"}, ["Not Found: #{path}"]]
+
     ensure
-      env.merge! 'PATH_INFO' => path, 'SCRIPT_NAME' => script_name
+      env['PATH_INFO'] = path
+      env['SCRIPT_NAME'] = script_name
     end
   end
 end

data/lib/rack/utils.rb

@@ -5,14 +5,11 @@ require 'tempfile'
 require 'rack/multipart'
 
 major, minor, patch = RUBY_VERSION.split('.').map { |v| v.to_i }
-ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
 
 if major == 1 && minor < 9
   require 'rack/backports/uri/common_18'
-elsif major == 1 && minor == 9 && patch == 2 && RUBY_PATCHLEVEL <= 320 && RUBY_ENGINE != 'jruby'
+elsif major == 1 && minor == 9 && patch < 3
   require 'rack/backports/uri/common_192'
-elsif major == 1 && minor == 9 && patch == 3 && RUBY_PATCHLEVEL < 125
-  require 'rack/backports/uri/common_193'
 else
   require 'uri/common'
 end
@@ -35,9 +32,16 @@ module Rack
     end
     module_function :escape_path
 
-    # Unescapes a URI escaped string.
-    def unescape(s)
-      URI.decode_www_form_component(s)
+    # Unescapes a URI escaped string with +encoding+. +encoding+ will be the
+    # target encoding of the string returned, and it defaults to UTF-8
+    if defined?(::Encoding)
+      def unescape(s, encoding = Encoding::UTF_8)
+        URI.decode_www_form_component(s, encoding)
+      end
+    else
+      def unescape(s, encoding = nil)
+        URI.decode_www_form_component(s, encoding)
+      end
     end
     module_function :unescape
 
@@ -63,7 +67,6 @@ module Rack
       bytes = 0
 
       (qs || '').split(d ? /[#{d}] */n : DEFAULT_SEP).each do |p|
-        next if p.empty?
         k, v = p.split('=', 2).map { |x| unescape(x) }
 
         if k
@@ -148,7 +151,7 @@ module Rack
         if v.class == Array
           build_query(v.map { |x| [k, x] })
         else
-          "#{escape(k)}=#{escape(v)}"
+          v.nil? ? escape(k) : "#{escape(k)}=#{escape(v)}"
         end
       }.join("&")
     end
@@ -269,6 +272,8 @@ module Rack
       cookies.reject! { |cookie|
         if value[:domain]
           cookie =~ /\A#{escape(key)}=.*domain=#{value[:domain]}/
+        elsif value[:path]
+          cookie =~ /\A#{escape(key)}=.*path=#{value[:path]}/
         else
           cookie =~ /\A#{escape(key)}=/
         end
@@ -319,16 +324,16 @@ module Rack
     def byte_ranges(env, size)
       # See <http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35>
       http_range = env['HTTP_RANGE']
-      return nil unless http_range && http_range =~ /bytes=([^;]+)/
+      return nil unless http_range
       ranges = []
-      $1.split(/,\s*/).each do |range_spec|
-        return nil  unless range_spec =~ /(\d*)-(\d*)/
-        r0,r1 = $1, $2
+      http_range.split(/,\s*/).each do |range_spec|
+        matches = range_spec.match(/bytes=(\d*)-(\d*)/)
+        return nil  unless matches
+        r0,r1 = matches[1], matches[2]
         if r0.empty?
           return nil  if r1.empty?
           # suffix-byte-range-spec, represents trailing suffix of file
-          r0 = size - r1.to_i
-          r0 = 0  if r0 < 0
+          r0 = [size - r1.to_i, 0].max
           r1 = size - 1
         else
           r0 = r0.to_i
@@ -346,18 +351,6 @@ module Rack
     end
     module_function :byte_ranges
 
-    # Constant time string comparison.
-    def secure_compare(a, b)
-      return false unless bytesize(a) == bytesize(b)
-
-      l = a.unpack("C*")
-
-      r, i = 0, -1
-      b.each_byte { |v| r |= v ^ l[i+=1] }
-      r == 0
-    end
-    module_function :secure_compare
-
     # Context allows the use of a compatible middleware at different points
     # in a request handling stack. A compatible middleware must define
     # #context which should take the arguments env and app. The first of which
@@ -496,6 +489,7 @@ module Rack
       415  => 'Unsupported Media Type',
       416  => 'Requested Range Not Satisfiable',
       417  => 'Expectation Failed',
+      418  => "I'm a Teapot",
       422  => 'Unprocessable Entity',
       423  => 'Locked',
       424  => 'Failed Dependency',
@@ -512,7 +506,7 @@ module Rack
     }
 
     # Responses with HTTP status codes that should not have an entity body
-    STATUS_WITH_NO_ENTITY_BODY = Set.new((100..199).to_a << 204 << 304)
+    STATUS_WITH_NO_ENTITY_BODY = Set.new((100..199).to_a << 204 << 205 << 304)
 
     SYMBOL_TO_STATUS_CODE = Hash[*HTTP_STATUS_CODES.map { |code, message|
       [message.downcase.gsub(/\s|-/, '_').to_sym, code]

data/rack.gemspec

@@ -1,17 +1,17 @@
 Gem::Specification.new do |s|
   s.name            = "rack"
-  s.version         = "1.3.10"
+  s.version         = "1.4.0"
   s.platform        = Gem::Platform::RUBY
   s.summary         = "a modular Ruby webserver interface"
 
   s.description = <<-EOF
-Rack provides minimal, modular and adaptable interface for developing
+Rack provides a minimal, modular and adaptable interface for developing
 web applications in Ruby.  By wrapping HTTP requests and responses in
 the simplest way possible, it unifies and distills the API for web
 servers, web frameworks, and software in between (the so-called
 middleware) into a single method call.
 
-Also see http://rack.github.com/.
+Also see http://rack.rubyforge.org.
 EOF
 
   s.files           = Dir['{bin/*,contrib/*,example/*,lib/**/*,test/**/*}'] +
@@ -24,13 +24,13 @@ EOF
 
   s.author          = 'Christian Neukirchen'
   s.email           = 'chneukirchen@gmail.com'
-  s.homepage        = 'http://rack.github.com/'
+  s.homepage        = 'http://rack.rubyforge.org'
   s.rubyforge_project = 'rack'
 
   s.add_development_dependency 'bacon'
   s.add_development_dependency 'rake'
 
-  s.add_development_dependency 'fcgi'
+  s.add_development_dependency 'ruby-fcgi'
   s.add_development_dependency 'memcache-client'
   s.add_development_dependency 'mongrel', '>= 1.2.0.pre2'
   s.add_development_dependency 'thin'

data/test/builder/end.ru

@@ -1,3 +1,5 @@
 run lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['OK']] }
 __END__
 Should not be evaluated
+Neither should
+This

data/test/cgi/lighttpd.conf

@@ -2,6 +2,7 @@ server.modules = ("mod_fastcgi", "mod_cgi")
 server.document-root = "."
 server.errorlog = var.CWD + "/lighttpd.errors"
 server.port = 9203
+server.bind = "127.0.0.1"
 
 server.event-handler = "select"
 

data/test/cgi/sample_rackup.ru

@@ -2,4 +2,4 @@
 
 require '../testrequest'
 
-run TestRequest.new
+run Rack::Lint.new(TestRequest.new)

data/test/cgi/test+directory/test+file

@@ -0,0 +1 @@
+this file has plusses!

data/test/cgi/test.ru

@@ -2,4 +2,4 @@
 # -*- ruby -*-
 
 require '../testrequest'
-run TestRequest.new
+run Rack::Lint.new(TestRequest.new)

data/test/gemloader.rb

@@ -2,5 +2,9 @@ require 'rubygems'
 project = 'rack'
 gemspec = File.expand_path("#{project}.gemspec", Dir.pwd)
 Gem::Specification.load(gemspec).dependencies.each do |dep|
-  gem dep.name, *dep.requirement.as_list
-end
+  begin
+    gem dep.name, *dep.requirement.as_list
+  rescue Gem::LoadError
+    warn "Cannot load #{dep.name} #{dep.requirement.to_s}"
+  end
+end

data/test/spec_auth_basic.rb

@@ -1,4 +1,5 @@
 require 'rack/auth/basic'
+require 'rack/lint'
 require 'rack/mock'
 
 describe Rack::Auth::Basic do
@@ -7,7 +8,9 @@ describe Rack::Auth::Basic do
   end
 
   def unprotected_app
-    lambda { |env| [ 200, {'Content-Type' => 'text/plain'}, ["Hi #{env['REMOTE_USER']}"] ] }
+    Rack::Lint.new lambda { |env|
+      [ 200, {'Content-Type' => 'text/plain'}, ["Hi #{env['REMOTE_USER']}"] ]
+    }
   end
 
   def protected_app
@@ -63,14 +66,6 @@ describe Rack::Auth::Basic do
     end
   end
 
-  should 'return 400 Bad Request for a malformed authorization header' do
-    request 'HTTP_AUTHORIZATION' => '' do |response|
-      response.should.be.a.client_error
-      response.status.should.equal 400
-      response.should.not.include 'WWW-Authenticate'
-    end
-  end
-
   it 'takes realm as optional constructor arg' do
     app = Rack::Auth::Basic.new(unprotected_app, realm) { true }
     realm.should == app.realm

data/test/spec_auth_digest.rb

@@ -1,4 +1,5 @@
 require 'rack/auth/digest/md5'
+require 'rack/lint'
 require 'rack/mock'
 
 describe Rack::Auth::Digest::MD5 do
@@ -7,10 +8,10 @@ describe Rack::Auth::Digest::MD5 do
   end
 
   def unprotected_app
-    lambda do |env|
+    Rack::Lint.new lambda { |env|
       friend = Rack::Utils.parse_query(env["QUERY_STRING"])["friend"]
       [ 200, {'Content-Type' => 'text/plain'}, ["Hi #{env['REMOTE_USER']}#{friend ? " and #{friend}" : ''}"] ]
-    end
+    }
   end
 
   def protected_app
@@ -152,20 +153,6 @@ describe Rack::Auth::Digest::MD5 do
     end
   end
 
-  should 'not rechallenge if nonce is not stale' do
-    begin
-      Rack::Auth::Digest::Nonce.time_limit = 10
-
-      request_with_digest_auth 'GET', '/', 'Alice', 'correct-password', :wait => 1 do |response|
-        response.status.should.equal 200
-        response.body.to_s.should.equal 'Hi Alice'
-        response.headers['WWW-Authenticate'].should.not =~ /\bstale=true\b/
-      end
-    ensure
-      Rack::Auth::Digest::Nonce.time_limit = nil
-    end
-  end
-
   should 'rechallenge with stale parameter if nonce is stale' do
     begin
       Rack::Auth::Digest::Nonce.time_limit = 1

data/test/spec_body_proxy.rb

@@ -45,8 +45,4 @@ describe Rack::BodyProxy do
     proxy.close
     closed.should.equal true
   end
-
-  should 'provide an #each method' do
-    Rack::BodyProxy.method_defined?(:each).should.equal true
-  end
 end

data/test/spec_builder.rb

@@ -1,4 +1,5 @@
 require 'rack/builder'
+require 'rack/lint'
 require 'rack/mock'
 require 'rack/showexceptions'
 require 'rack/urlmap'
@@ -18,38 +19,46 @@ class NothingMiddleware
 end
 
 describe Rack::Builder do
+  def builder(&block)
+    Rack::Lint.new Rack::Builder.new(&block)
+  end
+  
+  def builder_to_app(&block)
+    Rack::Lint.new Rack::Builder.new(&block).to_app
+  end
+  
   it "supports mapping" do
-    app = Rack::Builder.new do
+    app = builder_to_app do
       map '/' do |outer_env|
-        run lambda { |inner_env| [200, {}, ['root']] }
+        run lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, ['root']] }
       end
       map '/sub' do
-        run lambda { |inner_env| [200, {}, ['sub']] }
+        run lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, ['sub']] }
       end
-    end.to_app
+    end
     Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'root'
     Rack::MockRequest.new(app).get("/sub").body.to_s.should.equal 'sub'
   end
 
   it "doesn't dupe env even when mapping" do
-    app = Rack::Builder.new do
+    app = builder_to_app do
       use NothingMiddleware
       map '/' do |outer_env|
         run lambda { |inner_env|
           inner_env['new_key'] = 'new_value'
-          [200, {}, ['root']]
+          [200, {"Content-Type" => "text/plain"}, ['root']]
         }
       end
-    end.to_app
+    end
     Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'root'
     NothingMiddleware.env['new_key'].should.equal 'new_value'
   end
 
   it "chains apps by default" do
-    app = Rack::Builder.new do
+    app = builder_to_app do
       use Rack::ShowExceptions
       run lambda { |env| raise "bzzzt" }
-    end.to_app
+    end
 
     Rack::MockRequest.new(app).get("/").should.be.server_error
     Rack::MockRequest.new(app).get("/").should.be.server_error
@@ -57,7 +66,7 @@ describe Rack::Builder do
   end
 
   it "has implicit #to_app" do
-    app = Rack::Builder.new do
+    app = builder do
       use Rack::ShowExceptions
       run lambda { |env| raise "bzzzt" }
     end
@@ -68,13 +77,13 @@ describe Rack::Builder do
   end
 
   it "supports blocks on use" do
-    app = Rack::Builder.new do
+    app = builder do
       use Rack::ShowExceptions
       use Rack::Auth::Basic do |username, password|
         'secret' == password
       end
 
-      run lambda { |env| [200, {}, ['Hi Boss']] }
+      run lambda { |env| [200, {"Content-Type" => "text/plain"}, ['Hi Boss']] }
     end
 
     response = Rack::MockRequest.new(app).get("/")
@@ -89,7 +98,7 @@ describe Rack::Builder do
   end
 
   it "has explicit #to_app" do
-    app = Rack::Builder.app do
+    app = builder do
       use Rack::ShowExceptions
       run lambda { |env| raise "bzzzt" }
     end
@@ -99,8 +108,30 @@ describe Rack::Builder do
     Rack::MockRequest.new(app).get("/").should.be.server_error
   end
 
+  it "can mix map and run for endpoints" do
+    app = builder do
+      map '/sub' do
+        run lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, ['sub']] }
+      end
+      run lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, ['root']] }
+    end
+
+    Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'root'
+    Rack::MockRequest.new(app).get("/sub").body.to_s.should.equal 'sub'
+  end
+
+  it "accepts middleware-only map blocks" do
+    app = builder do
+      map('/foo') { use Rack::ShowExceptions }
+      run lambda { |env| raise "bzzzt" }
+    end
+
+    proc { Rack::MockRequest.new(app).get("/") }.should.raise(RuntimeError)
+    Rack::MockRequest.new(app).get("/foo").should.be.server_error
+  end
+
   should "initialize apps once" do
-    app = Rack::Builder.new do
+    app = builder do
       class AppClass
         def initialize
           @called = 0
@@ -120,6 +151,23 @@ describe Rack::Builder do
     Rack::MockRequest.new(app).get("/").should.be.server_error
   end
 
+  it "allows use after run" do
+    app = builder do
+      run lambda { |env| raise "bzzzt" }
+      use Rack::ShowExceptions
+    end
+
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+  end
+
+  it 'complains about a missing run' do
+    proc do
+      Rack::Lint.new Rack::Builder.app { use Rack::ShowExceptions }
+    end.should.raise(RuntimeError)
+  end
+
   describe "parse_file" do
     def config_file(name)
       File.join(File.dirname(__FILE__), 'builder', name)
@@ -133,6 +181,7 @@ describe Rack::Builder do
 
     it "removes __END__ before evaluating app" do
       app, options = Rack::Builder.parse_file config_file('end.ru')
+      options = nil # ignored, prevents warning
       Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'OK'
     end
 
@@ -148,11 +197,5 @@ describe Rack::Builder do
       Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'OK'
       $:.pop
     end
-
-    it "sets __LINE__ correctly" do
-      app, options = Rack::Builder.parse_file config_file('line.ru')
-      options = nil # ignored, prevents warning
-      Rack::MockRequest.new(app).get("/").body.to_s.should.equal '1'
-    end
   end
 end