httpclient 2.5.3.3 → 2.6.0

data/lib/jsonclient.rb

@@ -0,0 +1,63 @@
+require 'httpclient'
+require 'json'
+ 
+# JSONClient auto-converts Hash <-> JSON in request and response.
+# * For POST or PUT request, convert Hash body to JSON String with 'application/json; charset=utf-8' header.
+# * For response, convert JSON String to Hash when content-type is '(application|text)/(x-)?json'
+class JSONClient < HTTPClient
+  CONTENT_TYPE_JSON_REGEX = /(application|text)\/(x-)?json/i
+  CONTENT_TYPE_JSON = 'application/json; charset=utf-8'
+
+  attr_reader :content_type_json_request
+  attr_reader :content_type_json_response_regex
+ 
+  def initialize(*args)
+    super
+    @content_type_json_request = CONTENT_TYPE_JSON
+    @content_type_json_response_regex = CONTENT_TYPE_JSON_REGEX
+  end
+ 
+  def post(uri, *args, &block)
+    request(:post, uri, argument_to_hash_for_json(args), &block)
+  end
+ 
+  def put(uri, *args, &block)
+    request(:put, uri, argument_to_hash_for_json(args), &block)
+  end
+
+  def request(method, uri, *args, &block)
+    res = super
+    if @content_type_json_response_regex =~ res.content_type
+      res = wrap_json_response(res)
+    end
+    res
+  end
+ 
+private
+
+  def argument_to_hash_for_json(args)
+    hash = argument_to_hash(args, :body, :header, :follow_redirect)
+    if hash[:body].is_a?(Hash)
+      hash[:header] = json_header(hash[:header])
+      hash[:body] = JSON.generate(hash[:body])
+    end
+    hash
+  end
+
+  def json_header(header)
+    header ||= {}
+    if header.is_a?(Hash)
+      header['Content-Type'] = @content_type_json_request
+    else
+      header << ['Content-Type', @content_type_json_request]
+    end
+    header
+  end
+
+  def wrap_json_response(original)
+    res = ::HTTP::Message.new_response(JSON.parse(original.content))
+    res.http_header = original.http_header
+    res.previous = original
+    res
+  end
+end

data/test/test_auth.rb

@@ -115,14 +115,25 @@ class TestAuth < Test::Unit::TestCase
     res.body = 'digest_sess_auth OK' + req.query_string.to_s
   end
 
-  # TODO: disables this test; it causes an exception because it seems
-  # that there's version incompatibility between
-  # rack-ntlm and rack-ntlm-test-services.
-  def __test_ntlm_auth
+  # TODO: monkey patching for rack-ntlm-test-services's incompat.
+  module ::Net
+    module NTLM
+      # ruby-ntlm 0.3.0 -> 0.4.0
+      def self.decode_utf16le(*arg)
+        EncodeUtil.decode_utf16le(*arg)
+      end
+      # Make it work if @value == nil
+      class SecurityBuffer < FieldSet
+        def data_size
+          @active && @value ? @value.size : 0
+        end
+      end
+    end
+  end
+  def test_ntlm_auth
     c = HTTPClient.new
     c.set_auth("http://localhost:#{serverport}/ntlm_auth", 'admin', 'admin')
     assert_equal('ntlm_auth OK', c.get_content("http://localhost:#{serverport}/ntlm_auth"))
-    puts c.inspect
   end
 
   def test_basic_auth
@@ -146,7 +157,11 @@ class TestAuth < Test::Unit::TestCase
       c.www_auth.basic_auth.instance_eval { @scheme = "BASIC" }
       #
       c.set_auth("http://localhost:#{serverport}/", 'admin', 'admin')
-      assert_equal('basic_auth OK', c.get_content("http://localhost:#{serverport}/basic_auth"))
+      res = c.get("http://localhost:#{serverport}/basic_auth")
+      assert_equal('basic_auth OK', res.content)
+      assert_equal(200, res.status)
+      assert_equal(401, res.previous.status)
+      assert_equal(nil, res.previous.previous)
     ensure
       @basic_auth.instance_eval { @auth_scheme = webrick_backup }
     end
@@ -425,4 +440,34 @@ class TestAuth < Test::Unit::TestCase
     assert(str.index(%q(POST /photos)))
     assert(str.index(%q(Authorization: OAuth realm="http://photos.example.net/", oauth_consumer_key="dpf43f3p2l4k3l03", oauth_nonce="kllo9940pd9333jh", oauth_signature="wPkvxykrw%2BBTdCcGqKr%2B3I%2BPsiM%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1191242096", oauth_token="nnch734d00sl2jdk", oauth_version="1.0")))
   end
+
+  def test_basic_auth_post_with_multipart
+    c = HTTPClient.new
+    c.set_auth("http://localhost:#{serverport}/", 'admin', 'admin')
+    File.open(__FILE__) do |f|
+      # read 'f' twice for authorization negotiation
+      assert_equal('basic_auth OK', c.post("http://localhost:#{serverport}/basic_auth", :file => f).content)
+    end
+  end
+
+  def test_negotiate_and_basic
+    c = HTTPClient.new
+    c.test_loopback_http_response << %Q(HTTP/1.1 401 Unauthorized\r\nWWW-Authenticate: NTLM\r\nWWW-Authenticate: Basic realm="foo"\r\nConnection: Keep-Alive\r\nContent-Length: 0\r\n\r\n)
+    c.test_loopback_http_response << %Q(HTTP/1.1 401 Unauthorized\r\nWWW-Authenticate: NTLM TlRMTVNTUAACAAAAAAAAACgAAAABAAAAAAAAAAAAAAA=\r\nConnection: Keep-Alive\r\nContent-Length: 0\r\n\r\n)
+    c.test_loopback_http_response << %Q(HTTP/1.0 200 OK\r\nConnection: Keep-Alive\r\nContent-Length: 1\r\n\r\na)
+    c.test_loopback_http_response << %Q(HTTP/1.0 200 OK\r\nConnection: Keep-Alive\r\nContent-Length: 1\r\n\r\nb)
+    c.debug_dev = str = ''
+    c.set_auth('http://www.example.org/', 'admin', 'admin')
+    # Do NTLM negotiation
+    c.get('http://www.example.org/foo')
+    # BasicAuth authenticator should not respond to it because NTLM
+    # negotiation has been finished.
+    assert_match(%r(Authorization: NTLM), str)
+    assert_not_match(%r(Authorization: Basic), str)
+    # ditto for other resource that is protected with NTLM
+    c.debug_dev = str = ''
+    c.get('http://www.example.org/foo/subdir')
+    assert_not_match(%r(Authorization: NTLM), str)
+    assert_not_match(%r(Authorization: Basic), str)
+  end
 end

data/test/test_cookie.rb

@@ -1,131 +1,20 @@
 require 'test/unit'
 require 'uri'
+require 'tempfile'
 
+require 'httpclient/util'
 require 'httpclient/cookie'
 
 class TestCookie < Test::Unit::TestCase
   include HTTPClient::Util
 
   def setup()
-    @c = WebAgent::Cookie.new()
+    @c = WebAgent::Cookie.new('hoge', 'funi')
   end
 
   def test_s_new()
     assert_instance_of(WebAgent::Cookie, @c)
   end
-
-  def test_discard?
-    assert_equal(false, !!(@c.discard?))
-    @c.discard = true
-    assert_equal(true, !!(@c.discard?))
-  end
-
-  def test_match()
-    url = urify('http://www.rubycolor.org/hoge/funi/#919191')
-
-    @c.domain = 'www.rubycolor.org'
-    assert_equal(true, @c.match?(url))
-
-    @c.domain = '.rubycolor.org'
-    assert_equal(true, @c.match?(url))
-
-    @c.domain = 'aaa.www.rubycolor.org'
-    assert_equal(false, @c.match?(url))
-
-    @c.domain = 'aaa.www.rubycolor.org'
-    assert_equal(false, @c.match?(url))
-
-    @c.domain = 'www.rubycolor.org'
-    @c.path = '/'
-    assert_equal(true, @c.match?(url))
-
-    @c.domain = 'www.rubycolor.org'
-    @c.path = '/hoge'
-    assert_equal(true, @c.match?(url))
-
-    @c.domain = 'www.rubycolor.org'
-    @c.path = '/hoge/hoge'
-    assert_equal(false, @c.match?(url))
-
-    @c.domain = 'www.rubycolor.org'
-    @c.path = '/hoge'
-    @c.secure = true
-    assert_equal(false, @c.match?(url))
-
-    url2 = urify('https://www.rubycolor.org/hoge/funi/#919191')
-    @c.domain = 'www.rubycolor.org'
-    @c.path = '/hoge'
-    @c.secure = true
-    assert_equal(true, @c.match?(url2))
-
-    @c.domain = 'www.rubycolor.org'
-    @c.path = '/hoge'
-    @c.secure = nil
-    assert_equal(true, @c.match?(url2)) ## not false!
-
-    url.port = 80
-    @c.domain = 'www.rubycolor.org'
-    @c.path = '/hoge'
-#    @c.port = [80,8080]
-    assert_equal(true, @c.match?(url))
-
-    url_nopath = URI.parse('http://www.rubycolor.org')
-    @c.domain = 'www.rubycolor.org'
-    @c.path = '/'
-    assert_equal(true, @c.match?(url_nopath))
-
-  end
-
-  def test_head_match?()
-    assert_equal(true, @c.head_match?("",""))
-    assert_equal(false, @c.head_match?("a",""))
-    assert_equal(true, @c.head_match?("","a"))
-    assert_equal(true, @c.head_match?("abcde","abcde"))
-    assert_equal(true, @c.head_match?("abcde","abcdef"))
-    assert_equal(false, @c.head_match?("abcdef","abcde"))
-    assert_equal(false, @c.head_match?("abcde","bcde"))
-    assert_equal(false, @c.head_match?("bcde","abcde"))
-  end
-
-  def test_tail_match?()
-    assert_equal(true, @c.tail_match?("",""))
-    assert_equal(false, @c.tail_match?("a",""))
-    assert_equal(true, @c.tail_match?("","a"))
-    assert_equal(true, @c.tail_match?("abcde","abcde"))
-    assert_equal(false, @c.tail_match?("abcde","abcdef"))
-    assert_equal(false, @c.tail_match?("abcdef","abcde"))
-    assert_equal(false, @c.tail_match?("abcde","bcde"))
-    assert_equal(true, @c.tail_match?("bcde","abcde"))
-  end
-
-
-  def test_domain_match()
-    extend WebAgent::CookieUtils
-    assert_equal(true, !!domain_match("hoge.co.jp","."))
-#    assert_equal(true, !!domain_match("locahost",".local"))
-    assert_equal(true, !!domain_match("192.168.10.1","192.168.10.1"))
-    assert_equal(false, !!domain_match("192.168.10.1","192.168.10.2"))
-#    assert_equal(false, !!domain_match("hoge.co.jp",".hoge.co.jp"))
-    # allows; host == rubyforge.org, domain == .rubyforge.org
-    assert_equal(true, !!domain_match("hoge.co.jp",".hoge.co.jp"))
-    assert_equal(true, !!domain_match("www.hoge.co.jp", "www.hoge.co.jp"))
-    assert_equal(false, !!domain_match("www.hoge.co.jp", "www2.hoge.co.jp"))
-    assert_equal(true, !!domain_match("www.hoge.co.jp", ".hoge.co.jp"))
-    assert_equal(true, !!domain_match("www.aa.hoge.co.jp", ".hoge.co.jp"))
-    assert_equal(false, !!domain_match("www.hoge.co.jp", "hoge.co.jp"))
-  end
-
-  def test_join_quotedstr()
-    arr1 = ['hoge=funi', 'hoge2=funi2']
-    assert_equal(arr1, @c.instance_eval{join_quotedstr(arr1,';')})
-    arr2 = ['hoge="fu', 'ni"',  'funi=funi']
-    assert_equal(['hoge="fu;ni"','funi=funi'],
-		 @c.instance_eval{join_quotedstr(arr2,';')})
-    arr3 = ['hoge="funi";hoge2="fu','ni2";hoge3="hoge"',  'funi="funi"']
-    assert_equal(['hoge="funi";hoge2="fu,ni2";hoge3="hoge"',  'funi="funi"'],
-		 @c.instance_eval{join_quotedstr(arr3,',')})
-  end
-
 end
 
 class TestCookieManager < Test::Unit::TestCase
@@ -139,13 +28,13 @@ class TestCookieManager < Test::Unit::TestCase
   end
   
   def test_parse()
-    str = "inkid=n92b0ADOgACIgUb9lsjHqAAAHu2a; expires=Wed, 01-Dec-2010 00:00:00 GMT; path=/"
+    str = "inkid=n92b0ADOgACIgUb9lsjHqAAAHu2a; expires=Wed, 01-Dec-2999 00:00:00 GMT; path=/"
     @cm.parse(str, urify('http://www.test.jp'))
     cookie = @cm.cookies[0]
     assert_instance_of(WebAgent::Cookie, cookie)
     assert_equal("inkid", cookie.name)
     assert_equal("n92b0ADOgACIgUb9lsjHqAAAHu2a", cookie.value)
-    assert_equal(Time.gm(2010, 12, 1, 0,0,0), cookie.expires)
+    assert_equal(Time.gm(2999, 12, 1, 0,0,0), cookie.expires)
     assert_equal("/", cookie.path)
   end
 
@@ -157,7 +46,8 @@ class TestCookieManager < Test::Unit::TestCase
     assert_equal("xmen", cookie.name)
     assert_equal("off,0,0,1", cookie.value)
     assert_equal("/", cookie.path)
-    assert_equal(".excite.co.jp", cookie.domain)
+    assert_equal("excite.co.jp", cookie.domain)
+    assert_equal(".excite.co.jp", cookie.dot_domain)
     assert_equal(Time.gm(2037,12,31,12,0,0), cookie.expires)
   end
 
@@ -169,7 +59,8 @@ class TestCookieManager < Test::Unit::TestCase
     assert_equal("xmen", cookie.name)
     assert_equal("off,0,0,1", cookie.value)
     assert_equal("/", cookie.path)
-    assert_equal(".excite.co.jp", cookie.domain)
+    assert_equal("excite.co.jp", cookie.domain)
+    assert_equal(".excite.co.jp", cookie.dot_domain)
     assert_equal(Time.gm(2037,12,31,12,0,0), cookie.expires)
     assert_equal(true, cookie.secure?)
     assert_equal(true, cookie.http_only?)
@@ -183,7 +74,8 @@ class TestCookieManager < Test::Unit::TestCase
     assert_equal("xmen", cookie.name)
     assert_equal("off,0,0,1", cookie.value)
     assert_equal("/;;", cookie.path)
-    assert_equal(".excite.co.jp", cookie.domain)
+    assert_equal("excite.co.jp", cookie.domain)
+    assert_equal(".excite.co.jp", cookie.dot_domain)
     assert_equal(Time.gm(2037,12,31,12,0,0), cookie.expires)
   end
 
@@ -194,19 +86,21 @@ class TestCookieManager < Test::Unit::TestCase
 #  end
 
   def test_check_expired_cookies()
-    c1 = WebAgent::Cookie.new()
-    c2 = c1.dup
-    c3 = c1.dup
-    c4 = c1.dup
-    c1.expires = Time.now - 100
-    c2.expires = Time.now + 100
-    c3.expires = Time.now - 10
+    format = "%a, %d-%b-%Y %H:%M:%S GMT"
+    c1 = WebAgent::Cookie.new('hoge1', 'funi', :domain => 'http://www.example.com/', :path => '/')
+    c2 = WebAgent::Cookie.new('hoge2', 'funi', :domain => 'http://www.example.com/', :path => '/')
+    c3 = WebAgent::Cookie.new('hoge3', 'funi', :domain => 'http://www.example.com/', :path => '/')
+    c4 = WebAgent::Cookie.new('hoge4', 'funi', :domain => 'http://www.example.com/', :path => '/')
+    c1.expires = (Time.now - 100).gmtime.strftime(format)
+    c2.expires = (Time.now + 100).gmtime.strftime(format)
+    c3.expires = (Time.now - 10).gmtime.strftime(format)
     c4.expires = nil
     cookies = [c1,c2,c3,c4]
     @cm.cookies = cookies
-    @cm.check_expired_cookies()
-    # expires == nil cookies (session cookie) exists.
-    assert_equal([c2,c4], @cm.cookies)
+    assert_equal(c2.name, @cm.cookies[0].name)
+    assert_equal(c2.expires, @cm.cookies[0].expires)
+    assert_equal(c4.name, @cm.cookies[1].name)
+    assert_equal(c4.expires, @cm.cookies[1].expires)
   end
 
   def test_parse_expires
@@ -236,13 +130,13 @@ class TestCookieManager < Test::Unit::TestCase
   end
 
   def test_parse_after_expiration
-    str = "inkid=n92b0ADOgACIgUb9lsjHqAAAHu2a; expires=Wed, 01-Dec-2010 00:00:00 GMT; path=/"
+    str = "inkid=n92b0ADOgACIgUb9lsjHqAAAHu2a; expires=Wed, 01-Dec-2999 00:00:00 GMT; path=/"
     @cm.parse(str, urify('http://www.test.jp'))
     cookie = @cm.cookies[0]
     assert_instance_of(WebAgent::Cookie, cookie)
     assert_equal("inkid", cookie.name)
     assert_equal("n92b0ADOgACIgUb9lsjHqAAAHu2a", cookie.value)
-    assert_equal(Time.gm(2010, 12, 1, 0,0,0), cookie.expires)
+    assert_equal(Time.gm(2999, 12, 1, 0,0,0), cookie.expires)
     assert_equal("/", cookie.path)
 
     time = Time.at(Time.now.to_i + 60).utc
@@ -263,49 +157,43 @@ class TestCookieManager < Test::Unit::TestCase
     str = "xmen=off,0,0,2; path=/; domain=.excite.co.jp; expires=Wednesday, 31-Dec-2037 12:00:00 GMT"
     @cm.parse(str, urify("http://www.excite.co.jp/"))
 
-    @cm.cookies[0].use = true
-    @cm.cookies[1].use = true
-
     url = urify('http://www.excite.co.jp/hoge/funi/')
     cookie_str = @cm.find(url)
-    assert_equal("xmen=off,0,0,2", cookie_str)
+    assert_equal("xmen=\"off,0,0,2\"", cookie_str)
   end
 
   def test_load_cookies()
-    begin
-      File.open("tmp_test.tmp","w") {|f|
-	f.write <<EOF
+    cookiefile = Tempfile.new('test_cookie')
+    File.open(cookiefile.path, 'w') do |f|
+      f.write <<EOF
 http://www.zdnet.co.jp/news/0106/08/e_gibson.html	NGUserID	d29b8f49-10875-992421294-1	2145801600	www.zdnet.co.jp	/	9	0			
-http://www.zdnet.co.jp/news/0106/08/e_gibson.html	PACK	zd3-992421294-7436	1293839999	.zdnet.co.jp	/	13	0			
+http://www.zdnet.co.jp/news/0106/08/e_gibson.html	PACK	zd3-992421294-7436	2293839999	.zdnet.co.jp	/	13	0			
 http://example.org/	key	value	0	.example.org	/	13	0			
 http://example.org/	key	value		.example.org	/	13	0			
 EOF
-      }
-
-      @cm.cookies_file = 'tmp_test.tmp'
-      @cm.load_cookies()
-      c0, c1, c2, c3 = @cm.cookies
-      assert_equal('http://www.zdnet.co.jp/news/0106/08/e_gibson.html', c0.url.to_s)
-      assert_equal('NGUserID', c0.name)
-      assert_equal('d29b8f49-10875-992421294-1', c0.value)
-      assert_equal(Time.at(2145801600), c0.expires)
-      assert_equal('www.zdnet.co.jp', c0.domain)
-      assert_equal('/', c0.path)
-      assert_equal(9, c0.flag)
-      #
-      assert_equal('http://www.zdnet.co.jp/news/0106/08/e_gibson.html', c1.url.to_s)
-      assert_equal('PACK', c1.name)
-      assert_equal('zd3-992421294-7436', c1.value)
-      assert_equal(Time.at(1293839999), c1.expires)
-      assert_equal('.zdnet.co.jp', c1.domain)
-      assert_equal('/', c1.path)
-      assert_equal(13, c1.flag)
-      #
-      assert_equal(nil, c2.expires)
-      assert_equal(nil, c3.expires) # allow empty 'expires' (should not happen)
-    ensure
-      File.unlink("tmp_test.tmp")
     end
+
+    @cm.cookies_file = cookiefile.path
+    @cm.load_cookies()
+    c0, c1, c2 = @cm.cookies
+    assert_equal('http://www.zdnet.co.jp/news/0106/08/e_gibson.html', c0.url.to_s)
+    assert_equal('NGUserID', c0.name)
+    assert_equal('d29b8f49-10875-992421294-1', c0.value)
+    assert_equal(Time.at(2145801600), c0.expires)
+    assert_equal('www.zdnet.co.jp', c0.domain)
+    assert_equal('/', c0.path)
+    assert_equal(9, c0.flag)
+    #
+    assert_equal('http://www.zdnet.co.jp/news/0106/08/e_gibson.html', c1.url.to_s)
+    assert_equal('PACK', c1.name)
+    assert_equal('zd3-992421294-7436', c1.value)
+    assert_equal(Time.at(2293839999), c1.expires)
+    assert_equal('zdnet.co.jp', c1.domain)
+    assert_equal('.zdnet.co.jp', c1.dot_domain)
+    assert_equal('/', c1.path)
+    assert_equal(13, c1.flag)
+    #
+    assert_equal(nil, c2.expires)
   end
 
   def test_save_cookie()
@@ -313,56 +201,44 @@ EOF
 http://www.zdnet.co.jp/news/0106/08/e_gibson.html	NGUserID	d29b8f49-10875-992421294-1	2145801600	www.zdnet.co.jp	/	9
 http://www.zdnet.co.jp/news/0106/08/e_gibson.html	PACK	zd3-992421294-7436	2145801600	.zdnet.co.jp	/	13
 EOF
-    begin
-      File.open("tmp_test.tmp","w") {|f|
-	f.write str
-      }
-      @cm.cookies_file = 'tmp_test.tmp'
-      @cm.load_cookies()
-      @cm.instance_eval{@is_saved = false}
-      @cm.cookies_file = 'tmp_test2.tmp'
-      @cm.save_cookies()
-      str2 = ''
-      File.open("tmp_test2.tmp","r") {|f|
-	str2 = f.read()
-      }
-      assert_equal(str, str2)
-      #
-      assert(File.exist?('tmp_test2.tmp'))
-      File.unlink("tmp_test2.tmp")
-      @cm.save_cookies()
-      assert(!File.exist?('tmp_test2.tmp'))
-      @cm.save_cookies(true)
-      assert(File.exist?('tmp_test2.tmp'))
-    ensure
-      File.unlink("tmp_test.tmp")
-      if FileTest.exist?("tmp_test2.tmp")
-	File.unlink("tmp_test2.tmp")
-      end
+    cookiefile = Tempfile.new('test_cookie')
+    cookiefile2 = Tempfile.new('test_cookie2')
+    File.open(cookiefile.path, 'w') do |f|
+      f.write str
     end
+
+    @cm.cookies_file = cookiefile.path
+    @cm.load_cookies()
+    @cm.instance_eval{@is_saved = false}
+    @cm.cookies_file = cookiefile2.path
+    @cm.save_cookies()
+    str2 = ''
+    File.open(cookiefile2.path, 'r') do |f|
+      str2 = f.read
+    end
+    assert_equal(str.split.sort, str2.split.sort)
+    assert(File.exist?(cookiefile2.path))
+    File.unlink(cookiefile2.path)
+    @cm.save_cookies()
+    assert(File.exist?(cookiefile2.path))
   end
 
   def test_not_saved_expired_cookies
-    begin
-      @cm.cookies_file = 'tmp_test.tmp'
-      uri = urify('http://www.example.org')
-      @cm.parse("foo=1; path=/", uri)
-      @cm.parse("bar=2; path=/; expires=", uri)
-      @cm.parse("baz=3; path=/; expires=\"\"", uri)
-      @cm.parse("qux=4; path=/; expires=#{(Time.now + 10).asctime}", uri)
-      @cm.parse("quxx=5; path=/; expires=#{(Time.now - 10).asctime}", uri)
-      @cm.save_cookies()
-      @cm.load_cookies
-      assert_equal(1, @cm.cookies.size) # +10 cookies only
-    ensure
-      File.unlink("tmp_test.tmp") if File.exist?("tmp_test.tmp")
-    end
+    cookiefile = Tempfile.new('test_cookie')
+    @cm.cookies_file = cookiefile.path
+    uri = urify('http://www.example.org')
+    @cm.parse("foo=1; path=/", uri)
+    @cm.parse("bar=2; path=/; expires=", uri)
+    @cm.parse("baz=3; path=/; expires=\"\"", uri)
+    @cm.parse("qux=4; path=/; expires=#{(Time.now.gmtime + 10).asctime}", uri)
+    @cm.parse("quxx=5; path=/; expires=#{(Time.now.gmtime - 10).asctime}", uri)
+    @cm.save_cookies
+    @cm.load_cookies
+    assert_equal(1, @cm.cookies.size) # +10 cookies only
   end
 
   def test_add()
-    c = WebAgent::Cookie.new()
-    c.name = "hoge"
-    c.value = "funi"
+    c = WebAgent::Cookie.new('hoge', 'funi')
     c.url = urify("http://www.inac.co.jp/hoge")
     @cm.add(c)
     c = @cm.cookies[0]
@@ -372,41 +248,62 @@ EOF
   end
 
   def test_add2()
-    c = WebAgent::Cookie.new()
-    c.name = "hoge"
-    c.value = "funi"
+    c = WebAgent::Cookie.new('hoge', 'funi')
     c.path = ''
     c.url = urify("http://www.inac.co.jp/hoge/hoge2/hoge3")
     @cm.add(c)
     #
-    c = WebAgent::Cookie.new()
-    c.name = "hoge"
-    c.value = "funi"
+    c = WebAgent::Cookie.new('hoge', 'funi')
     #c.path = '' NO path given -> same as URL
     c.url = urify("http://www.inac.co.jp/hoge/hoge2/hoge3")
     @cm.add(c)
     #
     c1, c2 = @cm.cookies
-    assert_equal('', c1.path)
-    assert_equal('/hoge/hoge2', c2.path)
+    assert_equal('/hoge/hoge2/', c1.path)
+    assert_equal('/', c2.path)
+  end
+
+  def test_keep_escaped
+    uri = urify('http://www.example.org')
+
+    @cm.parse("bar=2; path=/", uri)
+    c = @cm.cookies.first
+    assert_equal('2', c.value)
+    assert_equal('bar=2', @cm.find(uri))
+
+    @cm.parse("bar=\"2\"; path=/", uri)
+    c = @cm.cookies.first
+    assert_equal('2', c.value)
+    assert_equal('bar=2', @cm.find(uri))
+
+    @cm.parse("bar=; path=/", uri)
+    c = @cm.cookies.first
+    assert_equal('', c.value)
+    assert_equal('bar=', @cm.find(uri))
+
+    @cm.parse("bar=\"\"; path=/", uri)
+    c = @cm.cookies.first
+    assert_equal('', c.value)
+    assert_equal('bar=', @cm.find(uri))
   end
 
-  def test_check_cookie_accept_domain()
-    @cm.accept_domains = [".example1.co.jp", "www1.example.jp"]
-    @cm.reject_domains = [".example2.co.jp", "www2.example.jp"]
-    check1 = @cm.check_cookie_accept_domain("www.example1.co.jp")
-    assert_equal(true, check1)
-    check2 = @cm.check_cookie_accept_domain("www.example2.co.jp")
-    assert_equal(false, check2)
-    check3 = @cm.check_cookie_accept_domain("www1.example.jp")
-    assert_equal(true, check3)
-    check4 = @cm.check_cookie_accept_domain("www2.example.jp")
-    assert_equal(false, check4)
-    check5 = @cm.check_cookie_accept_domain("aa.www2.example.jp")
-    assert_equal(true, check5)
-    check6 = @cm.check_cookie_accept_domain("aa.www2.example.jp")
-    assert_equal(true, check6)
-    assert_equal(false, @cm.check_cookie_accept_domain(nil))
+  def test_load_cookies_escaped
+    uri = urify('http://example.org/')
+    f = Tempfile.new('test_cookie')
+    File.open(f.path, 'w') do |f|
+      f.write <<EOF
+http://example.org/	key1	"value"	0	.example.org	/	13	0			
+http://example.org/	key2	""	0	.example.org	/	13	0			
+http://example.org/	key3		0	.example.org	/	13	0			
+EOF
+    end
+    @cm.cookies_file = f.path
+    @cm.load_cookies
+    c0, c1, c2 = @cm.cookies
+    assert_equal('"value"', c0.value)
+    assert_equal('""', c1.value)
+    assert_equal('', c2.value)
+    assert_equal('key1="\\"value\\""; key2="\\"\\""; key3=', @cm.find(uri))
   end
 
 end