rack 1.2.0 → 1.2.1

data/README

@@ -308,6 +308,11 @@ run on port 11211) and memcache-client installed.
   * Various multipart fixes
   * Switch test suite to bacon
 
+* June 15th, 2010: Eleventh public release 1.2.1.
+  * Make CGI handler rewindable
+  * Rename spec/ to test/ to not conflict with SPEC on lesser
+    operating systems
+
 == Contact
 
 Please post bugs, suggestions and patches to

data/lib/rack/handler/cgi.rb

@@ -1,4 +1,5 @@
 require 'rack/content_length'
+require 'rack/rewindable_input'
 
 module Rack
   module Handler
@@ -17,7 +18,7 @@ module Rack
         env["SCRIPT_NAME"] = ""  if env["SCRIPT_NAME"] == "/"
 
         env.update({"rack.version" => Rack::VERSION,
-                     "rack.input" => $stdin,
+                     "rack.input" => Rack::RewindableInput.new($stdin),
                      "rack.errors" => $stderr,
 
                      "rack.multithread" => false,

data/lib/rack/utils.rb

@@ -128,13 +128,18 @@ module Rack
     end
     module_function :build_nested_query
 
+    ESCAPE_HTML = {
+      "&" => "&",
+      "<" => "&lt;",
+      ">" => "&gt;",
+      "'" => "&#39;",
+      '"' => "&quot;",
+    }
+    ESCAPE_HTML_PATTERN = Regexp.union(ESCAPE_HTML.keys)
+
     # Escape ampersands, brackets and quotes to their HTML/XML entities.
     def escape_html(string)
-      string.to_s.gsub("&", "&amp;").
-        gsub("<", "&lt;").
-        gsub(">", "&gt;").
-        gsub("'", "&#39;").
-        gsub('"', "&quot;")
+      string.to_s.gsub(ESCAPE_HTML_PATTERN){|c| ESCAPE_HTML[c] }
     end
     module_function :escape_html
 

data/rack.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = "rack"
-  s.version         = "1.2.0"
+  s.version         = "1.2.1"
   s.platform        = Gem::Platform::RUBY
   s.summary         = "a modular Ruby webserver interface"
 
@@ -14,14 +14,14 @@ middleware) into a single method call.
 Also see http://rack.rubyforge.org.
 EOF
 
-  s.files           = Dir['{bin/*,contrib/*,example/*,lib/**/*,spec/**/*}'] +
+  s.files           = Dir['{bin/*,contrib/*,example/*,lib/**/*,test/**/*}'] +
                         %w(COPYING KNOWN-ISSUES rack.gemspec README SPEC)
   s.bindir          = 'bin'
   s.executables     << 'rackup'
   s.require_path    = 'lib'
   s.has_rdoc        = true
   s.extra_rdoc_files = ['README', 'SPEC', 'KNOWN-ISSUES']
-  s.test_files      = Dir['spec/spec_*.rb']
+  s.test_files      = Dir['test/spec_*.rb']
 
   s.author          = 'Christian Neukirchen'
   s.email           = 'chneukirchen@gmail.com'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Christian Neukirchen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 +02:00
+date: 2010-06-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -169,73 +169,73 @@ files:
 - lib/rack/mime.rb
 - lib/rack/reloader.rb
 - lib/rack.rb
-- spec/spec_static.rb
-- spec/spec_content_type.rb
-- spec/spec_thin.rb
-- spec/testrequest.rb
-- spec/spec_auth_digest.rb
-- spec/spec_response.rb
-- spec/spec_file.rb
-- spec/spec_rewindable_input.rb
-- spec/spec_methodoverride.rb
-- spec/spec_fastcgi.rb
-- spec/spec_chunked.rb
-- spec/spec_cgi.rb
-- spec/multipart/semicolon
-- spec/multipart/filename_with_escaped_quotes
-- spec/multipart/binary
-- spec/multipart/fail_16384_nofile
-- spec/multipart/filename_and_modification_param
-- spec/multipart/text
-- spec/multipart/ie
-- spec/multipart/filename_with_percent_escaped_quotes
-- spec/multipart/empty
-- spec/multipart/none
-- spec/multipart/file1.txt
-- spec/multipart/filename_with_escaped_quotes_and_modification_param
-- spec/multipart/nested
-- spec/multipart/bad_robots
-- spec/multipart/filename_with_unescaped_quotes
-- spec/spec_head.rb
-- spec/spec_urlmap.rb
-- spec/spec_mongrel.rb
-- spec/spec_content_length.rb
-- spec/spec_session_cookie.rb
-- spec/spec_utils.rb
-- spec/spec_showexceptions.rb
-- spec/spec_lobster.rb
-- spec/spec_logger.rb
-- spec/spec_sendfile.rb
-- spec/spec_conditionalget.rb
-- spec/spec_lint.rb
-- spec/spec_deflater.rb
-- spec/rackup/config.ru
-- spec/spec_showstatus.rb
-- spec/spec_lock.rb
-- spec/spec_nulllogger.rb
-- spec/spec_config.rb
-- spec/spec_session_memcache.rb
-- spec/spec_runtime.rb
-- spec/spec_commonlogger.rb
-- spec/spec_directory.rb
-- spec/spec_cascade.rb
-- spec/spec_webrick.rb
-- spec/spec_request.rb
-- spec/spec_etag.rb
-- spec/spec_mock.rb
-- spec/cgi/sample_rackup.ru
-- spec/cgi/test
-- spec/cgi/test.fcgi
-- spec/cgi/lighttpd.conf
-- spec/cgi/rackup_stub.rb
-- spec/cgi/test.ru
-- spec/spec_builder.rb
-- spec/spec_auth_basic.rb
-- spec/unregistered_handler/rack/handler/unregistered.rb
-- spec/unregistered_handler/rack/handler/unregistered_long_one.rb
-- spec/spec_handler.rb
-- spec/spec_session_pool.rb
-- spec/spec_recursive.rb
+- test/spec_static.rb
+- test/spec_content_type.rb
+- test/spec_thin.rb
+- test/testrequest.rb
+- test/spec_auth_digest.rb
+- test/spec_response.rb
+- test/spec_file.rb
+- test/spec_rewindable_input.rb
+- test/spec_methodoverride.rb
+- test/spec_fastcgi.rb
+- test/spec_chunked.rb
+- test/spec_cgi.rb
+- test/multipart/semicolon
+- test/multipart/filename_with_escaped_quotes
+- test/multipart/binary
+- test/multipart/fail_16384_nofile
+- test/multipart/filename_and_modification_param
+- test/multipart/text
+- test/multipart/ie
+- test/multipart/filename_with_percent_escaped_quotes
+- test/multipart/empty
+- test/multipart/none
+- test/multipart/file1.txt
+- test/multipart/filename_with_escaped_quotes_and_modification_param
+- test/multipart/nested
+- test/multipart/bad_robots
+- test/multipart/filename_with_unescaped_quotes
+- test/spec_head.rb
+- test/spec_urlmap.rb
+- test/spec_mongrel.rb
+- test/spec_content_length.rb
+- test/spec_session_cookie.rb
+- test/spec_utils.rb
+- test/spec_showexceptions.rb
+- test/spec_lobster.rb
+- test/spec_logger.rb
+- test/spec_sendfile.rb
+- test/spec_conditionalget.rb
+- test/spec_lint.rb
+- test/spec_deflater.rb
+- test/rackup/config.ru
+- test/spec_showstatus.rb
+- test/spec_lock.rb
+- test/spec_nulllogger.rb
+- test/spec_config.rb
+- test/spec_session_memcache.rb
+- test/spec_runtime.rb
+- test/spec_commonlogger.rb
+- test/spec_directory.rb
+- test/spec_cascade.rb
+- test/spec_webrick.rb
+- test/spec_request.rb
+- test/spec_etag.rb
+- test/spec_mock.rb
+- test/cgi/sample_rackup.ru
+- test/cgi/test
+- test/cgi/test.fcgi
+- test/cgi/lighttpd.conf
+- test/cgi/rackup_stub.rb
+- test/cgi/test.ru
+- test/spec_builder.rb
+- test/spec_auth_basic.rb
+- test/unregistered_handler/rack/handler/unregistered.rb
+- test/unregistered_handler/rack/handler/unregistered_long_one.rb
+- test/spec_handler.rb
+- test/spec_session_pool.rb
+- test/spec_recursive.rb
 - COPYING
 - KNOWN-ISSUES
 - rack.gemspec
@@ -272,45 +272,45 @@ signing_key:
 specification_version: 3
 summary: a modular Ruby webserver interface
 test_files: 
-- spec/spec_static.rb
-- spec/spec_content_type.rb
-- spec/spec_thin.rb
-- spec/spec_auth_digest.rb
-- spec/spec_response.rb
-- spec/spec_file.rb
-- spec/spec_rewindable_input.rb
-- spec/spec_methodoverride.rb
-- spec/spec_fastcgi.rb
-- spec/spec_chunked.rb
-- spec/spec_cgi.rb
-- spec/spec_head.rb
-- spec/spec_urlmap.rb
-- spec/spec_mongrel.rb
-- spec/spec_content_length.rb
-- spec/spec_session_cookie.rb
-- spec/spec_utils.rb
-- spec/spec_showexceptions.rb
-- spec/spec_lobster.rb
-- spec/spec_logger.rb
-- spec/spec_sendfile.rb
-- spec/spec_conditionalget.rb
-- spec/spec_lint.rb
-- spec/spec_deflater.rb
-- spec/spec_showstatus.rb
-- spec/spec_lock.rb
-- spec/spec_nulllogger.rb
-- spec/spec_config.rb
-- spec/spec_session_memcache.rb
-- spec/spec_runtime.rb
-- spec/spec_commonlogger.rb
-- spec/spec_directory.rb
-- spec/spec_cascade.rb
-- spec/spec_webrick.rb
-- spec/spec_request.rb
-- spec/spec_etag.rb
-- spec/spec_mock.rb
-- spec/spec_builder.rb
-- spec/spec_auth_basic.rb
-- spec/spec_handler.rb
-- spec/spec_session_pool.rb
-- spec/spec_recursive.rb
+- test/spec_static.rb
+- test/spec_content_type.rb
+- test/spec_thin.rb
+- test/spec_auth_digest.rb
+- test/spec_response.rb
+- test/spec_file.rb
+- test/spec_rewindable_input.rb
+- test/spec_methodoverride.rb
+- test/spec_fastcgi.rb
+- test/spec_chunked.rb
+- test/spec_cgi.rb
+- test/spec_head.rb
+- test/spec_urlmap.rb
+- test/spec_mongrel.rb
+- test/spec_content_length.rb
+- test/spec_session_cookie.rb
+- test/spec_utils.rb
+- test/spec_showexceptions.rb
+- test/spec_lobster.rb
+- test/spec_logger.rb
+- test/spec_sendfile.rb
+- test/spec_conditionalget.rb
+- test/spec_lint.rb
+- test/spec_deflater.rb
+- test/spec_showstatus.rb
+- test/spec_lock.rb
+- test/spec_nulllogger.rb
+- test/spec_config.rb
+- test/spec_session_memcache.rb
+- test/spec_runtime.rb
+- test/spec_commonlogger.rb
+- test/spec_directory.rb
+- test/spec_cascade.rb
+- test/spec_webrick.rb
+- test/spec_request.rb
+- test/spec_etag.rb
+- test/spec_mock.rb
+- test/spec_builder.rb
+- test/spec_auth_basic.rb
+- test/spec_handler.rb
+- test/spec_session_pool.rb
+- test/spec_recursive.rb