kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/cgi/cookie.rb: refactoring.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40363 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
xibbar 2013-04-18 23:47:07 +00:00
parent 1f2c3b8aa3
commit 1f12e40736
1 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

54
lib/cgi/cookie.rb
View file

@ -1,6 +1,5 @@
require 'cgi/util' require 'cgi/util'
class CGI class CGI
@@accept_charset="UTF-8" unless defined?(@@accept_charset)
# Class representing an HTTP cookie. # Class representing an HTTP cookie.
# #
# In addition to its specific fields and methods, a Cookie instance # In addition to its specific fields and methods, a Cookie instance
@ -9,9 +8,9 @@ class CGI
# See RFC 2965. # See RFC 2965.
# #
# == Examples of use # == Examples of use
# cookie1 = CGI::Cookie::new("name", "value1", "value2", ...) # cookie1 = CGI::Cookie.new("name", "value1", "value2", ...)
# cookie1 = CGI::Cookie::new("name" => "name", "value" => "value") # cookie1 = CGI::Cookie.new("name" => "name", "value" => "value")
# cookie1 = CGI::Cookie::new('name' => 'name', # cookie1 = CGI::Cookie.new('name' => 'name',
# 'value' => ['value1', 'value2', ...], # 'value' => ['value1', 'value2', ...],
# 'path' => 'path', # optional # 'path' => 'path', # optional
# 'domain' => 'domain', # optional # 'domain' => 'domain', # optional
@ -35,6 +34,7 @@ class CGI
# cookie1.expires = Time.now + 30 # cookie1.expires = Time.now + 30
# cookie1.secure = true # cookie1.secure = true
class Cookie < Array class Cookie < Array
@@accept_charset="UTF-8" unless defined?(@@accept_charset)
# Create a new CGI::Cookie object. # Create a new CGI::Cookie object.
# #
@ -125,7 +125,7 @@ class CGI
# Convert the Cookie to its string representation. # Convert the Cookie to its string representation.
def to_s def to_s
val = collect{|v| CGI::escape(v) }.join("&") val = collect{|v| CGI.escape(v) }.join("&")
buf = "#{@name}=#{val}" buf = "#{@name}=#{val}"
buf << "; domain=#{@domain}" if @domain buf << "; domain=#{@domain}" if @domain
buf << "; path=#{@path}" if @path buf << "; path=#{@path}" if @path
@ -134,32 +134,32 @@ class CGI
buf buf
end end
end # class Cookie # Parse a raw cookie string into a hash of cookie-name=>Cookie
# pairs.
#
# cookies = CGI::Cookie.parse("raw_cookie_string")
# # { "name1" => cookie1, "name2" => cookie2, ... }
#
def self.parse(raw_cookie)
cookies = Hash.new([])
return cookies unless raw_cookie
# Parse a raw cookie string into a hash of cookie-name=>Cookie raw_cookie.split(/[;,]\s?/).each do |pairs|
# pairs. name, values = pairs.split('=',2)
# next unless name and values
# cookies = CGI::Cookie::parse("raw_cookie_string") name = CGI.unescape(name)
# # { "name1" => cookie1, "name2" => cookie2, ... } values ||= ""
# values = values.split('&').collect{|v| CGI.unescape(v,@@accept_charset) }
def Cookie::parse(raw_cookie) if cookies.has_key?(name)
cookies = Hash.new([]) values = cookies[name].value + values
return cookies unless raw_cookie end
cookies[name] = Cookie.new(name, *values)
raw_cookie.split(/[;,]\s?/).each do |pairs|
name, values = pairs.split('=',2)
next unless name and values
name = CGI::unescape(name)
values ||= ""
values = values.split('&').collect{|v| CGI::unescape(v,@@accept_charset) }
if cookies.has_key?(name)
values = cookies[name].value + values
end end
cookies[name] = Cookie::new(name, *values)
cookies
end end
cookies end # class Cookie
end
end end