From ad354b207a5600fbe7c784f370cf30446925f13c Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 9 Dec 2004 00:15:58 +0000 Subject: Added CookieJar#delete and fixed CookieJar[] to just call first, so you get a string instead of an array back. This limits each cookie to one value, which I consider a mighty fine restriction git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@92 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/CHANGELOG | 2 ++ actionpack/lib/action_controller/cookies.rb | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'actionpack') diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 1453bd9704..e5162a4995 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed to_input_field_tag so it no longer explicitly uses InstanceTag.value if value was specified in the options hash [evl] + * Added the possibility of having validate be protected for assert_(in)valid_column #263 [Tobias Luetke] * Added that ActiveRecordHelper#form now calls url_for on the :action option. diff --git a/actionpack/lib/action_controller/cookies.rb b/actionpack/lib/action_controller/cookies.rb index 924dc714b1..80ee617987 100644 --- a/actionpack/lib/action_controller/cookies.rb +++ b/actionpack/lib/action_controller/cookies.rb @@ -36,7 +36,7 @@ module ActionController #:nodoc: # Returns the value of the cookie by +name+ -- or nil if no such cookie exist. You set new cookies using either the cookie method # or cookies[]= (for simple name/value cookies without options). def [](name) - @cookies[name.to_s].value if @cookies[name.to_s] && @cookies[name.to_s].respond_to?(:value) + @cookies[name.to_s].value.first if @cookies[name.to_s] && @cookies[name.to_s].respond_to?(:value) end def []=(name, options) @@ -49,6 +49,11 @@ module ActionController #:nodoc: set_cookie(name, options) end + + # Removes the cookie on the client machine by setting the value to an empty string. + def delete(name) + set_cookie(name, "value" => "") + end private def set_cookie(name, options) #:doc: -- cgit v1.2.3