diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-12 12:43:48 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-12 12:43:48 +0000 |
commit | 6b284b87f224d8d4da074f98553ec9394f3d4c57 (patch) | |
tree | d1f7e565b650cfb1064cd8026ed8cb51aa6e3950 /actionpack/lib | |
parent | 9ee94ab13a3f02fa3097f9bd5c57ab223e3fbf97 (diff) | |
download | rails-6b284b87f224d8d4da074f98553ec9394f3d4c57.tar.gz rails-6b284b87f224d8d4da074f98553ec9394f3d4c57.tar.bz2 rails-6b284b87f224d8d4da074f98553ec9394f3d4c57.zip |
Fixed CgiRequest so that it'll now accept session options with Symbols as keys (as the documentation points out) [Suggested by Andreas]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@117 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/cgi_process.rb | 8 | ||||
-rw-r--r-- | actionpack/lib/action_controller/cookies.rb | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index 148cb81df0..64bfc1ed07 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -36,7 +36,7 @@ module ActionController #:nodoc: attr_accessor :cgi DEFAULT_SESSION_OPTIONS = - { "database_manager" => CGI::Session::PStore, "prefix" => "ruby_sess.", "session_path" => "/" } + { :database_manager => CGI::Session::PStore, :prefix => "ruby_sess.", :session_path => "/" } def initialize(cgi, session_options = {}) @cgi = cgi @@ -67,7 +67,7 @@ module ActionController #:nodoc: def session return @session unless @session.nil? begin - @session = (@session_options == false ? {} : CGI::Session.new(@cgi, DEFAULT_SESSION_OPTIONS.merge(@session_options))) + @session = (@session_options == false ? {} : CGI::Session.new(@cgi, session_options_with_string_keys)) @session["__valid_session"] return @session rescue ArgumentError => e @@ -94,6 +94,10 @@ module ActionController #:nodoc: def new_session CGI::Session.new(@cgi, DEFAULT_SESSION_OPTIONS.merge(@session_options).merge("new_session" => true)) end + + def session_options_with_string_keys + DEFAULT_SESSION_OPTIONS.merge(@session_options).inject({}) { |options, pair| options[pair.first.to_s] = pair.last; options } + end end class CgiResponse < AbstractResponse #:nodoc: diff --git a/actionpack/lib/action_controller/cookies.rb b/actionpack/lib/action_controller/cookies.rb index 1eb071bdbe..6b9954f84d 100644 --- a/actionpack/lib/action_controller/cookies.rb +++ b/actionpack/lib/action_controller/cookies.rb @@ -41,7 +41,7 @@ module ActionController #:nodoc: def []=(name, options) if options.is_a?(Hash) - options.each { |key, value| options[key.to_s] = value } + options = options.inject({}) { |options, pair| options[pair.first.to_s] = pair.last; options } options["name"] = name.to_s else options = { "name" => name, "value" => options } |