Improved test coverage and added RackRequest support for CGI environment variables.

3 files changed, 154 insertions, 22 deletions

diff --git a/actionpack/lib/action_controller/rack_process.rb b/actionpack/lib/action_controller/rack_process.rb
index 9b4aa9b7cf..01bc1ebb26 100644
--- a/actionpack/lib/action_controller/rack_process.rb
+++ b/actionpack/lib/action_controller/rack_process.rb
@@ -24,6 +24,19 @@ module ActionController #:nodoc:
       super()
     end
 
+    %w[ AUTH_TYPE CONTENT_TYPE GATEWAY_INTERFACE PATH_INFO
+        PATH_TRANSLATED QUERY_STRING REMOTE_HOST
+        REMOTE_IDENT REMOTE_USER SCRIPT_NAME
+        SERVER_NAME SERVER_PROTOCOL
+
+        HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
+        HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM HTTP_HOST
+        HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT ].each do |env|
+      define_method(env.sub(/^HTTP_/n, '').downcase) do
+        @env[env]
+      end
+    end
+
     # The request body is an IO input stream. If the RAW_POST_DATA environment
     # variable is already set, wrap it in a StringIO.
     def body
@@ -35,7 +48,7 @@ module ActionController #:nodoc:
     end
 
     def key?(key)
-      @env.key? key
+      @env.key?(key)
     end
 
     def query_parameters
@@ -85,6 +98,18 @@ module ActionController #:nodoc:
       @env['REMOTE_ADDR']
     end
 
+    def request_method
+      @env['REQUEST_METHOD'].downcase.to_sym
+    end
+
+    def server_port
+      @env['SERVER_PORT'].to_i
+    end
+
+    def server_software
+      @env['SERVER_SOFTWARE'].split("/").first
+    end
+
     def session
       unless defined?(@session)
         if @session_options == false
@@ -178,9 +203,9 @@ end_msg
       normalize_headers(@headers)
       if [204, 304].include?(@status.to_i)
         @headers.delete "Content-Type"
-        [status.to_i, @headers.to_hash, []]
+        [status, @headers.to_hash, []]
       else
-        [status.to_i, @headers.to_hash, self]
+        [status, @headers.to_hash, self]
       end
     end
     alias to_a out
@@ -225,8 +250,8 @@ end_msg
           headers['Content-Language'] = options.delete('language') if options['language']
           headers['Expires']          = options.delete('expires') if options['expires']
 
-          @status = options.delete('Status') if options['Status']
-          @status ||= 200
+          @status = options['Status'] || "200 OK"
+
           # Convert 'cookie' header to 'Set-Cookie' headers.
           # Because Set-Cookie header can appear more the once in the response body,
           # we store it in a line break seperated string that will be translated to
diff --git a/actionpack/test/controller/cgi_test.rb b/actionpack/test/controller/cgi_test.rb
index 1b1ded4615..bf3b8b788e 100755
--- a/actionpack/test/controller/cgi_test.rb
+++ b/actionpack/test/controller/cgi_test.rb
@@ -3,18 +3,58 @@ require 'action_controller/cgi_process'
 
 class BaseCgiTest < Test::Unit::TestCase
   def setup
-    @request_hash = {"HTTP_MAX_FORWARDS"=>"10", "SERVER_NAME"=>"glu.ttono.us:8007", "FCGI_ROLE"=>"RESPONDER", "HTTP_X_FORWARDED_HOST"=>"glu.ttono.us", "HTTP_ACCEPT_ENCODING"=>"gzip, deflate", "HTTP_USER_AGENT"=>"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/312.5.1 (KHTML, like Gecko) Safari/312.3.1", "PATH_INFO"=>"", "HTTP_ACCEPT_LANGUAGE"=>"en", "HTTP_HOST"=>"glu.ttono.us:8007", "SERVER_PROTOCOL"=>"HTTP/1.1", "REDIRECT_URI"=>"/dispatch.fcgi", "SCRIPT_NAME"=>"/dispatch.fcgi", "SERVER_ADDR"=>"207.7.108.53", "REMOTE_ADDR"=>"207.7.108.53", "SERVER_SOFTWARE"=>"lighttpd/1.4.5", "HTTP_COOKIE"=>"_session_id=c84ace84796670c052c6ceb2451fb0f2; is_admin=yes", "HTTP_X_FORWARDED_SERVER"=>"glu.ttono.us", "REQUEST_URI"=>"/admin", "DOCUMENT_ROOT"=>"/home/kevinc/sites/typo/public", "SERVER_PORT"=>"8007", "QUERY_STRING"=>"", "REMOTE_PORT"=>"63137", "GATEWAY_INTERFACE"=>"CGI/1.1", "HTTP_X_FORWARDED_FOR"=>"65.88.180.234", "HTTP_ACCEPT"=>"*/*", "SCRIPT_FILENAME"=>"/home/kevinc/sites/typo/public/dispatch.fcgi", "REDIRECT_STATUS"=>"200", "REQUEST_METHOD"=>"GET"}
+    @request_hash = {
+      "HTTP_MAX_FORWARDS" => "10",
+      "SERVER_NAME" => "glu.ttono.us:8007",
+      "FCGI_ROLE" => "RESPONDER",
+      "AUTH_TYPE" => "Basic",
+      "HTTP_X_FORWARDED_HOST" => "glu.ttono.us",
+      "HTTP_ACCEPT_CHARSET" => "UTF-8",
+      "HTTP_ACCEPT_ENCODING" => "gzip, deflate",
+      "HTTP_CACHE_CONTROL" => "no-cache, max-age=0",
+      "HTTP_PRAGMA" => "no-cache",
+      "HTTP_USER_AGENT" => "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en)",
+      "PATH_INFO" => "/homepage/",
+      "HTTP_ACCEPT_LANGUAGE" => "en",
+      "HTTP_NEGOTIATE" => "trans",
+      "HTTP_HOST" => "glu.ttono.us:8007",
+      "HTTP_REFERER" => "http://www.google.com/search?q=glu.ttono.us",
+      "HTTP_FROM" => "googlebot",
+      "SERVER_PROTOCOL" => "HTTP/1.1",
+      "REDIRECT_URI" => "/dispatch.fcgi",
+      "SCRIPT_NAME" => "/dispatch.fcgi",
+      "SERVER_ADDR" => "207.7.108.53",
+      "REMOTE_ADDR" => "207.7.108.53",
+      "REMOTE_HOST" => "google.com",
+      "REMOTE_IDENT" => "kevin",
+      "REMOTE_USER" => "kevin",
+      "SERVER_SOFTWARE" => "lighttpd/1.4.5",
+      "HTTP_COOKIE" => "_session_id=c84ace84796670c052c6ceb2451fb0f2; is_admin=yes",
+      "HTTP_X_FORWARDED_SERVER" => "glu.ttono.us",
+      "REQUEST_URI" => "/admin",
+      "DOCUMENT_ROOT" => "/home/kevinc/sites/typo/public",
+      "PATH_TRANSLATED" => "/home/kevinc/sites/typo/public/homepage/",
+      "SERVER_PORT" => "8007",
+      "QUERY_STRING" => "",
+      "REMOTE_PORT" => "63137",
+      "GATEWAY_INTERFACE" => "CGI/1.1",
+      "HTTP_X_FORWARDED_FOR" => "65.88.180.234",
+      "HTTP_ACCEPT" => "*/*",
+      "SCRIPT_FILENAME" => "/home/kevinc/sites/typo/public/dispatch.fcgi",
+      "REDIRECT_STATUS" => "200",
+      "REQUEST_METHOD" => "GET"
+    }
     # some Nokia phone browsers omit the space after the semicolon separator.
     # some developers have grown accustomed to using comma in cookie values.
     @alt_cookie_fmt_request_hash = {"HTTP_COOKIE"=>"_session_id=c84ace847,96670c052c6ceb2451fb0f2;is_admin=yes"}
-    @fake_cgi = Struct.new(:env_table).new(@request_hash)
-    @request = ActionController::CgiRequest.new(@fake_cgi)
+    @cgi = CGI.new
+    @cgi.stubs(:env_table).returns(@request_hash)
+    @request = ActionController::CgiRequest.new(@cgi)
   end
 
   def default_test; end
 end
 
-
 class CgiRequestTest < BaseCgiTest
   def test_proxy_request
     assert_equal 'glu.ttono.us', @request.host_with_port
@@ -71,6 +111,37 @@ class CgiRequestTest < BaseCgiTest
     assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host
   end
 
+  def test_cgi_environment_variables
+    assert_equal "Basic", @request.auth_type
+    assert_equal 0, @request.content_length
+    assert_equal nil, @request.content_type
+    assert_equal "CGI/1.1", @request.gateway_interface
+    assert_equal "*/*", @request.accept
+    assert_equal "UTF-8", @request.accept_charset
+    assert_equal "gzip, deflate", @request.accept_encoding
+    assert_equal "en", @request.accept_language
+    assert_equal "no-cache, max-age=0", @request.cache_control
+    assert_equal "googlebot", @request.from
+    assert_equal "glu.ttono.us", @request.host
+    assert_equal "trans", @request.negotiate
+    assert_equal "no-cache", @request.pragma
+    assert_equal "http://www.google.com/search?q=glu.ttono.us", @request.referer
+    assert_equal "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en)", @request.user_agent
+    assert_equal "/homepage/", @request.path_info
+    assert_equal "/home/kevinc/sites/typo/public/homepage/", @request.path_translated
+    assert_equal "", @request.query_string
+    assert_equal "207.7.108.53", @request.remote_addr
+    assert_equal "google.com", @request.remote_host
+    assert_equal "kevin", @request.remote_ident
+    assert_equal "kevin", @request.remote_user
+    assert_equal :get, @request.request_method
+    assert_equal "/dispatch.fcgi", @request.script_name
+    assert_equal "glu.ttono.us:8007", @request.server_name
+    assert_equal 8007, @request.server_port
+    assert_equal "HTTP/1.1", @request.server_protocol
+    assert_equal "lighttpd", @request.server_software
+  end
+
   def test_cookie_syntax_resilience
     cookies = CGI::Cookie::parse(@request_hash["HTTP_COOKIE"]);
     assert_equal ["c84ace84796670c052c6ceb2451fb0f2"], cookies["_session_id"], cookies.inspect
@@ -82,7 +153,6 @@ class CgiRequestTest < BaseCgiTest
   end
 end
 
-
 class CgiRequestParamsParsingTest < BaseCgiTest
   def test_doesnt_break_when_content_type_has_charset
     data = 'flamenco=love'
@@ -98,7 +168,6 @@ class CgiRequestParamsParsingTest < BaseCgiTest
   end
 end
 
-
 class CgiRequestNeedsRewoundTest < BaseCgiTest
   def test_body_should_be_rewound
     data = 'foo'
@@ -119,8 +188,8 @@ uses_mocha 'CGI Response' do
   class CgiResponseTest < BaseCgiTest
     def setup
       super
-      @fake_cgi.expects(:header).returns("HTTP/1.0 200 OK\nContent-Type: text/html\n")
-      @response = ActionController::CgiResponse.new(@fake_cgi)
+      @cgi.expects(:header).returns("HTTP/1.0 200 OK\nContent-Type: text/html\n")
+      @response = ActionController::CgiResponse.new(@cgi)
       @output = StringIO.new('')
     end
 
@@ -132,7 +201,7 @@ uses_mocha 'CGI Response' do
     end
 
     def test_head_request
-      @fake_cgi.env_table['REQUEST_METHOD'] = 'HEAD'
+      @cgi.env_table['REQUEST_METHOD'] = 'HEAD'
       @response.body = "Hello, World!"
 
       @response.out(@output)
diff --git a/actionpack/test/controller/rack_test.rb b/actionpack/test/controller/rack_test.rb
index 856f24bbdb..486fe49737 100644
--- a/actionpack/test/controller/rack_test.rb
+++ b/actionpack/test/controller/rack_test.rb
@@ -7,22 +7,33 @@ class BaseRackTest < Test::Unit::TestCase
       "HTTP_MAX_FORWARDS" => "10",
       "SERVER_NAME" => "glu.ttono.us:8007",
       "FCGI_ROLE" => "RESPONDER",
+      "AUTH_TYPE" => "Basic",
       "HTTP_X_FORWARDED_HOST" => "glu.ttono.us",
+      "HTTP_ACCEPT_CHARSET" => "UTF-8",
       "HTTP_ACCEPT_ENCODING" => "gzip, deflate",
+      "HTTP_CACHE_CONTROL" => "no-cache, max-age=0",
+      "HTTP_PRAGMA" => "no-cache",
       "HTTP_USER_AGENT" => "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en)",
-      "PATH_INFO" => "",
+      "PATH_INFO" => "/homepage/",
       "HTTP_ACCEPT_LANGUAGE" => "en",
+      "HTTP_NEGOTIATE" => "trans",
       "HTTP_HOST" => "glu.ttono.us:8007",
+      "HTTP_REFERER" => "http://www.google.com/search?q=glu.ttono.us",
+      "HTTP_FROM" => "googlebot",
       "SERVER_PROTOCOL" => "HTTP/1.1",
       "REDIRECT_URI" => "/dispatch.fcgi",
       "SCRIPT_NAME" => "/dispatch.fcgi",
       "SERVER_ADDR" => "207.7.108.53",
       "REMOTE_ADDR" => "207.7.108.53",
+      "REMOTE_HOST" => "google.com",
+      "REMOTE_IDENT" => "kevin",
+      "REMOTE_USER" => "kevin",
       "SERVER_SOFTWARE" => "lighttpd/1.4.5",
       "HTTP_COOKIE" => "_session_id=c84ace84796670c052c6ceb2451fb0f2; is_admin=yes",
       "HTTP_X_FORWARDED_SERVER" => "glu.ttono.us",
       "REQUEST_URI" => "/admin",
       "DOCUMENT_ROOT" => "/home/kevinc/sites/typo/public",
+      "PATH_TRANSLATED" => "/home/kevinc/sites/typo/public/homepage/",
       "SERVER_PORT" => "8007",
       "QUERY_STRING" => "",
       "REMOTE_PORT" => "63137",
@@ -42,7 +53,6 @@ class BaseRackTest < Test::Unit::TestCase
   def default_test; end
 end
 
-
 class RackRequestTest < BaseRackTest
   def test_proxy_request
     assert_equal 'glu.ttono.us', @request.host_with_port
@@ -99,6 +109,37 @@ class RackRequestTest < BaseRackTest
     assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host
   end
 
+  def test_cgi_environment_variables
+    assert_equal "Basic", @request.auth_type
+    assert_equal 0, @request.content_length
+    assert_equal nil, @request.content_type
+    assert_equal "CGI/1.1", @request.gateway_interface
+    assert_equal "*/*", @request.accept
+    assert_equal "UTF-8", @request.accept_charset
+    assert_equal "gzip, deflate", @request.accept_encoding
+    assert_equal "en", @request.accept_language
+    assert_equal "no-cache, max-age=0", @request.cache_control
+    assert_equal "googlebot", @request.from
+    assert_equal "glu.ttono.us", @request.host
+    assert_equal "trans", @request.negotiate
+    assert_equal "no-cache", @request.pragma
+    assert_equal "http://www.google.com/search?q=glu.ttono.us", @request.referer
+    assert_equal "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en)", @request.user_agent
+    assert_equal "/homepage/", @request.path_info
+    assert_equal "/home/kevinc/sites/typo/public/homepage/", @request.path_translated
+    assert_equal "", @request.query_string
+    assert_equal "207.7.108.53", @request.remote_addr
+    assert_equal "google.com", @request.remote_host
+    assert_equal "kevin", @request.remote_ident
+    assert_equal "kevin", @request.remote_user
+    assert_equal :get, @request.request_method
+    assert_equal "/dispatch.fcgi", @request.script_name
+    assert_equal "glu.ttono.us:8007", @request.server_name
+    assert_equal 8007, @request.server_port
+    assert_equal "HTTP/1.1", @request.server_protocol
+    assert_equal "lighttpd", @request.server_software
+  end
+
   def test_cookie_syntax_resilience
     cookies = @request.cookies
     assert_equal ["c84ace84796670c052c6ceb2451fb0f2"], cookies["_session_id"], cookies.inspect
@@ -110,7 +151,6 @@ class RackRequestTest < BaseRackTest
   end
 end
 
-
 class RackRequestParamsParsingTest < BaseRackTest
   def test_doesnt_break_when_content_type_has_charset
     data = 'flamenco=love'
@@ -126,7 +166,6 @@ class RackRequestParamsParsingTest < BaseRackTest
   end
 end
 
-
 class RackRequestNeedsRewoundTest < BaseRackTest
   def test_body_should_be_rewound
     data = 'foo'
@@ -143,7 +182,6 @@ class RackRequestNeedsRewoundTest < BaseRackTest
   end
 end
 
-
 class RackResponseTest < BaseRackTest
   def setup
     super
@@ -155,7 +193,7 @@ class RackResponseTest < BaseRackTest
     @response.body = "Hello, World!"
 
     status, headers, body = @response.out(@output)
-    assert_equal 200, status
+    assert_equal "200 OK", status
     assert_equal({"Content-Type" => "text/html", "Cache-Control" => "no-cache", "Set-Cookie" => []}, headers)
 
     parts = []
@@ -169,7 +207,7 @@ class RackResponseTest < BaseRackTest
     end
 
     status, headers, body = @response.out(@output)
-    assert_equal 200, status
+    assert_equal "200 OK", status
     assert_equal({"Content-Type" => "text/html", "Cache-Control" => "no-cache", "Set-Cookie" => []}, headers)
 
     parts = []
@@ -184,7 +222,7 @@ class RackResponseTest < BaseRackTest
     @response.body = "Hello, World!"
 
     status, headers, body = @response.out(@output)
-    assert_equal 200, status
+    assert_equal "200 OK", status
     assert_equal({
       "Content-Type" => "text/html",
       "Cache-Control" => "no-cache",