actionpack 1.9.1 → 1.10.1

data/test/controller/active_record_store_test.rb

@@ -53,6 +53,7 @@ module CommonActiveRecordStoreTests
       @new_session.close
     end
   end
+
 end
 
 class ActiveRecordStoreTest < Test::Unit::TestCase
@@ -77,6 +78,28 @@ class ActiveRecordStoreTest < Test::Unit::TestCase
   end
 end
 
+class ColumnLimitTest < Test::Unit::TestCase
+
+  def setup
+    @session_class = CGI::Session::ActiveRecordStore::Session
+    @session_class.create_table!
+  end
+
+  def teardown
+    @session_class.drop_table!
+  end
+
+  def test_protection_from_data_larger_than_column
+    # Can't test this unless there is a limit
+    return unless limit = @session_class.data_column_size_limit
+    too_big = ':(' * limit
+    s = @session_class.new(:session_id => '666', :data => {'foo' => too_big})
+    s.data
+    assert_raises(ActionController::SessionOverflowError) { s.save }
+  end
+
+end
+
 
 class DeprecatedActiveRecordStoreTest < ActiveRecordStoreTest
   def setup
@@ -94,7 +117,6 @@ class DeprecatedActiveRecordStoreTest < ActiveRecordStoreTest
   def teardown
     session_class.connection.execute 'drop table old_sessions'
     session_class.table_name = 'sessions'
-    session_class.send :setup_sessid_compatibility!
   end
 end
 

data/test/controller/addresses_render_test.rb

@@ -9,6 +9,10 @@ class Address
   def Address.find_all(arg1, arg2, arg3, arg4)
     []
   end
+  
+  def self.find(*args)
+    []
+  end
 end
 
 class AddressesTestController < ActionController::Base

data/test/controller/{base_tests.rb → base_test.rb}

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/../abstract_unit'
 require 'test/unit'
+require 'pp' # require 'pp' early to prevent hidden_methods from not picking up the pretty-print methods until too late
 
 # This file currently contains a few controller UTs
 # I couldn't find where the current base tests are, so I created this file.
@@ -63,10 +64,10 @@ class ControllerInstanceTests < Test::Unit::TestCase
     
     @non_empty_controllers = [Controllers::NonEmptyController.new,
                               Controllers::Submodule::ContainedNonEmptyController.new]
-  
   end
+
   def test_action_methods
-    @empty_controllers.each {|c| assert_equal [], c.send(:action_methods), "#{c.class.controller_path} should be empty!"}
-    @non_empty_controllers.each {|c| assert_equal ["public_action"], c.send(:action_methods), "#{c.class.controller_path} should not be empty!"}
+    @empty_controllers.each {|c| assert_equal({}, c.send(:action_methods), "#{c.class.controller_path} should be empty!")}
+    @non_empty_controllers.each {|c| assert_equal({"public_action"=>true}, c.send(:action_methods), "#{c.class.controller_path} should not be empty!")}
   end
 end

data/test/controller/benchmark_test.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+require 'test/unit'
+
+# Provide a static version of the Controllers module instead of the auto-loading version.
+# We don't want these tests to fail when dependencies are to blame.
+module Controllers
+  class BenchmarkedController < ActionController::Base
+    def public_action
+      render :nothing => true
+    end
+
+    def rescue_action(e)
+      raise e
+    end
+  end
+end
+
+class BenchmarkTest < Test::Unit::TestCase
+  class MockLogger
+    def method_missing(*args)
+    end
+  end
+
+  def setup
+    @controller = Controllers::BenchmarkedController.new
+    # benchmark doesn't do anything unless a logger is set
+    @controller.logger = MockLogger.new
+    @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
+    @request.host = "test.actioncontroller.i"
+  end
+
+  def test_with_http_1_0_request
+    @request.host = nil
+    assert_nothing_raised { get :public_action }
+  end
+end

data/test/controller/caching_filestore.rb

@@ -1,16 +1,15 @@
 require 'fileutils'
 require File.dirname(__FILE__) + '/../abstract_unit'
 
-#generate the greatest logging class that ever lived
 class TestLogDevice < Logger::LogDevice
   attr :last_message, true
   
   def initialize
-      @last_message=String.new
+    @last_message=String.new
   end
   
   def write(message)
-      @last_message << message
+    @last_message << message
   end
 
   def clear
@@ -23,14 +22,13 @@ TestLog = TestLogDevice.new
 RAILS_DEFAULT_LOGGER = Logger.new(TestLog)
 ActionController::Base.logger = RAILS_DEFAULT_LOGGER
 
-#generate a random key to ensure the cache is always in a different location
-RANDOM_KEY = rand(99999999).to_s
-FILE_STORE_PATH = File.dirname(__FILE__) + '/../temp/' + RANDOM_KEY
-ActionController::Base.perform_caching = true
-ActionController::Base.fragment_cache_store = ActionController::Caching::Fragments::FileStore.new(FILE_STORE_PATH)
-
-#setup the routing information...not sure if this does anything
-ActionController::Routing::Routes.connect "test", :controller => 'test', :action => 'render_to_cache'
+def use_store
+  #generate a random key to ensure the cache is always in a different location
+  RANDOM_KEY = rand(99999999).to_s
+  FILE_STORE_PATH = File.dirname(__FILE__) + '/../temp/' + RANDOM_KEY
+  ActionController::Base.perform_caching = true
+  ActionController::Base.fragment_cache_store = :file_store, FILE_STORE_PATH
+end
 
 class TestController < ActionController::Base
   caches_action :render_to_cache, :index
@@ -45,48 +43,32 @@ class FileStoreTest < Test::Unit::TestCase
   def setup
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    @controller = TestController.new
     @request.host = "hostname.com"
   end
-
-  #To prime the cache with hostname.com/test
-  def test_render_to_cache_prime_a
-    @request.path_parameters = {:controller => "test"}
-    assert_fragment_cached do process_request end
-  end
-
-  #To prime the cache with hostname.com/test/render_to_cache
-  def test_render_to_cache_prime_b
-    @request.path_parameters = {:action => "render_to_cache", :controller => "test"}
-    assert_fragment_cached do process_request end
+  
+  def teardown
+    FileUtils.rm_rf(FILE_STORE_PATH)
   end
 
-  #To hit the cache with hostname.com/test 
-  def test_render_to_cache_zhit_a
-    @request.path_parameters = {:controller => "test"}
-    assert_fragment_hit do process_request end
+  def test_render_cached
+    assert_fragment_cached { get :render_to_cache }
+    assert_fragment_hit { get :render_to_cache }
   end
 
-  #To hit the cache with hostname.com/test/render_to_cache
-  def test_render_to_cache_zhit_b
-    @request.path_parameters = {:action => "render_to_cache", :controller => "test"}
-    assert_fragment_hit do process_request end
-  end
 
   private
-    def process_request
-      TestController.process(@request, @response)
-    end
-    
-    def assert_fragment_cached(&proc)
-      proc.call
+    def assert_fragment_cached
+      yield
       assert(TestLog.last_message.include?("Cached fragment:"), "--ERROR-- FileStore write failed ----")
       assert(!TestLog.last_message.include?("Couldn't create cache directory:"), "--ERROR-- FileStore create directory failed ----")
       TestLog.clear
     end
     
-    def assert_fragment_hit(&proc)
-      proc.call
-      assert(TestLog.last_message.include?( "Fragment hit:"), "--ERROR-- Fragment not found in FileStore ----")
+    def assert_fragment_hit
+      yield
+      assert(TestLog.last_message.include?("Fragment read:"), "--ERROR-- Fragment not found in FileStore ----")
+      assert(!TestLog.last_message.include?("Cached fragment:"), "--ERROR-- Did cache ----")
       TestLog.clear
     end
 end

data/test/controller/capture_test.rb

@@ -4,6 +4,10 @@ class CaptureController < ActionController::Base
   def self.controller_name; "test"; end
   def self.controller_path; "test"; end
 
+  def content_for
+    render :layout => "talk_from_action"
+  end
+
   def rescue_action(e) raise end
 end
 
@@ -27,11 +31,16 @@ class CaptureTest < Test::Unit::TestCase
     get :capturing
     assert_equal "Dreamy days", @response.body.strip
   end
+  
+  def test_content_for
+    get :content_for
+    assert_equal "<title>Putting stuff in the title!</title>\n\nGreat stuff!", @response.body
+  end
 
   def test_update_element_with_capture
     get :update_element_with_capture
     assert_equal(
-      "<script type=\"text/javascript\">$('products').innerHTML = '\\n  <p>Product 1</p>\\n  <p>Product 2</p>\\n';\n</script>" +
+      "<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
     )

data/test/controller/cgi_test.rb

@@ -1,18 +1,9 @@
-$:.unshift File.dirname(__FILE__) + "/../../lib"
+require File.dirname(__FILE__) + '/../abstract_unit'
+require 'action_controller/cgi_process'
+require 'action_controller/cgi_ext/cgi_ext'
 
-require 'test/unit'
-require 'action_controller/cgi_ext/cgi_methods'
-require 'stringio'
-
-class MockUploadedFile < StringIO
-  def content_type
-    "img/jpeg"
-  end
 
-  def original_filename
-    "my_file.doc"
-  end
-end
+require 'stringio'
 
 class CGITest < Test::Unit::TestCase
   def setup
@@ -24,6 +15,8 @@ class CGITest < Test::Unit::TestCase
       "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"
   end
 
   def test_query_string
@@ -76,7 +69,14 @@ class CGITest < Test::Unit::TestCase
       CGIMethods.parse_query_parameters(@query_string_without_equal)
     )    
   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" ],
@@ -116,15 +116,20 @@ class CGITest < Test::Unit::TestCase
   end
   
   def test_parse_params_from_multipart_upload
-    mock_file = MockUploadedFile.new
+    mockup = Struct.new(:content_type, :original_filename)
+    file = mockup.new('img/jpeg', 'foo.jpg')
+    ie_file = mockup.new('img/jpeg', 'c:\\Documents and Settings\\foo\\Desktop\\bar.jpg')
   
     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]" => [[ mock_file, "String", StringIO.new("StringIO")]],
+      "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]" => [ mock_file ]
+      "products[file]" => [ file ],
+      "ie_products[string]" => [ StringIO.new("Microsoft") ],
+      "ie_products[file]" => [ ie_file ]
     }
     
     expected_output =  {
@@ -132,17 +137,35 @@ class CGITest < Test::Unit::TestCase
       "array_of_stringios" => ["One", "Two"],
       "mixed_types_array" => [ "Three", "NotStringIO" ],
       "mixed_types_as_checkboxes" => {
-         "strings"=> {
-            "nested"=>[ mock_file, "String", "StringIO" ]
+         "strings" => {
+            "nested" => [ file, "String", "StringIO" ]
          },
       },
-      "products"  => {
-        "string"  => "Apple Computer",
-        "file"    => mock_file
+      "ie_mixed_types_as_checkboxes" => {
+         "strings" => {
+            "nested" => [ ie_file, "String", "StringIO" ]
+         },
+      },
+      "products" => {
+        "string" => "Apple Computer",
+        "file" => file
+      },
+      "ie_products" => {
+        "string" => "Microsoft",
+        "file" => ie_file
       }
     }
 
-    assert_equal expected_output, CGIMethods.parse_request_parameters(input)
+    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
@@ -206,3 +229,102 @@ class CGITest < Test::Unit::TestCase
   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 StringIO, params['files']
+    assert_equal 19756, params['files'].size
+  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
+        CGIMethods.parse_request_parameters CGI.new.params
+      end
+    ensure
+      $stdin = old_stdin
+    end
+end
+
+
+class CGIRequestTest < 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"}
+    @fake_cgi = Struct.new(:env_table).new(@request_hash)
+    @request = ActionController::CgiRequest.new(@fake_cgi)
+  end
+  
+  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
+  end
+  
+end