actionpack 1.12.5 → 1.13.0

data/test/controller/base_test.rb

@@ -12,6 +12,7 @@ module Submodule
     
     hide_action :hidden_action
     def hidden_action
+      raise "Noooo!"
     end
     
     def another_hidden_action
@@ -23,7 +24,6 @@ module Submodule
   end
 end
 class EmptyController < ActionController::Base
-  include ActionController::Caching
 end
 class NonEmptyController < ActionController::Base
   def public_action
@@ -34,10 +34,27 @@ class NonEmptyController < ActionController::Base
   end
 end
 
+class MethodMissingController < ActionController::Base
+  
+  hide_action :shouldnt_be_called
+  def shouldnt_be_called
+    raise "NO WAY!"
+  end
+  
+protected
+  
+  def method_missing(selector)
+    render :text => selector.to_s
+  end
+  
+end
+
 class ControllerClassTests < Test::Unit::TestCase
   def test_controller_path
     assert_equal 'empty', EmptyController.controller_path
+    assert_equal EmptyController.controller_path, EmptyController.new.controller_path
     assert_equal 'submodule/contained_empty', Submodule::ContainedEmptyController.controller_path
+    assert_equal Submodule::ContainedEmptyController.controller_path, Submodule::ContainedEmptyController.new.controller_path
   end
   def test_controller_name
     assert_equal 'empty', EmptyController.controller_name
@@ -57,10 +74,63 @@ class ControllerInstanceTests < Test::Unit::TestCase
 
   def test_action_methods
     @empty_controllers.each do |c|
-      assert_equal Set.new, c.send(:action_methods), "#{c.class.controller_path} should be empty!"
+      hide_mocha_methods_from_controller(c)
+      assert_equal Set.new, c.send(:action_methods), "#{c.controller_path} should be empty!"
     end
     @non_empty_controllers.each do |c|
-      assert_equal Set.new('public_action'), c.send(:action_methods), "#{c.class.controller_path} should not be empty!"
+      hide_mocha_methods_from_controller(c)
+      assert_equal Set.new('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]
+    controller.class.send(:hide_action, *mocha_methods)
+  end
+  
 end
+
+
+class PerformActionTest < Test::Unit::TestCase
+  def use_controller(controller_class)
+    @controller = controller_class.new
+
+    # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
+    # a more accurate simulation of what happens in "real life".
+    @controller.logger = Logger.new(nil)
+
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @request.host = "www.nextangle.com"
+  end
+  
+  def test_get_on_priv_should_show_selector
+    use_controller MethodMissingController
+    get :shouldnt_be_called
+    assert_response :success
+    assert_equal 'shouldnt_be_called', @response.body
+  end
+  
+  def test_method_missing_is_not_an_action_name
+    use_controller MethodMissingController
+    assert ! @controller.send(:action_methods).include?('method_missing')
+    
+    get :method_missing
+    assert_response :success
+    assert_equal 'method_missing', @response.body
+  end
+  
+  def test_get_on_hidden_should_fail
+    use_controller NonEmptyController
+    get :hidden_action
+    assert_response 404
+    
+    get :another_hidden_action
+    assert_response 404
+  end
+end

data/test/controller/caching_test.rb

@@ -0,0 +1,228 @@
+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
+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
+
+class PageCachingTestController < ActionController::Base
+  caches_page :ok, :no_content, :found, :not_found
+
+  def ok
+    head :ok
+  end
+
+  def no_content
+    head :no_content
+  end
+
+  def found
+    redirect_to :action => 'ok'
+  end
+
+  def not_found
+    head :not_found
+  end
+end
+
+class PageCachingTest < Test::Unit::TestCase
+  def setup
+    ActionController::Routing::Routes.draw do |map|
+      map.main '', :controller => 'posts'
+      map.resources :posts
+      map.connect ':controller/:action/:id'
+    end
+
+    @request = ActionController::TestRequest.new
+    @request.host = 'hostname.com'
+
+    @response   = ActionController::TestResponse.new
+    @controller = PageCachingTestController.new
+
+    @params = {:controller => 'posts', :action => 'index', :only_path => true, :skip_relative_url_root => true}
+    @rewriter = ActionController::UrlRewriter.new(@request, @params)
+
+    FileUtils.rm_rf(File.dirname(FILE_STORE_PATH))
+    FileUtils.mkdir_p(FILE_STORE_PATH)
+  end
+
+  def teardown
+    FileUtils.rm_rf(File.dirname(FILE_STORE_PATH))
+  end
+
+  def test_page_caching_resources_saves_to_correct_path_with_extension_even_if_default_route
+    @params[:format] = 'rss'
+    assert_equal '/posts.rss', @rewriter.rewrite(@params)
+    @params[:format] = nil
+    assert_equal '/', @rewriter.rewrite(@params)
+  end
+
+  def test_should_cache_get_with_ok_status
+    get :ok
+    assert_response :ok
+    assert_page_cached :ok, "get with ok status should have been cached"
+  end
+
+  [:ok, :no_content, :found, :not_found].each do |status|
+    [:get, :post, :put, :delete].each do |method|
+      unless method == :get and status == :ok
+        define_method "test_shouldnt_cache_#{method}_with_#{status}_status" do
+          @request.env['REQUEST_METHOD'] = method.to_s.upcase
+          process status
+          assert_response status
+          assert_page_not_cached status, "#{method} with #{status} status shouldn't have been cached"
+        end
+      end
+    end
+  end
+
+  private
+    def assert_page_cached(action, message = "#{action} should have been cached")
+      assert page_cached?(action), message
+    end
+
+    def assert_page_not_cached(action, message = "#{action} shouldn't have been cached")
+      assert !page_cached?(action), message
+    end
+
+    def page_cached?(action)
+      File.exist? "#{FILE_STORE_PATH}/page_caching_test/#{action}.html"
+    end
+end
+
+class ActionCachingTestController < ActionController::Base
+  caches_action :index
+
+  def index
+    @cache_this = Time.now.to_f.to_s
+    render :text => @cache_this
+  end
+
+  def expire
+    expire_action :controller => 'action_caching_test', :action => 'index'
+    render :nothing => true
+  end
+
+end
+
+class ActionCachingMockController
+  attr_accessor :mock_url_for
+  attr_accessor :mock_path
+
+  def initialize
+    yield self if block_given?
+  end
+
+  def url_for(*args)
+    @mock_url_for
+  end
+
+  def request
+    mocked_path = @mock_path
+    Object.new.instance_eval(<<-EVAL)
+      def path; '#{@mock_path}' end
+      self
+    EVAL
+  end
+end
+
+class ActionCacheTest < Test::Unit::TestCase
+  def setup
+    reset!
+    FileUtils.mkdir_p(FILE_STORE_PATH)
+    @path_class = ActionController::Caching::Actions::ActionCachePath
+    @mock_controller = ActionCachingMockController.new
+  end
+
+  def teardown
+    FileUtils.rm_rf(File.dirname(FILE_STORE_PATH))
+  end
+
+  def test_simple_action_cache
+    get :index
+    cached_time = content_to_cache
+    assert_equal cached_time, @response.body
+    reset!
+
+    get :index
+    assert_equal cached_time, @response.body
+  end
+
+  def test_cache_expiration
+    get :index
+    cached_time = content_to_cache
+    reset!
+
+    get :index
+    assert_equal cached_time, @response.body
+    reset!
+
+    get :expire
+    reset!
+
+    get :index
+    new_cached_time = content_to_cache
+    assert_not_equal cached_time, @response.body
+    reset!
+
+    get :index
+    assert_response :success
+    assert_equal new_cached_time, @response.body
+  end
+
+  def test_cache_is_scoped_by_subdomain
+    @request.host = 'jamis.hostname.com'
+    get :index
+    jamis_cache = content_to_cache
+
+    @request.host = 'david.hostname.com'
+    get :index
+    david_cache = content_to_cache
+    assert_not_equal jamis_cache, @response.body
+
+    @request.host = 'jamis.hostname.com'
+    get :index
+    assert_equal jamis_cache, @response.body
+
+    @request.host = 'david.hostname.com'
+    get :index
+    assert_equal david_cache, @response.body
+  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'
+    path_object = @path_class.new(@mock_controller)
+    assert_equal 'xml', path_object.extension
+    assert_equal 'example.org/posts/index.xml', path_object.path
+  end
+
+  def test_empty_path_is_normalized
+    @mock_controller.mock_url_for = 'http://example.org/'
+    @mock_controller.mock_path    = '/'
+
+    assert_equal 'example.org/index', @path_class.path_for(@mock_controller)
+  end
+
+  def test_file_extensions
+    get :index, :id => 'kitten.jpg'
+    get :index, :id => 'kitten.jpg'
+
+    assert_response :success
+  end
+
+  private
+    def content_to_cache
+      assigns(:cache_this)
+    end
+
+    def reset!
+      @request    = ActionController::TestRequest.new
+      @response   = ActionController::TestResponse.new
+      @controller = ActionCachingTestController.new
+      @request.host = 'hostname.com'
+    end
+end

data/test/controller/capture_test.rb

@@ -7,15 +7,15 @@ class CaptureController < ActionController::Base
   def content_for
     render :layout => "talk_from_action"
   end
-  
+
   def erb_content_for
     render :layout => "talk_from_action"
   end
-  
+
   def block_content_for
     render :layout => "talk_from_action"
   end
-  
+
   def non_erb_block_content_for
     render :layout => "talk_from_action"
   end
@@ -43,36 +43,38 @@ class CaptureTest < Test::Unit::TestCase
     get :capturing
     assert_equal "Dreamy days", @response.body.strip
   end
-  
+
   def test_content_for
     get :content_for
     assert_equal expected_content_for_output, @response.body
   end
-  
+
   def test_erb_content_for
     get :content_for
     assert_equal expected_content_for_output, @response.body
   end
-  
+
   def test_block_content_for
     get :block_content_for
     assert_equal expected_content_for_output, @response.body
   end
-  
+
   def test_non_erb_block_content_for
     get :non_erb_block_content_for
     assert_equal expected_content_for_output, @response.body
   end
 
   def test_update_element_with_capture
-    get :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';", 
+        "\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!"

data/test/controller/cgi_test.rb

@@ -17,6 +17,7 @@ class CGITest < Test::Unit::TestCase
     @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
@@ -27,13 +28,43 @@ class CGITest < Test::Unit::TestCase
   end
   
   def test_deep_query_string
-    assert_equal({'x' => {'y' => {'z' => '10'}}}, CGIMethods.parse_query_parameters('x[y][z]=10'))
+    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(
@@ -69,6 +100,13 @@ class CGITest < Test::Unit::TestCase
       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(
@@ -87,7 +125,8 @@ class CGITest < Test::Unit::TestCase
       "something_nil" => [ nil ],
       "something_empty" => [ "" ],
       "products[first]" => [ "Apple Computer" ],
-      "products[second]" => [ "Pc" ]
+      "products[second]" => [ "Pc" ],
+      "" => [ 'Save' ]
     }
     
     expected_output =  {
@@ -116,9 +155,10 @@ class CGITest < Test::Unit::TestCase
   end
   
   def test_parse_params_from_multipart_upload
-    mockup = Struct.new(:content_type, :original_filename)
+    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("") ],
@@ -129,9 +169,10 @@ class CGITest < Test::Unit::TestCase
       "products[string]" => [ StringIO.new("Apple Computer") ],
       "products[file]" => [ file ],
       "ie_products[string]" => [ StringIO.new("Microsoft") ],
-      "ie_products[file]" => [ ie_file ]
+      "ie_products[file]" => [ ie_file ],
+      "text_part" => [non_file_text_part]
     }
-    
+
     expected_output =  {
       "something" => "",
       "array_of_stringios" => ["One", "Two"],
@@ -153,7 +194,8 @@ class CGITest < Test::Unit::TestCase
       "ie_products" => {
         "string" => "Microsoft",
         "file" => ie_file
-      }
+      },
+      "text_part" => "abc"
     }
 
     params = CGIMethods.parse_request_parameters(input)
@@ -206,29 +248,36 @@ class CGITest < Test::Unit::TestCase
 
   def test_parse_params_with_single_brackets_in_middle
     input     = { "a/b[c]d" =>  %w(e) }
-    expected  = { "a/b[c]d" => "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@" => { "c]d[e" => "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@" => { "c]d[e" => ["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" => { "d[e" => ["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'
 
@@ -292,23 +341,39 @@ class MultipartCGITest < Test::Unit::TestCase
     assert_equal 'bar', params['foo']
 
     # Ruby CGI doesn't handle multipart/mixed for us.
-    assert_kind_of StringIO, params['files']
+    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
-        CGIMethods.parse_request_parameters CGI.new.params
+        @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
   def setup
@@ -360,4 +425,16 @@ class CGIRequestTest < Test::Unit::TestCase
     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
 end