actionpack 1.13.6 → 2.0.0

data/test/controller/base_test.rb

@@ -75,23 +75,21 @@ class ControllerInstanceTests < Test::Unit::TestCase
   def test_action_methods
     @empty_controllers.each do |c|
       hide_mocha_methods_from_controller(c)
-      assert_equal Set.new, c.send(:action_methods), "#{c.controller_path} should be empty!"
+      assert_equal Set.new, c.send!(:action_methods), "#{c.controller_path} should be empty!"
     end
     @non_empty_controllers.each do |c|
       hide_mocha_methods_from_controller(c)
-      assert_equal Set.new('public_action'), c.send(:action_methods), "#{c.controller_path} should not be empty!"
+      assert_equal Set.new(%w(public_action)), c.send!(:action_methods), "#{c.controller_path} should not be empty!"
     end
   end
-  
+
   protected
-  
-  # Mocha adds methods to Object which are then included in the public_instance_methods
-  # This method hides those from the controller so the above tests won't know the difference
-  def hide_mocha_methods_from_controller(controller)
-    mocha_methods = [:expects, :metaclass, :mocha, :mocha_inspect, :reset_mocha, :stubba_object, :stubba_method, :stubs, :verify, :__is_a__, :__metaclass__]
-    controller.class.send(:hide_action, *mocha_methods)
-  end
-  
+    # Mocha adds some public instance methods to Object that would be
+    # considered actions, so explicitly hide_action them.
+    def hide_mocha_methods_from_controller(controller)
+      mocha_methods = [:expects, :metaclass, :mocha, :mocha_inspect, :reset_mocha, :stubba_object, :stubba_method, :stubs, :verify, :__metaclass__, :__is_a__]
+      controller.class.send!(:hide_action, *mocha_methods)
+    end
 end
 
 
@@ -118,7 +116,7 @@ class PerformActionTest < Test::Unit::TestCase
   
   def test_method_missing_is_not_an_action_name
     use_controller MethodMissingController
-    assert ! @controller.send(:action_methods).include?('method_missing')
+    assert ! @controller.send!(:action_methods).include?('method_missing')
     
     get :method_missing
     assert_response :success
@@ -133,4 +131,4 @@ class PerformActionTest < Test::Unit::TestCase
     get :another_hidden_action
     assert_response 404
   end
-end
+end

data/test/controller/caching_test.rb

@@ -2,9 +2,8 @@ require 'fileutils'
 require File.dirname(__FILE__) + '/../abstract_unit'
 
 CACHE_DIR = 'test_cache'
-# Don't change '/../temp/' cavalierly or you might hoze something you don't want hozed
+# Don't change '/../temp/' cavalierly or you might hose something you don't want hosed
 FILE_STORE_PATH = File.join(File.dirname(__FILE__), '/../temp/', CACHE_DIR)
-ActionController::Base.perform_caching = true
 ActionController::Base.page_cache_directory = FILE_STORE_PATH
 ActionController::Base.fragment_cache_store = :file_store, FILE_STORE_PATH
 
@@ -26,10 +25,26 @@ class PageCachingTestController < ActionController::Base
   def not_found
     head :not_found
   end
+  
+  def custom_path
+    render :text => "Super soaker"
+    cache_page("Super soaker", "/index.html")
+  end
+  
+  def expire_custom_path
+    expire_page("/index.html")
+    head :ok
+  end
+  
+  def trailing_slash
+    render :text => "Sneak attack"
+  end
 end
 
 class PageCachingTest < Test::Unit::TestCase
   def setup
+    ActionController::Base.perform_caching = true
+
     ActionController::Routing::Routes.draw do |map|
       map.main '', :controller => 'posts'
       map.resources :posts
@@ -51,6 +66,8 @@ class PageCachingTest < Test::Unit::TestCase
 
   def teardown
     FileUtils.rm_rf(File.dirname(FILE_STORE_PATH))
+
+    ActionController::Base.perform_caching = false
   end
 
   def test_page_caching_resources_saves_to_correct_path_with_extension_even_if_default_route
@@ -66,6 +83,38 @@ class PageCachingTest < Test::Unit::TestCase
     assert_page_cached :ok, "get with ok status should have been cached"
   end
 
+  def test_should_cache_with_custom_path
+    get :custom_path
+    assert File.exist?("#{FILE_STORE_PATH}/index.html")
+  end
+
+  def test_should_expire_cache_with_custom_path
+    get :custom_path
+    assert File.exist?("#{FILE_STORE_PATH}/index.html")
+
+    get :expire_custom_path
+    assert !File.exist?("#{FILE_STORE_PATH}/index.html")
+  end
+  
+  def test_should_cache_without_trailing_slash_on_url
+    @controller.class.cache_page 'cached content', '/page_caching_test/trailing_slash'
+    assert File.exist?("#{FILE_STORE_PATH}/page_caching_test/trailing_slash.html")
+  end
+
+  def test_should_cache_with_trailing_slash_on_url
+    @controller.class.cache_page 'cached content', '/page_caching_test/trailing_slash/'
+    assert File.exist?("#{FILE_STORE_PATH}/page_caching_test/trailing_slash.html")
+  end
+
+  uses_mocha("should_cache_ok_at_custom_path") do
+    def test_should_cache_ok_at_custom_path
+      @request.expects(:path).returns("/index.html")
+      get :ok
+      assert_response :ok
+      assert File.exist?("#{FILE_STORE_PATH}/index.html")
+    end
+  end
+
   [:ok, :no_content, :found, :not_found].each do |status|
     [:get, :post, :put, :delete].each do |method|
       unless method == :get and status == :ok
@@ -93,15 +142,29 @@ class PageCachingTest < Test::Unit::TestCase
     end
 end
 
+
 class ActionCachingTestController < ActionController::Base
-  caches_action :index
+  caches_action :index, :redirected, :forbidden
+  caches_action :show, :cache_path => 'http://test.host/custom/show'
+  caches_action :edit, :cache_path => Proc.new { |c| c.params[:id] ? "http://test.host/#{c.params[:id]};edit" : "http://test.host/edit" }
 
   def index
-    sleep 0.01
     @cache_this = Time.now.to_f.to_s
     render :text => @cache_this
   end
 
+  def redirected
+    redirect_to :action => 'index'
+  end
+
+  def forbidden
+    render :text => "Forbidden"
+    headers["Status"] = "403 Forbidden"
+  end
+
+  alias_method :show, :index
+  alias_method :edit, :index
+
   def expire
     expire_action :controller => 'action_caching_test', :action => 'index'
     render :nothing => true
@@ -146,11 +209,32 @@ class ActionCacheTest < Test::Unit::TestCase
     get :index
     cached_time = content_to_cache
     assert_equal cached_time, @response.body
+    assert_cache_exists 'hostname.com/action_caching_test'
     reset!
 
     get :index
     assert_equal cached_time, @response.body
   end
+  
+  def test_action_cache_with_custom_cache_path
+    get :show
+    cached_time = content_to_cache
+    assert_equal cached_time, @response.body
+    assert_cache_exists 'test.host/custom/show'
+    reset!
+
+    get :show
+    assert_equal cached_time, @response.body
+  end
+
+  def test_action_cache_with_custom_cache_path_in_block
+    get :edit
+    assert_cache_exists 'test.host/edit'
+    reset!
+
+    get :edit, :id => 1
+    assert_cache_exists 'test.host/1;edit'
+  end
 
   def test_cache_expiration
     get :index
@@ -178,21 +262,45 @@ class ActionCacheTest < Test::Unit::TestCase
     @request.host = 'jamis.hostname.com'
     get :index
     jamis_cache = content_to_cache
-
+    
+    reset!
+    
     @request.host = 'david.hostname.com'
     get :index
     david_cache = content_to_cache
     assert_not_equal jamis_cache, @response.body
 
+    reset!
+
     @request.host = 'jamis.hostname.com'
     get :index
     assert_equal jamis_cache, @response.body
 
+    reset!
+
     @request.host = 'david.hostname.com'
     get :index
     assert_equal david_cache, @response.body
   end
 
+  def test_redirect_is_not_cached
+    get :redirected
+    assert_response :redirect
+    reset!
+
+    get :redirected
+    assert_response :redirect
+  end
+
+  def test_forbidden_is_not_cached
+    get :forbidden
+    assert_response :forbidden
+    reset!
+
+    get :forbidden
+    assert_response :forbidden
+  end
+
   def test_xml_version_of_resource_is_treated_as_different_cache
     @mock_controller.mock_url_for = 'http://example.org/posts/'
     @mock_controller.mock_path    = '/posts/index.xml'
@@ -200,6 +308,13 @@ class ActionCacheTest < Test::Unit::TestCase
     assert_equal 'xml', path_object.extension
     assert_equal 'example.org/posts/index.xml', path_object.path
   end
+  
+  def test_correct_content_type_is_returned_for_cache_hit
+    # run it twice to cache it the first time
+    get :index, :id => 'content-type.xml'
+    get :index, :id => 'content-type.xml'
+    assert_equal 'application/xml', @response.content_type
+  end
 
   def test_empty_path_is_normalized
     @mock_controller.mock_url_for = 'http://example.org/'
@@ -226,4 +341,9 @@ class ActionCacheTest < Test::Unit::TestCase
       @controller = ActionCachingTestController.new
       @request.host = 'hostname.com'
     end
+    
+    def assert_cache_exists(path)
+      full_path = File.join(FILE_STORE_PATH, path + '.cache')
+      assert File.exist?(full_path), "#{full_path.inspect} does not exist."
+    end
 end

data/test/controller/capture_test.rb

@@ -8,6 +8,14 @@ class CaptureController < ActionController::Base
     render :layout => "talk_from_action"
   end
 
+  def content_for_with_parameter
+    render :layout => "talk_from_action"
+  end
+  
+  def content_for_concatenated
+    render :layout => "talk_from_action"
+  end
+
   def erb_content_for
     render :layout => "talk_from_action"
   end
@@ -23,7 +31,7 @@ class CaptureController < ActionController::Base
   def rescue_action(e) raise end
 end
 
-CaptureController.template_root = File.dirname(__FILE__) + "/../fixtures/"
+CaptureController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
 
 class CaptureTest < Test::Unit::TestCase
   def setup
@@ -49,8 +57,18 @@ class CaptureTest < Test::Unit::TestCase
     assert_equal expected_content_for_output, @response.body
   end
 
+  def test_should_concatentate_content_for
+    get :content_for_concatenated
+    assert_equal expected_content_for_output, @response.body
+  end
+
   def test_erb_content_for
-    get :content_for
+    get :erb_content_for
+    assert_equal expected_content_for_output, @response.body
+  end
+
+  def test_should_set_content_for_with_parameter
+    get :content_for_with_parameter
     assert_equal expected_content_for_output, @response.body
   end
 
@@ -64,19 +82,8 @@ class CaptureTest < Test::Unit::TestCase
     assert_equal expected_content_for_output, @response.body
   end
 
-  def test_update_element_with_capture
-    assert_deprecated 'update_element_function' do
-      get :update_element_with_capture
-    end
-    assert_equal(
-      "<script type=\"text/javascript\">\n//<![CDATA[\n$('products').innerHTML = '\\n  <p>Product 1</p>\\n  <p>Product 2</p>\\n';\n\n//]]>\n</script>" +
-        "\n\n$('status').innerHTML = '\\n  <b>You bought something!</b>\\n';",
-      @response.body.strip
-    )
-  end
-
   private
-  def expected_content_for_output
-    "<title>Putting stuff in the title!</title>\n\nGreat stuff!"
-  end
+    def expected_content_for_output
+      "<title>Putting stuff in the title!</title>\n\nGreat stuff!"
+    end
 end

data/test/controller/cgi_test.rb

@@ -1,381 +1,7 @@
 require File.dirname(__FILE__) + '/../abstract_unit'
 require 'action_controller/cgi_process'
-require 'action_controller/cgi_ext/cgi_ext'
-
-
-require 'stringio'
-
-class CGITest < Test::Unit::TestCase
-  def setup
-    @query_string = "action=create_customer&full_name=David%20Heinemeier%20Hansson&customerId=1"
-    @query_string_with_nil = "action=create_customer&full_name="
-    @query_string_with_array = "action=create_customer&selected[]=1&selected[]=2&selected[]=3"
-    @query_string_with_amps  = "action=create_customer&name=Don%27t+%26+Does"
-    @query_string_with_multiple_of_same_name = 
-      "action=update_order&full_name=Lau%20Taarnskov&products=4&products=2&products=3"
-    @query_string_with_many_equal = "action=create_customer&full_name=abc=def=ghi"
-    @query_string_without_equal = "action"
-    @query_string_with_many_ampersands =
-      "&action=create_customer&&&full_name=David%20Heinemeier%20Hansson"
-    @query_string_with_empty_key = "action=create_customer&full_name=David%20Heinemeier%20Hansson&=Save"
-  end
-
-  def test_query_string
-    assert_equal(
-      { "action" => "create_customer", "full_name" => "David Heinemeier Hansson", "customerId" => "1"},
-      CGIMethods.parse_query_parameters(@query_string)
-    )
-  end
-  
-  def test_deep_query_string
-    expected = {'x' => {'y' => {'z' => '10'}}}
-    assert_equal(expected, CGIMethods.parse_query_parameters('x[y][z]=10'))
-  end
-  
-  def test_deep_query_string_with_array
-    assert_equal({'x' => {'y' => {'z' => ['10']}}}, CGIMethods.parse_query_parameters('x[y][z][]=10'))
-    assert_equal({'x' => {'y' => {'z' => ['10', '5']}}}, CGIMethods.parse_query_parameters('x[y][z][]=10&x[y][z][]=5'))
-  end
-
-  def test_deep_query_string_with_array_of_hash
-    assert_equal({'x' => {'y' => [{'z' => '10'}]}}, CGIMethods.parse_query_parameters('x[y][][z]=10'))
-    assert_equal({'x' => {'y' => [{'z' => '10', 'w' => '10'}]}}, CGIMethods.parse_query_parameters('x[y][][z]=10&x[y][][w]=10'))
-  end
-
-  def test_deep_query_string_with_array_of_hashes_with_one_pair
-    assert_equal({'x' => {'y' => [{'z' => '10'}, {'z' => '20'}]}}, CGIMethods.parse_query_parameters('x[y][][z]=10&x[y][][z]=20'))
-    assert_equal("10", CGIMethods.parse_query_parameters('x[y][][z]=10&x[y][][z]=20')["x"]["y"].first["z"])
-    assert_equal("10", CGIMethods.parse_query_parameters('x[y][][z]=10&x[y][][z]=20').with_indifferent_access[:x][:y].first[:z])
-  end
-  
-  def test_request_hash_parsing
-    query = {
-      "note[viewers][viewer][][type]" => ["User", "Group"],
-      "note[viewers][viewer][][id]"   => ["1", "2"]
-    }
-
-    expected = { "note" => { "viewers"=>{"viewer"=>[{ "id"=>"1", "type"=>"User"}, {"type"=>"Group", "id"=>"2"} ]} } }
-
-    assert_equal(expected, CGIMethods.parse_request_parameters(query))
-  end
-  
-  def test_deep_query_string_with_array_of_hashes_with_multiple_pairs
-    assert_equal(
-      {'x' => {'y' => [{'z' => '10', 'w' => 'a'}, {'z' => '20', 'w' => 'b'}]}}, 
-      CGIMethods.parse_query_parameters('x[y][][z]=10&x[y][][w]=a&x[y][][z]=20&x[y][][w]=b')
-    )
-  end
-  
-  def test_query_string_with_nil
-    assert_equal(
-      { "action" => "create_customer", "full_name" => nil},
-      CGIMethods.parse_query_parameters(@query_string_with_nil)
-    )
-  end
-
-  def test_query_string_with_array
-    assert_equal(
-      { "action" => "create_customer", "selected" => ["1", "2", "3"]},
-      CGIMethods.parse_query_parameters(@query_string_with_array)
-    )
-  end
-
-  def test_query_string_with_amps
-    assert_equal(
-      { "action" => "create_customer", "name" => "Don't & Does"},
-      CGIMethods.parse_query_parameters(@query_string_with_amps)
-    )    
-  end
-  
-  def test_query_string_with_many_equal
-    assert_equal(
-      { "action" => "create_customer", "full_name" => "abc=def=ghi"},
-      CGIMethods.parse_query_parameters(@query_string_with_many_equal)
-    )    
-  end
-  
-  def test_query_string_without_equal
-    assert_equal(
-      { "action" => nil },
-      CGIMethods.parse_query_parameters(@query_string_without_equal)
-    )    
-  end
-  
-  def test_query_string_with_empty_key
-    assert_equal(
-      { "action" => "create_customer", "full_name" => "David Heinemeier Hansson" },
-      CGIMethods.parse_query_parameters(@query_string_with_empty_key)
-    )
-  end
-
-  def test_query_string_with_many_ampersands
-    assert_equal(
-      { "action" => "create_customer", "full_name" => "David Heinemeier Hansson"},
-      CGIMethods.parse_query_parameters(@query_string_with_many_ampersands)
-    )
-  end
-
-  def test_parse_params
-    input = {
-      "customers[boston][first][name]" => [ "David" ],
-      "customers[boston][first][url]" => [ "http://David" ],
-      "customers[boston][second][name]" => [ "Allan" ],
-      "customers[boston][second][url]" => [ "http://Allan" ],
-      "something_else" => [ "blah" ],
-      "something_nil" => [ nil ],
-      "something_empty" => [ "" ],
-      "products[first]" => [ "Apple Computer" ],
-      "products[second]" => [ "Pc" ],
-      "" => [ 'Save' ]
-    }
-    
-    expected_output =  {
-      "customers" => {
-        "boston" => {
-          "first" => {
-            "name" => "David",
-            "url" => "http://David"
-          },
-          "second" => {
-            "name" => "Allan",
-            "url" => "http://Allan"
-          }
-        }
-      },
-      "something_else" => "blah",
-      "something_empty" => "",
-      "something_nil" => "",
-      "products" => {
-        "first" => "Apple Computer",
-        "second" => "Pc"
-      }
-    }
-
-    assert_equal expected_output, CGIMethods.parse_request_parameters(input)
-  end
-  
-  def test_parse_params_from_multipart_upload
-    mockup = Struct.new(:content_type, :original_filename, :read, :rewind)
-    file = mockup.new('img/jpeg', 'foo.jpg')
-    ie_file = mockup.new('img/jpeg', 'c:\\Documents and Settings\\foo\\Desktop\\bar.jpg')
-    non_file_text_part = mockup.new('text/plain', '', 'abc')
-  
-    input = {
-      "something" => [ StringIO.new("") ],
-      "array_of_stringios" => [[ StringIO.new("One"), StringIO.new("Two") ]],
-      "mixed_types_array" => [[ StringIO.new("Three"), "NotStringIO" ]],
-      "mixed_types_as_checkboxes[strings][nested]" => [[ file, "String", StringIO.new("StringIO")]],
-      "ie_mixed_types_as_checkboxes[strings][nested]" => [[ ie_file, "String", StringIO.new("StringIO")]],
-      "products[string]" => [ StringIO.new("Apple Computer") ],
-      "products[file]" => [ file ],
-      "ie_products[string]" => [ StringIO.new("Microsoft") ],
-      "ie_products[file]" => [ ie_file ],
-      "text_part" => [non_file_text_part]
-    }
-
-    expected_output =  {
-      "something" => "",
-      "array_of_stringios" => ["One", "Two"],
-      "mixed_types_array" => [ "Three", "NotStringIO" ],
-      "mixed_types_as_checkboxes" => {
-         "strings" => {
-            "nested" => [ file, "String", "StringIO" ]
-         },
-      },
-      "ie_mixed_types_as_checkboxes" => {
-         "strings" => {
-            "nested" => [ ie_file, "String", "StringIO" ]
-         },
-      },
-      "products" => {
-        "string" => "Apple Computer",
-        "file" => file
-      },
-      "ie_products" => {
-        "string" => "Microsoft",
-        "file" => ie_file
-      },
-      "text_part" => "abc"
-    }
-
-    params = CGIMethods.parse_request_parameters(input)
-    assert_equal expected_output, params
-
-    # Lone filenames are preserved.
-    assert_equal 'foo.jpg', params['mixed_types_as_checkboxes']['strings']['nested'].first.original_filename
-    assert_equal 'foo.jpg', params['products']['file'].original_filename
-
-    # But full Windows paths are reduced to their basename.
-    assert_equal 'bar.jpg', params['ie_mixed_types_as_checkboxes']['strings']['nested'].first.original_filename
-    assert_equal 'bar.jpg', params['ie_products']['file'].original_filename
-  end
-  
-  def test_parse_params_with_file
-    input = {
-      "customers[boston][first][name]" => [ "David" ],
-      "something_else" => [ "blah" ],
-      "logo" => [ File.new(File.dirname(__FILE__) + "/cgi_test.rb").path ]
-    }
-    
-    expected_output = {
-      "customers" => {
-        "boston" => {
-          "first" => {
-            "name" => "David"
-          }
-        }
-      },
-      "something_else" => "blah",
-      "logo" => File.new(File.dirname(__FILE__) + "/cgi_test.rb").path,
-    }
-
-    assert_equal expected_output, CGIMethods.parse_request_parameters(input)
-  end
-
-  def test_parse_params_with_array
-    input = { "selected[]" =>  [ "1", "2", "3" ] }
-
-    expected_output = { "selected" => [ "1", "2", "3" ] }
-
-    assert_equal expected_output, CGIMethods.parse_request_parameters(input)
-  end
-
-  def test_parse_params_with_non_alphanumeric_name
-    input     = { "a/b[c]" =>  %w(d) }
-    expected  = { "a/b" => { "c" => "d" }}
-    assert_equal expected, CGIMethods.parse_request_parameters(input)
-  end
-
-  def test_parse_params_with_single_brackets_in_middle
-    input     = { "a/b[c]d" =>  %w(e) }
-    expected  = { "a/b" => {} }
-    assert_equal expected, CGIMethods.parse_request_parameters(input)
-  end
-
-  def test_parse_params_with_separated_brackets
-    input     = { "a/b@[c]d[e]" =>  %w(f) }
-    expected  = { "a/b@" => { }}
-    assert_equal expected, CGIMethods.parse_request_parameters(input)
-  end
-
-  def test_parse_params_with_separated_brackets_and_array
-    input     = { "a/b@[c]d[e][]" =>  %w(f) }
-    expected  = { "a/b@" => { }}
-    assert_equal expected , CGIMethods.parse_request_parameters(input)
-  end
-
-  def test_parse_params_with_unmatched_brackets_and_array
-    input     = { "a/b@[c][d[e][]" =>  %w(f) }
-    expected  = { "a/b@" => { "c" => { }}}
-    assert_equal expected, CGIMethods.parse_request_parameters(input)
-  end
-  
-  def test_parse_params_with_nil_key
-    input = { nil => nil, "test2" => %w(value1) }
-    expected = { "test2" => "value1" }
-    assert_equal expected, CGIMethods.parse_request_parameters(input)
-  end
-end
-
-
-class MultipartCGITest < Test::Unit::TestCase
-  FIXTURE_PATH = File.dirname(__FILE__) + '/../fixtures/multipart'
 
-  def setup
-    ENV['REQUEST_METHOD'] = 'POST'
-    ENV['CONTENT_LENGTH'] = '0'
-    ENV['CONTENT_TYPE']   = 'multipart/form-data, boundary=AaB03x'
-  end
-
-  def test_single_parameter
-    params = process('single_parameter')
-    assert_equal({ 'foo' => 'bar' }, params)
-  end
-
-  def test_text_file
-    params = process('text_file')
-    assert_equal %w(file foo), params.keys.sort
-    assert_equal 'bar', params['foo']
-
-    file = params['file']
-    assert_kind_of StringIO, file
-    assert_equal 'file.txt', file.original_filename
-    assert_equal "text/plain\r", file.content_type
-    assert_equal 'contents', file.read
-  end
-
-  def test_large_text_file
-    params = process('large_text_file')
-    assert_equal %w(file foo), params.keys.sort
-    assert_equal 'bar', params['foo']
-
-    file = params['file']
-    assert_kind_of Tempfile, file
-    assert_equal 'file.txt', file.original_filename
-    assert_equal "text/plain\r", file.content_type
-    assert ('a' * 20480) == file.read
-  end
-
-  def test_binary_file
-    params = process('binary_file')
-    assert_equal %w(file flowers foo), params.keys.sort
-    assert_equal 'bar', params['foo']
-
-    file = params['file']
-    assert_kind_of StringIO, file
-    assert_equal 'file.txt', file.original_filename
-    assert_equal "text/plain\r", file.content_type
-    assert_equal 'contents', file.read
-
-    file = params['flowers']
-    assert_kind_of StringIO, file
-    assert_equal 'flowers.jpg', file.original_filename
-    assert_equal "image/jpeg\r", file.content_type
-    assert_equal 19512, file.size
-    #assert_equal File.read(File.dirname(__FILE__) + '/../../../activerecord/test/fixtures/flowers.jpg'), file.read
-  end
-
-  def test_mixed_files
-    params = process('mixed_files')
-    assert_equal %w(files foo), params.keys.sort
-    assert_equal 'bar', params['foo']
-
-    # Ruby CGI doesn't handle multipart/mixed for us.
-    assert_kind_of String, params['files']
-    assert_equal 19756, params['files'].size
-  end
-
-  # Rewind readable cgi params so others may reread them (such as CGI::Session
-  # when passing the session id in a multipart form).
-  def test_multipart_param_rewound
-    params = process('text_file')
-    assert_equal 'bar', @cgi.params['foo'][0].read
-  end
-
-  private
-    def process(name)
-      old_stdin = $stdin
-      File.open(File.join(FIXTURE_PATH, name), 'rb') do |file|
-        ENV['CONTENT_LENGTH'] = file.stat.size.to_s
-        $stdin = file
-        @cgi = CGI.new
-        CGIMethods.parse_request_parameters @cgi.params
-      end
-    ensure
-      $stdin = old_stdin
-    end
-end
-
-# Ensures that PUT works with multipart as well as POST.
-class PutMultipartCGITest < MultipartCGITest
-  def setup
-    super
-    ENV['REQUEST_METHOD'] = 'PUT'
-  end
-end
-
-
-class CGIRequestTest < Test::Unit::TestCase
+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"}
     # cookie as returned by some Nokia phone browsers (no space after semicolon separator)
@@ -383,20 +9,25 @@ class CGIRequestTest < Test::Unit::TestCase
     @fake_cgi = Struct.new(:env_table).new(@request_hash)
     @request = ActionController::CgiRequest.new(@fake_cgi)
   end
-  
+
+  def default_test; end
+end
+
+
+class CgiRequestTest < BaseCgiTest
   def test_proxy_request
     assert_equal 'glu.ttono.us', @request.host_with_port
   end
-  
+
   def test_http_host
     @request_hash.delete "HTTP_X_FORWARDED_HOST"
     @request_hash['HTTP_HOST'] = "rubyonrails.org:8080"
     assert_equal "rubyonrails.org:8080", @request.host_with_port
-    
+
     @request_hash['HTTP_X_FORWARDED_HOST'] = "www.firsthost.org, www.secondhost.org"
     assert_equal "www.secondhost.org", @request.host
   end
-  
+
   def test_http_host_with_default_port_overrides_server_port
     @request_hash.delete "HTTP_X_FORWARDED_HOST"
     @request_hash['HTTP_HOST'] = "rubyonrails.org"
@@ -416,25 +47,69 @@ class CGIRequestTest < Test::Unit::TestCase
     assert_equal "207.7.108.53:8007", @request.host_with_port
   end
 
+  def test_host_with_port_if_http_standard_port_is_specified
+    @request_hash['HTTP_X_FORWARDED_HOST'] = "glu.ttono.us:80"
+    assert_equal "glu.ttono.us", @request.host_with_port
+  end
+
+  def test_host_with_port_if_https_standard_port_is_specified
+    @request_hash['HTTP_X_FORWARDED_PROTO'] = "https"
+    @request_hash['HTTP_X_FORWARDED_HOST'] = "glu.ttono.us:443"
+    assert_equal "glu.ttono.us", @request.host_with_port
+  end
+
+  def test_host_if_ipv6_reference
+    @request_hash.delete "HTTP_X_FORWARDED_HOST"
+    @request_hash['HTTP_HOST'] = "[2001:1234:5678:9abc:def0::dead:beef]"
+    assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host
+  end
+
+  def test_host_if_ipv6_reference_with_port
+    @request_hash.delete "HTTP_X_FORWARDED_HOST"
+    @request_hash['HTTP_HOST'] = "[2001:1234:5678:9abc:def0::dead:beef]:8008"
+    assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host
+  end
+
   def test_cookie_syntax_resilience
     cookies = CGI::Cookie::parse(@request_hash["HTTP_COOKIE"]);
     assert_equal ["c84ace84796670c052c6ceb2451fb0f2"], cookies["_session_id"]
     assert_equal ["yes"], cookies["is_admin"]
-    
+
     alt_cookies = CGI::Cookie::parse(@alt_cookie_fmt_request_hash["HTTP_COOKIE"]);
     assert_equal ["c84ace84796670c052c6ceb2451fb0f2"], alt_cookies["_session_id"]
     assert_equal ["yes"], alt_cookies["is_admin"]
   end
-  
-  def test_unbalanced_query_string_with_array
-   assert_equal(
-     {'location' => ["1", "2"], 'age_group' => ["2"]},
-  CGIMethods.parse_query_parameters("location[]=1&location[]=2&age_group[]=2")
-   )
-   assert_equal(
-     {'location' => ["1", "2"], 'age_group' => ["2"]},
-     CGIMethods.parse_request_parameters({'location[]' => ["1", "2"],
-  'age_group[]' => ["2"]})
-   )
+end
+
+
+class CgiRequestParamsParsingTest < BaseCgiTest
+  def test_doesnt_break_when_content_type_has_charset
+    data = 'flamenco=love'
+    @request.env['CONTENT_LENGTH'] = data.length
+    @request.env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
+    @request.env['RAW_POST_DATA'] = data
+    assert_equal({"flamenco"=> "love"}, @request.request_parameters)
+  end
+
+  def test_doesnt_interpret_request_uri_as_query_string_when_missing
+    @request.env['REQUEST_URI'] = 'foo'
+    assert_equal({}, @request.query_parameters)
+  end
+end
+
+
+class CgiRequestNeedsRewoundTest < BaseCgiTest
+  def test_body_should_be_rewound
+    data = 'foo'
+    fake_cgi = Struct.new(:env_table, :query_string, :stdinput).new(@request_hash, '', StringIO.new(data))
+    fake_cgi.env_table['CONTENT_LENGTH'] = data.length
+    fake_cgi.env_table['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
+
+    # Read the request body by parsing params.
+    request = ActionController::CgiRequest.new(fake_cgi)
+    request.request_parameters
+
+    # Should have rewound the body.
+    assert_equal 0, request.body.pos
   end
 end