actionpack 2.2.3 → 2.3.2

data/lib/action_controller/session/drb_server.rb

@@ -1,32 +0,0 @@
-#!/usr/bin/env ruby
-
-# This is a really simple session storage daemon, basically just a hash,
-# which is enabled for DRb access.
-
-require 'drb'
-
-session_hash = Hash.new
-session_hash.instance_eval { @mutex = Mutex.new }
-
-class <<session_hash
-  def []=(key, value)
-    @mutex.synchronize do
-      super(key, value)
-    end
-  end
-
-  def [](key)
-    @mutex.synchronize do
-      super(key)
-    end
-  end
-
-  def delete(key)
-    @mutex.synchronize do
-      super(key)
-    end
-  end
-end
-
-DRb.start_service('druby://127.0.0.1:9192', session_hash)
-DRb.thread.join

data/lib/action_controller/session/drb_store.rb

@@ -1,35 +0,0 @@
-require 'cgi'
-require 'cgi/session'
-require 'drb'
- 
-class CGI #:nodoc:all
-  class Session
-    class DRbStore
-      @@session_data = DRbObject.new(nil, 'druby://localhost:9192')
- 
-      def initialize(session, option=nil)
-        @session_id = session.session_id
-      end
- 
-      def restore
-        @h = @@session_data[@session_id] || {}
-      end
- 
-      def update
-        @@session_data[@session_id] = @h
-      end
- 
-      def close
-        update
-      end
- 
-      def delete
-        @@session_data.delete(@session_id)
-      end
-      
-      def data
-        @@session_data[@session_id]
-      end
-    end
-  end
-end

data/test/controller/cgi_test.rb

@@ -1,269 +0,0 @@
-require 'abstract_unit'
-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",
-      "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"}
-    @cgi = CGI.new
-    class << @cgi; attr_accessor :env_table end
-    @cgi.env_table = @request_hash
-    @request = ActionController::CgiRequest.new(@cgi)
-  end
-
-  def default_test; end
-
-  private
-
-  def set_content_data(data)
-    @request.env['REQUEST_METHOD'] = 'POST'
-    @request.env['CONTENT_LENGTH'] = data.length
-    @request.env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
-    @request.env['RAW_POST_DATA'] = data
-  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(true)
-  end
-
-  def test_http_host_with_default_port_overrides_server_port
-    @request_hash.delete "HTTP_X_FORWARDED_HOST"
-    @request_hash['HTTP_HOST'] = "rubyonrails.org"
-    assert_equal "rubyonrails.org", @request.host_with_port
-  end
-
-  def test_host_with_port_defaults_to_server_name_if_no_host_headers
-    @request_hash.delete "HTTP_X_FORWARDED_HOST"
-    @request_hash.delete "HTTP_HOST"
-    assert_equal "glu.ttono.us:8007", @request.host_with_port
-  end
-
-  def test_host_with_port_falls_back_to_server_addr_if_necessary
-    @request_hash.delete "HTTP_X_FORWARDED_HOST"
-    @request_hash.delete "HTTP_HOST"
-    @request_hash.delete "SERVER_NAME"
-    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_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
-    assert_equal ["yes"], cookies["is_admin"], cookies.inspect
-
-    alt_cookies = CGI::Cookie::parse(@alt_cookie_fmt_request_hash["HTTP_COOKIE"]);
-    assert_equal ["c84ace847,96670c052c6ceb2451fb0f2"], alt_cookies["_session_id"], alt_cookies.inspect
-    assert_equal ["yes"], alt_cookies["is_admin"], alt_cookies.inspect
-  end
-  
-  def test_relative_url_root
-    assert_deprecated("ActionController::Base.relative_url_root") do
-      assert_equal ActionController::Base.relative_url_root, @request.relative_url_root
-    end
-  end
-end
-
-class CgiRequestParamsParsingTest < BaseCgiTest
-  def test_doesnt_break_when_content_type_has_charset
-    set_content_data 'flamenco=love'
-
-    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 CgiRequestContentTypeTest < BaseCgiTest
-  def test_html_content_type_verification
-    @request.env['CONTENT_TYPE'] = Mime::HTML.to_s
-    assert @request.content_type.verify_request?
-  end
-
-  def test_xml_content_type_verification
-    @request.env['CONTENT_TYPE'] = Mime::XML.to_s
-    assert !@request.content_type.verify_request?
-  end
-end
-
-class CgiRequestMethodTest < BaseCgiTest
-  def test_get
-    assert_equal :get, @request.request_method
-  end
-
-  def test_post
-    @request.env['REQUEST_METHOD'] = 'POST'
-    assert_equal :post, @request.request_method
-  end
-
-  def test_put
-    set_content_data '_method=put'
-
-    assert_equal :put, @request.request_method
-  end
-
-  def test_delete
-    set_content_data '_method=delete'
-
-    assert_equal :delete, @request.request_method
-  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
-
-uses_mocha 'CGI Response' do
-  class CgiResponseTest < BaseCgiTest
-    def setup
-      super
-      @cgi.expects(:header).returns("HTTP/1.0 200 OK\nContent-Type: text/html\n")
-      @response = ActionController::CgiResponse.new(@cgi)
-      @output = StringIO.new('')
-    end
-
-    def test_simple_output
-      @response.body = "Hello, World!"
-
-      @response.out(@output)
-      assert_equal "HTTP/1.0 200 OK\nContent-Type: text/html\nHello, World!", @output.string
-    end
-
-    def test_head_request
-      @cgi.env_table['REQUEST_METHOD'] = 'HEAD'
-      @response.body = "Hello, World!"
-
-      @response.out(@output)
-      assert_equal "HTTP/1.0 200 OK\nContent-Type: text/html\n", @output.string
-    end
-
-    def test_streaming_block
-      @response.body = Proc.new do |response, output|
-        5.times { |n| output.write(n) }
-      end
-
-      @response.out(@output)
-      assert_equal "HTTP/1.0 200 OK\nContent-Type: text/html\n01234", @output.string
-    end
-  end
-end

data/test/controller/components_test.rb

@@ -1,156 +0,0 @@
-require 'abstract_unit'
-
-class CallerController < ActionController::Base
-  def calling_from_controller
-    render_component(:controller => "callee", :action => "being_called")
-  end
-
-  def calling_from_controller_with_params
-    render_component(:controller => "callee", :action => "being_called", :params => { "name" => "David" })
-  end
-
-  def calling_from_controller_with_different_status_code
-    render_component(:controller => "callee", :action => "blowing_up")
-  end
-
-  def calling_from_template
-    render :inline => "Ring, ring: <%= render_component(:controller => 'callee', :action => 'being_called') %>"
-  end
-
-  def internal_caller
-    render :inline => "Are you there? <%= render_component(:action => 'internal_callee') %>"
-  end
-
-  def internal_callee
-    render :text => "Yes, ma'am"
-  end
-
-  def set_flash
-    render_component(:controller => "callee", :action => "set_flash")
-  end
-
-  def use_flash
-    render_component(:controller => "callee", :action => "use_flash")
-  end
-
-  def calling_redirected
-    render_component(:controller => "callee", :action => "redirected")
-  end
-
-  def calling_redirected_as_string
-    render :inline => "<%= render_component(:controller => 'callee', :action => 'redirected') %>"
-  end
-
-  def rescue_action(e) raise end
-end
-
-class CalleeController < ActionController::Base
-  def being_called
-    render :text => "#{params[:name] || "Lady"} of the House, speaking"
-  end
-
-  def blowing_up
-    render :text => "It's game over, man, just game over, man!", :status => 500
-  end
-
-  def set_flash
-    flash[:notice] = 'My stoney baby'
-    render :text => 'flash is set'
-  end
-
-  def use_flash
-    render :text => flash[:notice] || 'no flash'
-  end
-
-  def redirected
-    redirect_to :controller => "callee", :action => "being_called"
-  end
-
-  def rescue_action(e) raise end
-end
-
-class ComponentsTest < Test::Unit::TestCase
-  def setup
-    @controller = CallerController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
-  def test_calling_from_controller
-    assert_deprecated do
-      get :calling_from_controller
-      assert_equal "Lady of the House, speaking", @response.body
-    end
-  end
-
-  def test_calling_from_controller_with_params
-    assert_deprecated do
-      get :calling_from_controller_with_params
-      assert_equal "David of the House, speaking", @response.body
-    end
-  end
-
-  def test_calling_from_controller_with_different_status_code
-    assert_deprecated do
-      get :calling_from_controller_with_different_status_code
-      assert_equal 500, @response.response_code
-    end
-  end
-
-  def test_calling_from_template
-    assert_deprecated do
-      get :calling_from_template
-      assert_equal "Ring, ring: Lady of the House, speaking", @response.body
-    end
-  end
-
-  def test_etag_is_set_for_parent_template_when_calling_from_template
-    assert_deprecated do
-      get :calling_from_template
-      expected_etag = etag_for("Ring, ring: Lady of the House, speaking")
-      assert_equal expected_etag, @response.headers['ETag']
-    end
-  end
-
-  def test_internal_calling
-    assert_deprecated do
-      get :internal_caller
-      assert_equal "Are you there? Yes, ma'am", @response.body
-    end
-  end
-
-  def test_flash
-    assert_deprecated do
-      get :set_flash
-      assert_equal 'My stoney baby', flash[:notice]
-      get :use_flash
-      assert_equal 'My stoney baby', @response.body
-      get :use_flash
-      assert_equal 'no flash', @response.body
-    end
-  end
-
-  def test_component_redirect_redirects
-    assert_deprecated do
-      get :calling_redirected
-      assert_redirected_to :controller=>"callee", :action => "being_called"
-    end
-  end
-
-  def test_component_multiple_redirect_redirects
-    test_component_redirect_redirects
-    test_internal_calling
-  end
-
-  def test_component_as_string_redirect_renders_redirected_action
-    assert_deprecated do
-      get :calling_redirected_as_string
-      assert_equal "Lady of the House, speaking", @response.body
-    end
-  end
-
-  protected
-    def etag_for(text)
-      %("#{Digest::MD5.hexdigest(text)}")
-    end
-end