rack 0.9.1 → 1.0.0

data/lib/rack/showexceptions.rb

@@ -1,6 +1,7 @@
 require 'ostruct'
 require 'erb'
 require 'rack/request'
+require 'rack/utils'
 
 module Rack
   # Rack::ShowExceptions catches all exceptions raised from the app it
@@ -335,7 +336,7 @@ TEMPLATE = <<'HTML'
 
 <div id="explanation">
   <p>
-    You're seeing this error because you use <code>Rack::ShowException</code>.
+    You're seeing this error because you use <code>Rack::ShowExceptions</code>.
   </p>
 </div>
 

data/lib/rack/showstatus.rb

@@ -27,7 +27,7 @@ module Rack
         message = Rack::Utils::HTTP_STATUS_CODES[status.to_i] || status.to_s
         detail = env["rack.showstatus.detail"] || message
         body = @template.result(binding)
-        size = body.respond_to?(:bytesize) ? body.bytesize : body.size
+        size = Rack::Utils.bytesize(body)
         [status, headers.merge("Content-Type" => "text/html", "Content-Length" => size.to_s), [body]]
       else
         [status, headers, body]

data/lib/rack/urlmap.rb

@@ -12,7 +12,11 @@ module Rack
   # first, since they are most specific.
 
   class URLMap
-    def initialize(map)
+    def initialize(map = {})
+      remap(map)
+    end
+
+    def remap(map)
       @mapping = map.map { |location, app|
         if location =~ %r{\Ahttps?://(.*?)(/.*)}
           host, location = $1, $2
@@ -26,20 +30,23 @@ module Rack
         location = location.chomp('/')
 
         [host, location, app]
-      }.sort_by { |(h, l, a)| [-l.size, h.to_s.size] }  # Longest path first
+      }.sort_by { |(h, l, a)| [h ? -h.size : (-1.0 / 0.0), -l.size] }  # Longest path first
     end
 
     def call(env)
       path = env["PATH_INFO"].to_s.squeeze("/")
+      script_name = env['SCRIPT_NAME']
       hHost, sName, sPort = env.values_at('HTTP_HOST','SERVER_NAME','SERVER_PORT')
       @mapping.each { |host, location, app|
         next unless (hHost == host || sName == host \
           || (host.nil? && (hHost == sName || hHost == sName+':'+sPort)))
         next unless location == path[0, location.size]
         next unless path[location.size] == nil || path[location.size] == ?/
-        env["SCRIPT_NAME"] += location
-        env["PATH_INFO"]    = path[location.size..-1]
-        return app.call(env)
+
+        return app.call(
+          env.merge(
+            'SCRIPT_NAME' => (script_name + location),
+            'PATH_INFO'   => path[location.size..-1]))
       }
       [404, {"Content-Type" => "text/plain"}, ["Not Found: #{path}"]]
     end

data/lib/rack/utils.rb

@@ -29,7 +29,6 @@ module Rack
     # and ';' characters.  You can also use this to parse
     # cookies by changing the characters used in the second
     # parameter (which defaults to '&;').
-
     def parse_query(qs, d = '&;')
       params = {}
 
@@ -51,6 +50,50 @@ module Rack
     end
     module_function :parse_query
 
+    def parse_nested_query(qs, d = '&;')
+      params = {}
+
+      (qs || '').split(/[#{d}] */n).each do |p|
+        k, v = unescape(p).split('=', 2)
+        normalize_params(params, k, v)
+      end
+
+      return params
+    end
+    module_function :parse_nested_query
+
+    def normalize_params(params, name, v = nil)
+      name =~ %r([\[\]]*([^\[\]]+)\]*)
+      k = $1 || ''
+      after = $' || ''
+
+      return if k.empty?
+
+      if after == ""
+        params[k] = v
+      elsif after == "[]"
+        params[k] ||= []
+        raise TypeError, "expected Array (got #{params[k].class.name}) for param `#{k}'" unless params[k].is_a?(Array)
+        params[k] << v
+      elsif after =~ %r(^\[\]\[([^\[\]]+)\]$) || after =~ %r(^\[\](.+)$)
+        child_key = $1
+        params[k] ||= []
+        raise TypeError, "expected Array (got #{params[k].class.name}) for param `#{k}'" unless params[k].is_a?(Array)
+        if params[k].last.is_a?(Hash) && !params[k].last.key?(child_key)
+          normalize_params(params[k].last, child_key, v)
+        else
+          params[k] << normalize_params({}, child_key, v)
+        end
+      else
+        params[k] ||= {}
+        raise TypeError, "expected Hash (got #{params[k].class.name}) for param `#{k}'" unless params[k].is_a?(Hash)
+        params[k] = normalize_params(params[k], after, v)
+      end
+
+      return params
+    end
+    module_function :normalize_params
+
     def build_query(params)
       params.map { |k, v|
         if v.class == Array
@@ -102,57 +145,42 @@ module Rack
     end
     module_function :select_best_encoding
 
-    # The recommended manner in which to implement a contexting application
-    # is to define a method #context in which a new Context is instantiated.
-    #
-    # As a Context is a glorified block, it is highly recommended that you
-    # define the contextual block within the application's operational scope.
-    # This would typically the application as you're place into Rack's stack.
-    #
-    #   class MyObject
-    #     ...
-    #     def context app
-    #       Rack::Utils::Context.new app do |env|
-    #         do_stuff
-    #         response = app.call(env)
-    #         do_more_stuff
-    #       end
-    #     end
-    #     ...
-    #   end
-    #
-    # mobj = MyObject.new
-    # app = mobj.context other_app
-    # Rack::Handler::Mongrel.new app
-    class Context < Proc
-      alias_method :old_inspect, :inspect
+    # Return the bytesize of String; uses String#length under Ruby 1.8 and
+    # String#bytesize under 1.9.
+    if ''.respond_to?(:bytesize)
+      def bytesize(string)
+        string.bytesize
+      end
+    else
+      def bytesize(string)
+        string.size
+      end
+    end
+    module_function :bytesize
+
+    # 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
+    # would be the request environment. The second of which would be the rack
+    # application that the request would be forwarded to.
+    class Context
       attr_reader :for, :app
-      def initialize app_f, app_r
-        raise 'running context not provided' unless app_f
+
+      def initialize(app_f, app_r)
         raise 'running context does not respond to #context' unless app_f.respond_to? :context
-        raise 'application context not provided' unless app_r
-        raise 'application context does not respond to #call' unless app_r.respond_to? :call
-        @for = app_f
-        @app = app_r
+        @for, @app = app_f, app_r
       end
-      def inspect
-        "#{old_inspect} ==> #{@for.inspect} ==> #{@app.inspect}"
+
+      def call(env)
+        @for.context(env, @app)
       end
-      def context app_r
-        raise 'new application context not provided' unless app_r
-        raise 'new application context does not respond to #call' unless app_r.respond_to? :call
-        @for.context app_r
+
+      def recontext(app)
+        self.class.new(@for, app)
       end
-      def pretty_print pp
-        pp.text old_inspect
-        pp.nest 1 do
-          pp.breakable
-          pp.text '=for> '
-          pp.pp @for
-          pp.breakable
-          pp.text '=app> '
-          pp.pp @app
-        end
+
+      def context(env, app=@app)
+        recontext(app).call(env)
       end
     end
 
@@ -165,7 +193,14 @@ module Rack
       end
 
       def to_hash
-        {}.replace(self)
+        inject({}) do |hash, (k,v)|
+          if v.respond_to? :to_ary
+            hash[k] = v.to_ary.join("\n")
+          else
+            hash[k] = v
+          end
+          hash
+        end
       end
 
       def [](k)
@@ -258,7 +293,7 @@ module Rack
 
       def self.parse_multipart(env)
         unless env['CONTENT_TYPE'] =~
-            %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n
+            %r|\Amultipart/.*boundary=\"?([^\";,]+)\"?|n
           nil
         else
           boundary = "--#{$1}"
@@ -267,16 +302,19 @@ module Rack
           buf = ""
           content_length = env['CONTENT_LENGTH'].to_i
           input = env['rack.input']
+          input.rewind
 
           boundary_size = boundary.size + EOL.size
           bufsize = 16384
 
           content_length -= boundary_size
 
-          status = input.read(boundary_size)
+          read_buffer = ''
+
+          status = input.read(boundary_size, read_buffer)
           raise EOFError, "bad content body"  unless status == boundary + EOL
 
-          rx = /(?:#{EOL})?#{Regexp.quote boundary}(#{EOL}|--)/
+          rx = /(?:#{EOL})?#{Regexp.quote boundary}(#{EOL}|--)/n
 
           loop {
             head = nil
@@ -284,15 +322,15 @@ module Rack
             filename = content_type = name = nil
 
             until head && buf =~ rx
-              if !head && i = buf.index("\r\n\r\n")
+              if !head && i = buf.index(EOL+EOL)
                 head = buf.slice!(0, i+2) # First \r\n
                 buf.slice!(0, 2)          # Second \r\n
 
                 filename = head[/Content-Disposition:.* filename="?([^\";]*)"?/ni, 1]
-                content_type = head[/Content-Type: (.*)\r\n/ni, 1]
-                name = head[/Content-Disposition:.* name="?([^\";]*)"?/ni, 1]
+                content_type = head[/Content-Type: (.*)#{EOL}/ni, 1]
+                name = head[/Content-Disposition:.*\s+name="?([^\";]*)"?/ni, 1] || head[/Content-ID:\s*([^#{EOL}]*)/ni, 1]
 
-                if filename
+                if content_type || filename
                   body = Tempfile.new("RackMultipart")
                   body.binmode  if body.respond_to?(:binmode)
                 end
@@ -305,7 +343,7 @@ module Rack
                 body << buf.slice!(0, buf.size - (boundary_size+4))
               end
 
-              c = input.read(bufsize < content_length ? bufsize : content_length)
+              c = input.read(bufsize < content_length ? bufsize : content_length, read_buffer)
               raise EOFError, "bad content body"  if c.nil? || c.empty?
               buf << c
               content_length -= c.size
@@ -319,26 +357,38 @@ module Rack
               content_length = -1  if $1 == "--"
             end
 
-            if filename
+            if filename == ""
+              # filename is blank which means no file has been selected
+              data = nil
+            elsif filename
               body.rewind
+
+              # Take the basename of the upload's original filename.
+              # This handles the full Windows paths given by Internet Explorer
+              # (and perhaps other broken user agents) without affecting
+              # those which give the lone filename.
+              filename =~ /^(?:.*[:\\\/])?(.*)/m
+              filename = $1
+
               data = {:filename => filename, :type => content_type,
                       :name => name, :tempfile => body, :head => head}
+            elsif !filename && content_type
+              body.rewind
+              
+              # Generic multipart cases, not coming from a form
+              data = {:type => content_type,
+                      :name => name, :tempfile => body, :head => head}
             else
               data = body
             end
 
-            if name
-              if name =~ /\[\]\z/
-                params[name] ||= []
-                params[name] << data
-              else
-                params[name] = data
-              end
-            end
+            Utils.normalize_params(params, name, data) unless data.nil?
 
             break  if buf.empty? || content_length == -1
           }
 
+          input.rewind
+
           params
         end
       end

data/rack.gemspec

@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rack}
+  s.version = "1.0.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Christian Neukirchen"]
+  s.date = %q{2009-04-25}
+  s.default_executable = %q{rackup}
+  s.description = %q{Rack provides 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.rubyforge.org.}
+  s.email = %q{chneukirchen@gmail.com}
+  s.executables = ["rackup"]
+  s.extra_rdoc_files = ["README", "SPEC", "RDOX", "KNOWN-ISSUES"]
+  s.files = ["COPYING", "KNOWN-ISSUES", "README", "Rakefile", "bin/rackup", "contrib/rack_logo.svg", "example/lobster.ru", "example/protectedlobster.rb", "example/protectedlobster.ru", "lib/rack.rb", "lib/rack/adapter/camping.rb", "lib/rack/auth/abstract/handler.rb", "lib/rack/auth/abstract/request.rb", "lib/rack/auth/basic.rb", "lib/rack/auth/digest/md5.rb", "lib/rack/auth/digest/nonce.rb", "lib/rack/auth/digest/params.rb", "lib/rack/auth/digest/request.rb", "lib/rack/auth/openid.rb", "lib/rack/builder.rb", "lib/rack/cascade.rb", "lib/rack/chunked.rb", "lib/rack/commonlogger.rb", "lib/rack/conditionalget.rb", "lib/rack/content_length.rb", "lib/rack/content_type.rb", "lib/rack/deflater.rb", "lib/rack/directory.rb", "lib/rack/file.rb", "lib/rack/handler.rb", "lib/rack/handler/cgi.rb", "lib/rack/handler/evented_mongrel.rb", "lib/rack/handler/fastcgi.rb", "lib/rack/handler/lsws.rb", "lib/rack/handler/mongrel.rb", "lib/rack/handler/scgi.rb", "lib/rack/handler/swiftiplied_mongrel.rb", "lib/rack/handler/thin.rb", "lib/rack/handler/webrick.rb", "lib/rack/head.rb", "lib/rack/lint.rb", "lib/rack/lobster.rb", "lib/rack/lock.rb", "lib/rack/methodoverride.rb", "lib/rack/mime.rb", "lib/rack/mock.rb", "lib/rack/recursive.rb", "lib/rack/reloader.rb", "lib/rack/request.rb", "lib/rack/response.rb", "lib/rack/rewindable_input.rb", "lib/rack/session/abstract/id.rb", "lib/rack/session/cookie.rb", "lib/rack/session/memcache.rb", "lib/rack/session/pool.rb", "lib/rack/showexceptions.rb", "lib/rack/showstatus.rb", "lib/rack/static.rb", "lib/rack/urlmap.rb", "lib/rack/utils.rb", "test/cgi/lighttpd.conf", "test/cgi/test", "test/cgi/test.fcgi", "test/cgi/test.ru", "test/multipart/binary", "test/multipart/empty", "test/multipart/ie", "test/multipart/nested", "test/multipart/none", "test/multipart/text", "test/spec_rack_auth_basic.rb", "test/spec_rack_auth_digest.rb", "test/spec_rack_auth_openid.rb", "test/spec_rack_builder.rb", "test/spec_rack_camping.rb", "test/spec_rack_cascade.rb", "test/spec_rack_cgi.rb", "test/spec_rack_chunked.rb", "test/spec_rack_commonlogger.rb", "test/spec_rack_conditionalget.rb", "test/spec_rack_content_length.rb", "test/spec_rack_content_type.rb", "test/spec_rack_deflater.rb", "test/spec_rack_directory.rb", "test/spec_rack_fastcgi.rb", "test/spec_rack_file.rb", "test/spec_rack_handler.rb", "test/spec_rack_head.rb", "test/spec_rack_lint.rb", "test/spec_rack_lobster.rb", "test/spec_rack_lock.rb", "test/spec_rack_methodoverride.rb", "test/spec_rack_mock.rb", "test/spec_rack_mongrel.rb", "test/spec_rack_recursive.rb", "test/spec_rack_request.rb", "test/spec_rack_response.rb", "test/spec_rack_rewindable_input.rb", "test/spec_rack_session_cookie.rb", "test/spec_rack_session_memcache.rb", "test/spec_rack_session_pool.rb", "test/spec_rack_showexceptions.rb", "test/spec_rack_showstatus.rb", "test/spec_rack_static.rb", "test/spec_rack_thin.rb", "test/spec_rack_urlmap.rb", "test/spec_rack_utils.rb", "test/spec_rack_webrick.rb", "test/testrequest.rb", "test/unregistered_handler/rack/handler/unregistered.rb", "test/unregistered_handler/rack/handler/unregistered_long_one.rb", "SPEC", "RDOX", "rack.gemspec"]
+  s.has_rdoc = true
+  s.homepage = %q{http://rack.rubyforge.org}
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{rack}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{a modular Ruby webserver interface}
+  s.test_files = ["test/spec_rack_auth_basic.rb", "test/spec_rack_auth_digest.rb", "test/spec_rack_auth_openid.rb", "test/spec_rack_builder.rb", "test/spec_rack_camping.rb", "test/spec_rack_cascade.rb", "test/spec_rack_cgi.rb", "test/spec_rack_chunked.rb", "test/spec_rack_commonlogger.rb", "test/spec_rack_conditionalget.rb", "test/spec_rack_content_length.rb", "test/spec_rack_content_type.rb", "test/spec_rack_deflater.rb", "test/spec_rack_directory.rb", "test/spec_rack_fastcgi.rb", "test/spec_rack_file.rb", "test/spec_rack_handler.rb", "test/spec_rack_head.rb", "test/spec_rack_lint.rb", "test/spec_rack_lobster.rb", "test/spec_rack_lock.rb", "test/spec_rack_methodoverride.rb", "test/spec_rack_mock.rb", "test/spec_rack_mongrel.rb", "test/spec_rack_recursive.rb", "test/spec_rack_request.rb", "test/spec_rack_response.rb", "test/spec_rack_rewindable_input.rb", "test/spec_rack_session_cookie.rb", "test/spec_rack_session_memcache.rb", "test/spec_rack_session_pool.rb", "test/spec_rack_showexceptions.rb", "test/spec_rack_showstatus.rb", "test/spec_rack_static.rb", "test/spec_rack_thin.rb", "test/spec_rack_urlmap.rb", "test/spec_rack_utils.rb", "test/spec_rack_webrick.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<test-spec>, [">= 0"])
+      s.add_development_dependency(%q<camping>, [">= 0"])
+      s.add_development_dependency(%q<fcgi>, [">= 0"])
+      s.add_development_dependency(%q<memcache-client>, [">= 0"])
+      s.add_development_dependency(%q<mongrel>, [">= 0"])
+      s.add_development_dependency(%q<ruby-openid>, ["~> 2.0.0"])
+      s.add_development_dependency(%q<thin>, [">= 0"])
+    else
+      s.add_dependency(%q<test-spec>, [">= 0"])
+      s.add_dependency(%q<camping>, [">= 0"])
+      s.add_dependency(%q<fcgi>, [">= 0"])
+      s.add_dependency(%q<memcache-client>, [">= 0"])
+      s.add_dependency(%q<mongrel>, [">= 0"])
+      s.add_dependency(%q<ruby-openid>, ["~> 2.0.0"])
+      s.add_dependency(%q<thin>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<test-spec>, [">= 0"])
+    s.add_dependency(%q<camping>, [">= 0"])
+    s.add_dependency(%q<fcgi>, [">= 0"])
+    s.add_dependency(%q<memcache-client>, [">= 0"])
+    s.add_dependency(%q<mongrel>, [">= 0"])
+    s.add_dependency(%q<ruby-openid>, ["~> 2.0.0"])
+    s.add_dependency(%q<thin>, [">= 0"])
+  end
+end

data/test/multipart/empty

@@ -0,0 +1,10 @@
+--AaB03x
+Content-Disposition: form-data; name="submit-name"
+
+Larry
+--AaB03x
+Content-Disposition: form-data; name="files"; filename="file1.txt"
+Content-Type: text/plain
+
+
+--AaB03x--

data/test/multipart/ie

@@ -0,0 +1,6 @@
+--AaB03x
+Content-Disposition: form-data; name="files"; filename="C:\Documents and Settings\Administrator\Desktop\file1.txt"
+Content-Type: text/plain
+
+contents
+--AaB03x--

data/test/multipart/nested

@@ -0,0 +1,10 @@
+--AaB03x
+Content-Disposition: form-data; name="foo[submit-name]"
+
+Larry
+--AaB03x
+Content-Disposition: form-data; name="foo[files]"; filename="file1.txt"
+Content-Type: text/plain
+
+contents
+--AaB03x--

data/test/multipart/none

@@ -0,0 +1,9 @@
+--AaB03x
+Content-Disposition: form-data; name="submit-name"
+
+Larry
+--AaB03x
+Content-Disposition: form-data; name="files"; filename=""
+
+
+--AaB03x--

data/test/multipart/text

@@ -0,0 +1,10 @@
+--AaB03x
+Content-Disposition: form-data; name="submit-name"
+
+Larry
+--AaB03x
+Content-Disposition: form-data; name="files"; filename="file1.txt"
+Content-Type: text/plain
+
+contents
+--AaB03x--

data/test/spec_rack_auth_basic.rb

@@ -35,7 +35,7 @@ context 'Rack::Auth::Basic' do
     response.should.be.a.client_error
     response.status.should.equal 401
     response.should.include 'WWW-Authenticate'
-    response.headers['WWW-Authenticate'].should =~ /Basic realm="/
+    response.headers['WWW-Authenticate'].should =~ /Basic realm="#{Regexp.escape(realm)}"/
     response.body.should.be.empty
   end
 
@@ -66,4 +66,8 @@ context 'Rack::Auth::Basic' do
     end
   end
 
+  specify 'realm as optional constructor arg' do
+    app = Rack::Auth::Basic.new(unprotected_app, realm) { true }
+    assert_equal realm, app.realm
+  end
 end