httpclient 2.1.7.2 → 2.2.0

data/lib/httpclient.rb

@@ -50,13 +50,23 @@ require 'httpclient/cookie'
 #
 # === How to retrieve web resources
 #
-# See get_content.
+# See get and get_content.
 #
-# 1. Get content of specified URL.  It returns a String of whole result.
+# 1. Get content of specified URL.  It returns HTTP::Message object and
+#    calling 'body' method of it returns a content String.
+#
+#     puts clnt.get('http://dev.ctor.org/').body
+#
+# 2. For getting content directly, use get_content.  It follows redirect
+#    response and returns a String of whole result.
 #
 #     puts clnt.get_content('http://dev.ctor.org/')
 #
-# 2. Get content as chunks of String.  It yields chunks of String.
+# 3. You can pass :follow_redirect option to follow redirect response in get.
+#
+#     puts clnt.get('http://dev.ctor.org/', :foolow_redirect => true)
+#
+# 4. Get content as chunks of String.  It yields chunks of String.
 #
 #     clnt.get_content('http://dev.ctor.org/') do |chunk|
 #       puts chunk
@@ -79,7 +89,11 @@ require 'httpclient/cookie'
 #     p res.status
 #     p res.contenttype
 #     p res.header['X-Custom']
-#     puts res.content
+#     puts res.body
+#
+#    You can also use keyword argument style.
+#
+#     res = clnt.get(uri, :query => { :keyword => 'ruby', :lang => 'en' })
 #
 # === How to POST
 #
@@ -90,6 +104,10 @@ require 'httpclient/cookie'
 #     body = { 'keyword' => 'ruby', 'lang' => 'en' }
 #     res = clnt.post(uri, body)
 #
+#    Keyword argument style.
+#
+#     res = clnt.post(uri, :body => ...)
+#
 # 2. Do multipart file upload with POST.  No need to set extra header by
 #    yourself from httpclient/2.1.4.
 #
@@ -117,7 +135,7 @@ require 'httpclient/cookie'
 #    Just pass an URL which starts with 'https://'.
 #
 #     https_url = 'https://www.rsa.com'
-#     clnt.get_content(https_url)
+#     clnt.get(https_url)
 #
 # 2. Getting peer certificate from response.
 #
@@ -129,22 +147,23 @@ require 'httpclient/cookie'
 #     user_cert_file = 'cert.pem'
 #     user_key_file = 'privkey.pem'
 #     clnt.ssl_config.set_client_cert_file(user_cert_file, user_key_file)
-#     clnt.get_content(https_url)
+#     clnt.get(https_url)
 #
 # === Handling Cookies
 #
 # 1. Using volatile Cookies.  Nothing to do.  HTTPClient handles Cookies.
 #
 #     clnt = HTTPClient.new
-#     clnt.get_content(url1) # receives Cookies.
-#     clnt.get_content(url2) # sends Cookies if needed.
+#     res = clnt.get(url1) # receives Cookies.
+#     res = clnt.get(url2) # sends Cookies if needed.
+#     p res.cookies
 #
 # 2. Saving non volatile Cookies to a specified file.  Need to set a file at
 #    first and invoke save method at last.
 #
 #     clnt = HTTPClient.new
 #     clnt.set_cookie_store('/home/nahi/cookie.dat')
-#     clnt.get_content(url)
+#     clnt.get(url)
 #     ...
 #     clnt.save_cookie_store
 #
@@ -163,7 +182,7 @@ require 'httpclient/cookie'
 #     user = 'user'
 #     password = 'user'
 #     clnt.set_auth(domain, user, password)
-#     p clnt.get_content('http://dev.ctor.org/http-access2/login').status
+#     p clnt.get('http://dev.ctor.org/http-access2/login').status
 #
 # 2. Authentication with Proxy server.  Supports BasicAuth and NTLM
 #    (requires win32/sspi)
@@ -172,17 +191,17 @@ require 'httpclient/cookie'
 #     user = 'proxy'
 #     password = 'proxy'
 #     clnt.set_proxy_auth(user, password)
-#     p clnt.get_content(url)
+#     p clnt.get(url)
 #
 # === Invoking HTTP methods with custom header
 #
-# Pass a Hash or an Array for extheader argument.
+# Pass a Hash or an Array for header argument.
 #
-#     extheader = { 'Accept' => '*/*' }
-#     clnt.get_content(uri, query, extheader)
+#     header = { 'Accept' => '*/*' }
+#     clnt.get(uri, query, header)
 #
-#     extheader = [['Accept', 'image/jpeg'], ['Accept', 'image/png']]
-#     clnt.get_content(uri, query, extheader)
+#     header = [['Accept', 'image/jpeg'], ['Accept', 'image/png']]
+#     clnt.get_content(uri, query, header)
 #
 # === Invoking HTTP methods asynchronously
 #
@@ -200,7 +219,7 @@ require 'httpclient/cookie'
 #     puts '.'
 #     res = connection.pop
 #     p res.status
-#     p res.content.read # res.content is an IO for the res of async method.
+#     p res.body.read # res.body is an IO for the res of async method.
 #
 # === Shortcut methods
 #
@@ -210,7 +229,7 @@ require 'httpclient/cookie'
 #   ruby -rhttpclient -e 'p HTTPClient.head(ARGV.shift).header["last-modified"]' http://dev.ctor.org/
 #
 class HTTPClient
-  VERSION = '2.1.7.2'
+  VERSION = '2.2.0'
   RUBY_VERSION_STRING = "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
   /: (\S+) (\S+)/ =~ %q$Id$
   LIB_NAME = "(#{$1}/#{$2}, #{RUBY_VERSION_STRING})"
@@ -333,7 +352,7 @@ class HTTPClient
   # Local socket address. Set HTTPClient#socket_local.host and HTTPClient#socket_local.port to specify local binding hostname and port of TCP socket.
   attr_proxy(:socket_local, true)
 
-  # Default extheader for PROPFIND request.
+  # Default header for PROPFIND request.
   PROPFIND_DEFAULT_EXTHEADER = { 'Depth' => '0' }
 
   # Creates a HTTPClient instance which manages sessions, cookies, etc.
@@ -497,6 +516,13 @@ class HTTPClient
     @cookie_manager.save_cookies
   end
 
+  # Returns stored cookies.
+  def cookies
+    if @cookie_manager
+      @cookie_manager.cookies
+    end
+  end
+
   # Sets callback proc when HTTP redirect status is returned for get_content
   # and post_content.  default_redirect_uri_callback is used by default.
   #
@@ -516,9 +542,9 @@ class HTTPClient
   #         e.g. { "a" => "b" } => 'http://host/part?a=b'.
   #         Give an array to pass multiple value like
   #         [["a", "b"], ["a", "c"]] => 'http://host/part?a=b&a=c'.
-  # extheader:: a Hash or an Array of extra headers.  e.g.
-  #             { 'Accept' => '*/*' } or
-  #             [['Accept', 'image/jpeg'], ['Accept', 'image/png']].
+  # header:: a Hash or an Array of extra headers.  e.g.
+  #          { 'Accept' => '*/*' } or
+  #          [['Accept', 'image/jpeg'], ['Accept', 'image/png']].
   # &block:: Give a block to get chunked message-body of response like
   #          get_content(uri) { |chunked_body| ... }.
   #          Size of each chunk may not be the same.
@@ -530,8 +556,9 @@ class HTTPClient
   # If you need to get full HTTP response including HTTP status and headers,
   # use get method.  get returns HTTP::Message as a response and you need to
   # follow HTTP redirect by yourself if you need.
-  def get_content(uri, query = nil, extheader = {}, &block)
-    follow_redirect(:get, uri, query, nil, extheader, &block).content
+  def get_content(uri, *args, &block)
+    query, header = keyword_argument(args, :query, :header)
+    follow_redirect(:get, uri, query, nil, header || {}, &block).content
   end
 
   # Posts a content.
@@ -550,10 +577,10 @@ class HTTPClient
   #          [{ 'Content-Type' => 'text/plain', :content => "some text" },
   #           { 'Content-Type' => 'video/mp4', :content => File.new('video.mp4') }]
   #          => <Two parts with custom Content-Type header>
-  # extheader:: a Hash or an Array of extra headers. e.g.
-  #               { 'Accept' => '*/*' }
-  #             or
-  #               [['Accept', 'image/jpeg'], ['Accept', 'image/png']].
+  # header:: a Hash or an Array of extra headers. e.g.
+  #            { 'Accept' => '*/*' }
+  #          or
+  #            [['Accept', 'image/jpeg'], ['Accept', 'image/png']].
   # &block:: Give a block to get chunked message-body of response like
   #            post_content(uri) { |chunked_body| ... }.
   #          Size of each chunk may not be the same.
@@ -564,8 +591,9 @@ class HTTPClient
   #
   # If you need to get full HTTP response including HTTP status and headers,
   # use post method.
-  def post_content(uri, body = nil, extheader = {}, &block)
-    follow_redirect(:post, uri, nil, body, extheader, &block).content
+  def post_content(uri, *args, &block)
+    body, header = keyword_argument(args, :body, :header)
+    follow_redirect(:post, uri, nil, body, header || {}, &block).content
   end
 
   # A method for redirect uri callback.  How to use:
@@ -605,48 +633,48 @@ class HTTPClient
   end
 
   # Sends HEAD request to the specified URL.  See request for arguments.
-  def head(uri, query = nil, extheader = {})
-    request(:head, uri, query, nil, extheader)
+  def head(uri, *args)
+    request(:head, uri, argument_to_hash(args, :query, :header))
   end
 
   # Sends GET request to the specified URL.  See request for arguments.
-  def get(uri, query = nil, extheader = {}, &block)
-    request(:get, uri, query, nil, extheader, &block)
+  def get(uri, *args, &block)
+    request(:get, uri, argument_to_hash(args, :query, :header, :follow_redirect), &block)
   end
 
   # Sends POST request to the specified URL.  See request for arguments.
-  def post(uri, body = '', extheader = {}, &block)
-    request(:post, uri, nil, body, extheader, &block)
+  def post(uri, *args, &block)
+    request(:post, uri, argument_to_hash(args, :body, :header, :follow_redirect), &block)
   end
 
   # Sends PUT request to the specified URL.  See request for arguments.
-  def put(uri, body = '', extheader = {}, &block)
-    request(:put, uri, nil, body, extheader, &block)
+  def put(uri, *args, &block)
+    request(:put, uri, argument_to_hash(args, :body, :header), &block)
   end
 
   # Sends DELETE request to the specified URL.  See request for arguments.
-  def delete(uri, extheader = {}, &block)
-    request(:delete, uri, nil, nil, extheader, &block)
+  def delete(uri, *args, &block)
+    request(:delete, uri, argument_to_hash(args, :header), &block)
   end
 
   # Sends OPTIONS request to the specified URL.  See request for arguments.
-  def options(uri, extheader = {}, &block)
-    request(:options, uri, nil, nil, extheader, &block)
+  def options(uri, *args, &block)
+    request(:options, uri, argument_to_hash(args, :header), &block)
   end
 
   # Sends PROPFIND request to the specified URL.  See request for arguments.
-  def propfind(uri, extheader = PROPFIND_DEFAULT_EXTHEADER, &block)
-    request(:propfind, uri, nil, nil, extheader, &block)
+  def propfind(uri, *args, &block)
+    request(:propfind, uri, argument_to_hash(args, :header), &block)
   end
   
   # Sends PROPPATCH request to the specified URL.  See request for arguments.
-  def proppatch(uri, body = nil, extheader = {}, &block)
-    request(:proppatch, uri, nil, body, extheader, &block)
+  def proppatch(uri, *args, &block)
+    request(:proppatch, uri, argument_to_hash(args, :body, :header), &block)
   end
   
   # Sends TRACE request to the specified URL.  See request for arguments.
-  def trace(uri, query = nil, body = nil, extheader = {}, &block)
-    request('TRACE', uri, query, body, extheader, &block)
+  def trace(uri, *args, &block)
+    request('TRACE', uri, argument_to_hash(args, :query, :body, :header), &block)
   end
 
   # Sends a request to the specified URL.
@@ -673,9 +701,9 @@ class HTTPClient
   #           { 'Content-Type' => 'video/mp4', :content => File.new('video.mp4') }]
   #          => <Two parts with custom Content-Type header>
   #        See HTTP::Message.file? for actual condition of 'a file'.
-  # extheader:: a Hash or an Array of extra headers.  e.g.
-  #             { 'Accept' => '*/*' } or
-  #             [['Accept', 'image/jpeg'], ['Accept', 'image/png']].
+  # header:: a Hash or an Array of extra headers.  e.g.
+  #          { 'Accept' => '*/*' } or
+  #          [['Accept', 'image/jpeg'], ['Accept', 'image/png']].
   # &block:: Give a block to get chunked message-body of response like
   #          get(uri) { |chunked_body| ... }.
   #          Size of each chunk may not be the same.
@@ -687,77 +715,99 @@ class HTTPClient
   # chunked encoding (Transfer-Encoding: chunked in HTTP header).  Bear in mind
   # that some server application does not support chunked request.  At least
   # cgi.rb does not support it.
-  def request(method, uri, query = nil, body = nil, extheader = {}, &block)
+  def request(method, uri, *args, &block)
+    query, body, header, follow_redirect = keyword_argument(args, :query, :body, :header, :follow_redirect)
+    if [:post, :put].include?(method)
+      body ||= ''
+    end
+    if method == :propfind
+      header ||= PROPFIND_DEFAULT_EXTHEADER
+    else
+      header ||= {}
+    end
     uri = urify(uri)
     if block
       filtered_block = proc { |res, str|
         block.call(str)
       }
     end
-    do_request(method, uri, query, body, extheader, &filtered_block)
+    if follow_redirect
+      follow_redirect(method, uri, query, body, header, &block)
+    else
+      do_request(method, uri, query, body, header, &filtered_block)
+    end
   end
 
   # Sends HEAD request in async style.  See request_async for arguments.
   # It immediately returns a HTTPClient::Connection instance as a result.
-  def head_async(uri, query = nil, extheader = {})
-    request_async(:head, uri, query, nil, extheader)
+  def head_async(uri, *args)
+    query, header = keyword_argument(args, :query, :header)
+    request_async(:head, uri, query, nil, header || {})
   end
 
   # Sends GET request in async style.  See request_async for arguments.
   # It immediately returns a HTTPClient::Connection instance as a result.
-  def get_async(uri, query = nil, extheader = {})
-    request_async(:get, uri, query, nil, extheader)
+  def get_async(uri, *args)
+    query, header = keyword_argument(args, :query, :header)
+    request_async(:get, uri, query, nil, header || {})
   end
 
   # Sends POST request in async style.  See request_async for arguments.
   # It immediately returns a HTTPClient::Connection instance as a result.
-  def post_async(uri, body = nil, extheader = {})
-    request_async(:post, uri, nil, body, extheader)
+  def post_async(uri, *args)
+    body, header = keyword_argument(args, :body, :header)
+    request_async(:post, uri, nil, body || '', header || {})
   end
 
   # Sends PUT request in async style.  See request_async for arguments.
   # It immediately returns a HTTPClient::Connection instance as a result.
-  def put_async(uri, body = nil, extheader = {})
-    request_async(:put, uri, nil, body, extheader)
+  def put_async(uri, *args)
+    body, header = keyword_argument(args, :body, :header)
+    request_async(:put, uri, nil, body || '', header || {})
   end
 
   # Sends DELETE request in async style.  See request_async for arguments.
   # It immediately returns a HTTPClient::Connection instance as a result.
-  def delete_async(uri, extheader = {})
-    request_async(:delete, uri, nil, nil, extheader)
+  def delete_async(uri, *args)
+    header = keyword_argument(args, :header)
+    request_async(:delete, uri, nil, nil, header || {})
   end
 
   # Sends OPTIONS request in async style.  See request_async for arguments.
   # It immediately returns a HTTPClient::Connection instance as a result.
-  def options_async(uri, extheader = {})
-    request_async(:options, uri, nil, nil, extheader)
+  def options_async(uri, *args)
+    header = keyword_argument(args, :header)
+    request_async(:options, uri, nil, nil, header || {})
   end
 
   # Sends PROPFIND request in async style.  See request_async for arguments.
   # It immediately returns a HTTPClient::Connection instance as a result.
-  def propfind_async(uri, extheader = PROPFIND_DEFAULT_EXTHEADER)
-    request_async(:propfind, uri, nil, nil, extheader)
+  def propfind_async(uri, *args)
+    header = keyword_argument(args, :header)
+    request_async(:propfind, uri, nil, nil, header || PROPFIND_DEFAULT_EXTHEADER)
   end
   
   # Sends PROPPATCH request in async style.  See request_async for arguments.
   # It immediately returns a HTTPClient::Connection instance as a result.
-  def proppatch_async(uri, body = nil, extheader = {})
-    request_async(:proppatch, uri, nil, body, extheader)
+  def proppatch_async(uri, *args)
+    body, header = keyword_argument(args, :body, :header)
+    request_async(:proppatch, uri, nil, body, header || {})
   end
   
   # Sends TRACE request in async style.  See request_async for arguments.
   # It immediately returns a HTTPClient::Connection instance as a result.
-  def trace_async(uri, query = nil, body = nil, extheader = {})
-    request_async(:trace, uri, query, body, extheader)
+  def trace_async(uri, *args)
+    query, body, header = keyword_argument(args, :query, :body, :header)
+    request_async(:trace, uri, query, body, header || {})
   end
 
   # Sends a request in async style.  request method creates new Thread for
   # HTTP connection and returns a HTTPClient::Connection instance immediately.
   #
   # Arguments definition is the same as request.
-  def request_async(method, uri, query = nil, body = nil, extheader = {})
+  def request_async(method, uri, query = nil, body = nil, header = {})
     uri = urify(uri)
-    do_request_async(method, uri, query, body, extheader)
+    do_request_async(method, uri, query, body, header)
   end
 
   # Resets internal session for the given URL.  Keep-alive connection for the
@@ -784,7 +834,7 @@ private
     end
   end
 
-  def do_request(method, uri, query, body, extheader, &block)
+  def do_request(method, uri, query, body, header, &block)
     conn = Connection.new
     res = nil
     if HTTP::Message.file?(body)
@@ -794,7 +844,7 @@ private
     proxy = no_proxy?(uri) ? nil : @proxy
     while retry_count > 0
       body.pos = pos if pos
-      req = create_request(method, uri, query, body, extheader)
+      req = create_request(method, uri, query, body, header)
       begin
         protect_keep_alive_disconnected do
           do_get_block(req, proxy, conn, &block)
@@ -809,7 +859,7 @@ private
     res
   end
 
-  def do_request_async(method, uri, query, body, extheader)
+  def do_request_async(method, uri, query, body, header)
     conn = Connection.new
     t = Thread.new(conn) { |tconn|
       begin
@@ -820,7 +870,7 @@ private
         proxy = no_proxy?(uri) ? nil : @proxy
         while retry_count > 0
           body.pos = pos if pos
-          req = create_request(method, uri, query, body, extheader)
+          req = create_request(method, uri, query, body, header)
           begin
             protect_keep_alive_disconnected do
               do_get_stream(req, proxy, tconn)
@@ -856,7 +906,7 @@ private
     ENV[name.downcase] || ENV[name.upcase]
   end
 
-  def follow_redirect(method, uri, query, body, extheader, &block)
+  def follow_redirect(method, uri, query, body, header, &block)
     uri = urify(uri)
     if block
       filtered_block = proc { |r, str|
@@ -869,7 +919,7 @@ private
     retry_number = 0
     while retry_number < @follow_redirect_count
       body.pos = pos if pos
-      res = do_request(method, uri, query, body, extheader, &filtered_block)
+      res = do_request(method, uri, query, body, header, &filtered_block)
       if HTTP::Status.successful?(res.status)
         return res
       elsif HTTP::Status.redirect?(res.status)
@@ -893,16 +943,16 @@ private
     end
   end
 
-  def create_request(method, uri, query, body, extheader)
+  def create_request(method, uri, query, body, header)
     method = method.to_s.upcase
-    if extheader.is_a?(Hash)
-      extheader = extheader.to_a
+    if header.is_a?(Hash)
+      header = header.to_a
     else
-      extheader = extheader.dup
+      header = header.dup
     end
     boundary = nil
     if body
-      _, content_type = extheader.find { |key, value|
+      _, content_type = header.find { |key, value|
         key.downcase == 'content-type'
       }
       if content_type
@@ -912,7 +962,7 @@ private
           else
             boundary = create_boundary
             content_type = "#{content_type}; boundary=#{boundary}"
-            extheader = override_header(extheader, 'Content-Type', content_type)
+            header = override_header(header, 'Content-Type', content_type)
           end
         end
       elsif method == 'POST'
@@ -922,11 +972,11 @@ private
         else
           content_type = 'application/x-www-form-urlencoded'
         end
-        extheader << ['Content-Type', content_type]
+        header << ['Content-Type', content_type]
       end
     end
     req = HTTP::Message.new_request(method, uri, query, body, boundary)
-    extheader.each do |key, value|
+    header.each do |key, value|
       req.header.add(key, value)
     end
     if @cookie_manager && cookie = @cookie_manager.find(uri)
@@ -944,9 +994,9 @@ private
       body.any? { |k, v| HTTP::Message.file?(v) }
   end
 
-  def override_header(extheader, key, value)
+  def override_header(header, key, value)
     result = []
-    extheader.each do |k, v|
+    header.each do |k, v|
       if k.downcase == key.downcase
         result << [key, value]
       else
@@ -981,7 +1031,7 @@ private
       filter.filter_request(req)
     end
     if str = @test_loopback_response.shift
-      dump_dummy_request_response(req.body.dump, str) if @debug_dev
+      dump_dummy_request_response(req.http_body.dump, str) if @debug_dev
       conn.push(HTTP::Message.new_response(str))
       return
     end
@@ -1017,7 +1067,7 @@ private
       filter.filter_request(req)
     end
     if str = @test_loopback_response.shift
-      dump_dummy_request_response(req.body.dump, str) if @debug_dev
+      dump_dummy_request_response(req.http_body.dump, str) if @debug_dev
       conn.push(HTTP::Message.new_response(StringIO.new(str)))
       return
     end

data/lib/httpclient/auth.rb

@@ -800,8 +800,8 @@ class HTTPClient
         params += encode_param(query)
       end
       # captures HTTP Message body only for 'application/x-www-form-urlencoded'
-      if req.header.contenttype == 'application/x-www-form-urlencoded' and req.body.size
-        params += encode_param(HTTP::Message.parse(req.body.content))
+      if req.header.contenttype == 'application/x-www-form-urlencoded' and req.http_body.size
+        params += encode_param(HTTP::Message.parse(req.http_body.content))
       end
       uri = req.header.request_uri
       if uri.query

data/lib/httpclient/http.rb

@@ -378,12 +378,17 @@ module HTTP
           set('Last-Modified', @body_date.httpdate)
         end
         if self['Content-Type'].empty?
-          set('Content-Type', "#{ @body_type || 'text/html' }; charset=#{ charset_label(@body_charset || $KCODE) }")
+          set('Content-Type', "#{ @body_type || 'text/html' }; charset=#{ charset_label }")
         end
       end
 
-      def charset_label(charset)
-        CHARSET_MAP[charset] || 'us-ascii'
+      def charset_label
+        # TODO: should handle response encoding for 1.9 correctly.
+        if RUBY_VERSION > "1.9"
+          CHARSET_MAP[@body_charset] || 'us-ascii'
+        else
+          CHARSET_MAP[@body_charset || $KCODE] || 'us-ascii'
+        end
       end
     end
 
@@ -640,8 +645,8 @@ module HTTP
       # uri:: an URI that need to connect.  Only uri.host and uri.port are used.
       def new_connect_request(uri)
         m = new
-        m.header.init_connect_request(uri)
-        m.header.body_size = nil
+        m.http_header.init_connect_request(uri)
+        m.http_header.body_size = nil
         m
       end
 
@@ -660,14 +665,14 @@ module HTTP
       #            a multipart/form-data using this boundary String.
       def new_request(method, uri, query = nil, body = nil, boundary = nil)
         m = new
-        m.header.init_request(method, uri, query)
-        m.body = Body.new
-        m.body.init_request(body || '', boundary)
+        m.http_header.init_request(method, uri, query)
+        m.http_body = Body.new
+        m.http_body.init_request(body || '', boundary)
         if body
-          m.header.body_size = m.body.size
-          m.header.chunked = true if m.body.size.nil?
+          m.http_header.body_size = m.http_body.size
+          m.http_header.chunked = true if m.http_body.size.nil?
         else
-          m.header.body_size = nil
+          m.http_header.body_size = nil
         end
         m
       end
@@ -676,10 +681,10 @@ module HTTP
       # body:: a String or an IO of response message body.
       def new_response(body)
         m = new
-        m.header.init_response(Status::OK)
-        m.body = Body.new
-        m.body.init_response(body)
-        m.header.body_size = m.body.size || 0
+        m.http_header.init_response(Status::OK)
+        m.http_body = Body.new
+        m.http_body.init_response(body)
+        m.http_header.body_size = m.http_body.size || 0
         m
       end
 
@@ -820,10 +825,10 @@ module HTTP
 
 
     # HTTP::Message::Headers:: message header.
-    attr_accessor :header
+    attr_accessor :http_header
 
     # HTTP::Message::Body:: message body.
-    attr_reader :body
+    attr_reader :http_body
 
     # OpenSSL::X509::Certificate:: response only.  server certificate which is
     #                              used for retrieving the response.
@@ -833,18 +838,18 @@ module HTTP
     # Use Message.new_connect_request, Message.new_request or
     # Message.new_response instead.
     def initialize # :nodoc:
-      @header = Headers.new
-      @body = @peer_cert = nil
+      @http_header = Headers.new
+      @http_body = @peer_cert = nil
     end
 
     # Dumps message (header and body) to given dev.
     # dev needs to respond to <<.
     def dump(dev = '')
-      str = header.dump + CRLF
-      if header.chunked
-        dev = body.dump_chunked(str, dev)
-      elsif body
-        dev = body.dump(str, dev)
+      str = @http_header.dump + CRLF
+      if @http_header.chunked
+        dev = @http_body.dump_chunked(str, dev)
+      elsif @http_body
+        dev = @http_body.dump(str, dev)
       else
         dev << str
       end
@@ -852,35 +857,35 @@ module HTTP
     end
 
     # Sets a new body.  header.body_size is updated with new body.size.
-    def body=(body)
-      @body = body
-      @header.body_size = @body.size if @header
+    def http_body=(body)
+      @http_body = body
+      @http_header.body_size = @http_body.size if @http_header
     end
 
     # Returns HTTP version in a HTTP header.  String.
     def http_version
-      @header.http_version
+      @http_header.http_version
     end
 
     # Sets HTTP version in a HTTP header.  String.
     def http_version=(http_version)
-      @header.http_version = http_version
+      @http_header.http_version = http_version
     end
 
     VERSION_WARNING = 'Message#version (Float) is deprecated. Use Message#http_version (String) instead.'
     def version
       warn(VERSION_WARNING)
-      @header.http_version.to_f
+      @http_header.http_version.to_f
     end
 
     def version=(version)
       warn(VERSION_WARNING)
-      @header.http_version = version
+      @http_header.http_version = version
     end
 
     # Returns HTTP status code in response.  Integer.
     def status
-      @header.status_code
+      @http_header.status_code
     end
 
     alias code status
@@ -889,32 +894,58 @@ module HTTP
     # Sets HTTP status code of response.  Integer.
     # Reason phrase is updated, too.
     def status=(status)
-      @header.status_code = status
+      @http_header.status_code = status
     end
 
     # Returns  HTTP status reason phrase in response.  String.
     def reason
-      @header.reason_phrase
+      @http_header.reason_phrase
     end
 
     # Sets  HTTP status reason phrase of response.  String.
     def reason=(reason)
-      @header.reason_phrase = reason
+      @http_header.reason_phrase = reason
     end
 
     # Sets 'Content-Type' header value.  Overrides if already exists.
     def contenttype
-      @header.contenttype
+      @http_header.contenttype
     end
 
     # Returns 'Content-Type' header value.
     def contenttype=(contenttype)
-      @header.contenttype = contenttype
+      @http_header.contenttype = contenttype
     end
 
     # Returns a content of message body.  A String or an IO.
     def content
-      @body.content
+      @http_body.content
+    end
+
+    alias header http_header
+    alias body content
+
+    # Returns Hash of header. key and value are both String. Each key has a
+    # single value so you can't extract exact value when a message has multiple
+    # headers like 'Set-Cookie'. Use header['Set-Cookie'] for that purpose.
+    # (It returns an Array always)
+    def headers
+      Hash[http_header.all]
+    end
+
+    # Extracts cookies from 'Set-Cookie' header.
+    # Supports 'Set-Cookie' in response header only.
+    # Do we need 'Cookie' support in request header?
+    def cookies
+      set_cookies = http_header['set-cookie']
+      unless set_cookies.empty?
+        uri = http_header.request_uri
+        set_cookies.map { |str|
+          cookie = WebAgent::Cookie.new
+          cookie.parse(str, uri)
+          cookie
+        }
+      end
     end
   end
 

data/lib/httpclient/session.rb

@@ -152,7 +152,7 @@ class HTTPClient
     end
 
     def query(req, via_proxy)
-      req.body.chunk_size = @chunk_size
+      req.http_body.chunk_size = @chunk_size
       sess = open(req.header.request_uri, via_proxy)
       begin
         sess.query(req)
@@ -812,7 +812,7 @@ class HTTPClient
           close
         end
       end
-      @next_connection = false unless @content_length
+      @next_connection = false if !@content_length and !@chunked
     end
 
     StatusParseRegexp = %r(\AHTTP/(\d+\.\d+)\s+(\d\d\d)\s*([^\r\n]+)?\r?\n\z)

data/lib/httpclient/ssl_config.rb

@@ -21,7 +21,7 @@ class HTTPClient
   # == Trust Anchor Control
   #
   # SSLConfig loads 'httpclient/cacert.p7s' as a trust anchor
-  # (trusted certificate(s)) with set_trust_ca in initialization time.
+  # (trusted certificate(s)) with add_trust_ca in initialization time.
   # This means that HTTPClient instance trusts some CA certificates by default,
   # like Web browsers.  'httpclient/cacert.p7s' is created by the author and
   # included in released package.
@@ -29,7 +29,7 @@ class HTTPClient
   # 'cacert.p7s' is automatically generated from JDK 1.6.
   #
   # You may want to change trust anchor by yourself.  Call clear_cert_store
-  # then set_trust_ca for that purpose.
+  # then add_trust_ca for that purpose.
   class SSLConfig
     include OpenSSL if SSLEnabled
 
@@ -82,7 +82,7 @@ class HTTPClient
       @timeout = nil
       @options = defined?(SSL::OP_ALL) ? SSL::OP_ALL | SSL::OP_NO_SSLv2 : nil
       @ciphers = "ALL:!ADH:!LOW:!EXP:!MD5:+SSLv2:@STRENGTH"
-      load_cacerts
+      @cacerts_loaded = false
     end
 
     # Sets certificate (OpenSSL::X509::Certificate) for SSL client
@@ -122,6 +122,7 @@ class HTTPClient
     #
     # Calling this method resets all existing sessions.
     def clear_cert_store
+      @cacerts_loaded = true # avoid lazy override
       @cert_store = X509::Store.new
       change_notify
     end
@@ -131,6 +132,7 @@ class HTTPClient
     #
     # Calling this method resets all existing sessions.
     def cert_store=(cert_store)
+      @cacerts_loaded = true # avoid lazy override
       @cert_store = cert_store
       change_notify
     end
@@ -142,7 +144,8 @@ class HTTPClient
     #                               trusted certificate files.
     #
     # Calling this method resets all existing sessions.
-    def set_trust_ca(trust_ca_file_or_hashed_dir)
+    def add_trust_ca(trust_ca_file_or_hashed_dir)
+      @cacerts_loaded = true # avoid lazy override
       if FileTest.directory?(trust_ca_file_or_hashed_dir)
         @cert_store.add_path(trust_ca_file_or_hashed_dir)
       else
@@ -150,13 +153,21 @@ class HTTPClient
       end
       change_notify
     end
+    alias set_trust_ca add_trust_ca
+
+    # Loads default trust anchors.
+    # Calling this method resets all existing sessions.
+    def load_trust_ca
+      load_cacerts
+      change_notify
+    end
 
     # Adds CRL for verification.
     # crl:: a OpenSSL::X509::CRL or a filename of a PEM/DER formatted
     #       OpenSSL::X509::CRL.
     #
     # Calling this method resets all existing sessions.
-    def set_crl(crl)
+    def add_crl(crl)
       unless crl.is_a?(X509::CRL)
         crl = X509::CRL.new(File.open(crl) { |f| f.read })
       end
@@ -164,6 +175,7 @@ class HTTPClient
       @cert_store.flags = X509::V_FLAG_CRL_CHECK | X509::V_FLAG_CRL_CHECK_ALL
       change_notify
     end
+    alias set_crl add_crl
 
     # Sets verify mode of OpenSSL.  New value must be a combination of
     # constants OpenSSL::SSL::VERIFY_*
@@ -223,6 +235,8 @@ class HTTPClient
 
     # interfaces for SSLSocketWrap.
     def set_context(ctx) # :nodoc:
+      load_trust_ca unless @cacerts_loaded
+      @cacerts_loaded = true
       # Verification: Use Store#verify_callback instead of SSLContext#verify*?
       ctx.cert_store = @cert_store
       ctx.verify_mode = @verify_mode
@@ -350,7 +364,7 @@ class HTTPClient
           store = X509::Store.new
           store.add_cert(selfcert)
           if (p7.verify(nil, store, p7.data, 0))
-            set_trust_ca(file)
+            add_trust_ca(file)
             return
           end
         end

data/lib/httpclient/timeout.rb

@@ -23,6 +23,7 @@ class HTTPClient
   #   timeout scheduler.
   # * Do not wakeup the scheduler thread so often.  Let scheduler thread sleep
   #   until the nearest period.
+if !defined?(JRUBY_VERSION) and RUBY_VERSION < '1.9'
   class TimeoutScheduler
 
     # Represents timeout period.
@@ -117,6 +118,7 @@ class HTTPClient
     end
   end
   timeout_scheduler # initialize at first time.
+end
 
   module Timeout
     if !defined?(JRUBY_VERSION) and RUBY_VERSION < '1.9'

data/lib/httpclient/util.rb

@@ -43,10 +43,34 @@ class HTTPClient
     #
     def keyword_argument(args, *field)
       if args.size == 1 and args[0].is_a?(Hash)
-        args[0].values_at(*field)
-      else
-        args
+        r = args[0].values_at(*field)
+        unless r.compact.empty?
+          return r
+        end
+      end
+      args
+    end
+
+    # Keyword argument to hash helper.
+    # args:: given arguments.
+    # *field:: a list of arguments to be extracted.
+    #
+    # Returns hash which has defined keys. When a Hash given, returns it
+    # including undefined keys. When an Array given, returns a Hash which only
+    # includes defined keys.
+    def argument_to_hash(args, *field)
+      return nil if args.empty?
+      if args.size == 1 and args[0].is_a?(Hash)
+        r = args[0].values_at(*field)
+        unless r.compact.empty?
+          return args[0]
+        end
+      end
+      h = {}
+      field.each_with_index do |e, idx|
+        h[e] = args[idx]
       end
+      h
     end
 
     # Gets an URI instance.

metadata

@@ -2,7 +2,7 @@
 name: httpclient
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.7.2
+  version: 2.2.0
 platform: ruby
 authors: 
 - NAKAMURA, Hiroshi
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 +09:00
-default_executable: 
+date: 2011-04-08 00:00:00 Z
 dependencies: []
 
 description: 
@@ -49,7 +48,6 @@ files:
 - lib/httpclient/util.rbc
 - lib/httpclient/http.rb
 - lib/httpclient.rb
-has_rdoc: true
 homepage: http://github.com/nahi/httpclient
 licenses: []
 
@@ -73,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.1
 signing_key: 
 specification_version: 3
 summary: gives something like the functionality of libwww-perl (LWP) in Ruby