httpclient 2.2.4 → 2.2.5

data/test/test_httpclient.rb

@@ -76,10 +76,10 @@ class TestHTTPClient < Test::Unit::TestCase
     assert_equal("= Request", lines[0])
     assert_equal("! CONNECTION ESTABLISHED", lines[2])
     assert_equal("GET /hello HTTP/0.9", lines[3])
-    assert_equal("Connection: close", lines[5])
-    assert_equal("= Response", lines[6])
-    assert_match(/^hello$/, lines[7])
-    assert_match(/^world$/, lines[8])
+    assert_equal("Connection: close", lines[6])
+    assert_equal("= Response", lines[7])
+    assert_match(/^hello$/, lines[8])
+    assert_match(/^world$/, lines[9])
   end
 
   def test_protocol_version_http10
@@ -93,8 +93,24 @@ class TestHTTPClient < Test::Unit::TestCase
     assert_equal("= Request", lines[0])
     assert_equal("! CONNECTION ESTABLISHED", lines[2])
     assert_equal("GET /hello HTTP/1.0", lines[3])
-    assert_equal("Connection: close", lines[5])
-    assert_equal("= Response", lines[6])
+    assert_equal("Connection: close", lines[6])
+    assert_equal("= Response", lines[7])
+  end
+
+  def test_header_accept_by_default
+    str = ""
+    @client.debug_dev = str
+    @client.get(serverurl)
+    lines = str.split(/(?:\r?\n)+/)
+    assert_equal("Accept: */*", lines[4])
+  end
+
+  def test_header_accept
+    str = ""
+    @client.debug_dev = str
+    @client.get(serverurl, :header => {:Accept => 'text/html'})
+    lines = str.split(/(?:\r?\n)+/)
+    assert_equal("Accept: text/html", lines[4])
   end
 
   def test_host_given
@@ -105,7 +121,7 @@ class TestHTTPClient < Test::Unit::TestCase
     assert_equal("= Request", lines[0])
     assert_equal("! CONNECTION ESTABLISHED", lines[2])
     assert_equal("GET / HTTP/1.1", lines[3])
-    assert_equal("Host: localhost:#{serverport}", lines[5])
+    assert_equal("Host: localhost:#{serverport}", lines[6])
     #
     @client.reset_all
     str = ""
@@ -127,7 +143,7 @@ class TestHTTPClient < Test::Unit::TestCase
     assert_equal("= Request", lines[0])
     assert_equal("! CONNECTION ESTABLISHED", lines[2])
     assert_equal("GET / HTTP/1.1", lines[3])
-    assert_equal("Host: localhost:#{serverport}", lines[5])
+    assert_equal("Host: localhost:#{serverport}", lines[6])
     @client.protocol_version = 'HTTP/1.1'
     assert_equal('HTTP/1.1', @client.protocol_version)
     str = ""
@@ -416,7 +432,9 @@ EOS
 
   def test_redirect_relative
     @client.test_loopback_http_response << "HTTP/1.0 302 OK\nLocation: hello\n\n"
-    assert_equal('hello', @client.get_content(serverurl + 'redirect1'))
+    silent do
+      assert_equal('hello', @client.get_content(serverurl + 'redirect1'))
+    end
     #
     @client.reset_all
     @client.redirect_uri_callback = @client.method(:strict_redirect_uri_callback)
@@ -437,7 +455,9 @@ EOS
     https_url.scheme = 'https'
     @client.test_loopback_http_response << "HTTP/1.0 302 OK\nLocation: /foo\n\n"
     @client.test_loopback_http_response << "HTTP/1.0 200 OK\n\nhello"
-    assert_equal('hello', @client.get_content(https_url))
+    silent do
+      assert_equal('hello', @client.get_content(https_url))
+    end
   end
 
   def test_no_content
@@ -538,26 +558,29 @@ EOS
 
   def test_head
     assert_equal("head", @client.head(serverurl + 'servlet').header["x-head"][0])
-    res = @client.head(serverurl + 'servlet', {1=>2, 3=>4})
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    param = {'1'=>'2', '3'=>'4'}
+    res = @client.head(serverurl + 'servlet', param)
+    assert_equal(param, params(res.header["x-query"][0]))
   end
 
   def test_head_async
-    conn = @client.head_async(serverurl + 'servlet', {1=>2, 3=>4})
+    param = {'1'=>'2', '3'=>'4'}
+    conn = @client.head_async(serverurl + 'servlet', param)
     Thread.pass while !conn.finished?
     res = conn.pop
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    assert_equal(param, params(res.header["x-query"][0]))
   end
 
   def test_get
     assert_equal("get", @client.get(serverurl + 'servlet').content)
-    res = @client.get(serverurl + 'servlet', {1=>2, 3=>4})
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    param = {'1'=>'2', '3'=>'4'}
+    res = @client.get(serverurl + 'servlet', param)
+    assert_equal(param, params(res.header["x-query"][0]))
     assert_nil(res.contenttype)
     #
     url = serverurl.to_s + 'servlet?5=6&7=8'
-    res = @client.get(url, {1=>2, 3=>4})
-    assert_equal('1=2&3=4&5=6&7=8', res.header["x-query"][0])
+    res = @client.get(url, param)
+    assert_equal(param.merge("5"=>"6", "7"=>"8"), params(res.header["x-query"][0]))
     assert_nil(res.contenttype)
   end
 
@@ -568,10 +591,11 @@ EOS
   end
 
   def test_get_async
-    conn = @client.get_async(serverurl + 'servlet', {1=>2, 3=>4})
+    param = {'1'=>'2', '3'=>'4'}
+    conn = @client.get_async(serverurl + 'servlet', param)
     Thread.pass while !conn.finished?
     res = conn.pop
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    assert_equal(param, params(res.header["x-query"][0]))
   end
 
   def test_get_async_for_largebody
@@ -603,8 +627,9 @@ EOS
 
   def test_post
     assert_equal("post", @client.post(serverurl + 'servlet').content[0, 4])
-    res = @client.post(serverurl + 'servlet', {1=>2, 3=>4})
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    param = {'1'=>'2', '3'=>'4'}
+    res = @client.post(serverurl + 'servlet', param)
+    assert_equal(param, params(res.header["x-query"][0]))
   end
 
   def test_post_follow_redirect
@@ -614,20 +639,21 @@ EOS
   end
 
   def test_post_with_content_type
+    param = [['1', '2'], ['3', '4']]
     ext = {'content-type' => 'application/x-www-form-urlencoded', 'hello' => 'world'}
     assert_equal("post", @client.post(serverurl + 'servlet').content[0, 4], ext)
-    res = @client.post(serverurl + 'servlet', {1=>2, 3=>4}, ext)
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    res = @client.post(serverurl + 'servlet', param, ext)
+    assert_equal(Hash[param], params(res.header["x-query"][0]))
     #
     ext = [['content-type', 'multipart/form-data'], ['hello', 'world']]
     assert_equal("post", @client.post(serverurl + 'servlet').content[0, 4], ext)
-    res = @client.post(serverurl + 'servlet', {1=>2, 3=>4}, ext)
+    res = @client.post(serverurl + 'servlet', param, ext)
     assert_match(/Content-Disposition: form-data; name="1"/, res.content)
     assert_match(/Content-Disposition: form-data; name="3"/, res.content)
     #
     ext = {'content-type' => 'multipart/form-data; boundary=hello'}
     assert_equal("post", @client.post(serverurl + 'servlet').content[0, 4], ext)
-    res = @client.post(serverurl + 'servlet', {1=>2, 3=>4}, ext)
+    res = @client.post(serverurl + 'servlet', param, ext)
     assert_match(/Content-Disposition: form-data; name="1"/, res.content)
     assert_match(/Content-Disposition: form-data; name="3"/, res.content)
     assert_equal("post,--hello\r\nContent-Disposition: form-data; name=\"1\"\r\n\r\n2\r\n--hello\r\nContent-Disposition: form-data; name=\"3\"\r\n\r\n4\r\n--hello--\r\n\r\n", res.content)
@@ -643,6 +669,19 @@ EOS
     end
   end
 
+  def test_post_with_file_without_size
+    STDOUT.sync = true
+    File.open(__FILE__) do |file|
+      def file.size
+        # Simulates some strange Windows behaviour
+        raise SystemCallError.new "Unknown Error (20047)"
+      end
+      assert_nothing_raised do
+        @client.post(serverurl + 'servlet', {1=>2, 3=>file})
+      end
+    end
+  end
+
   def test_post_with_io # streaming, but not chunked
     myio = StringIO.new("X" * (HTTP::Message::Body::DEFAULT_CHUNK_SIZE + 1))
     def myio.read(*args)
@@ -677,10 +716,11 @@ EOS
   end
 
   def test_post_async
-    conn = @client.post_async(serverurl + 'servlet', {1=>2, 3=>4})
+    param = {'1'=>'2', '3'=>'4'}
+    conn = @client.post_async(serverurl + 'servlet', param)
     Thread.pass while !conn.finished?
     res = conn.pop
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    assert_equal(param, params(res.header["x-query"][0]))
   end
 
   def test_post_with_block
@@ -693,7 +733,8 @@ EOS
     assert_nil(res.content)
     #
     called = false
-    res = @client.post(serverurl + 'servlet', {1=>2, 3=>4}) { |str|
+    param = [['1', '2'], ['3', '4']]
+    res = @client.post(serverurl + 'servlet', param) { |str|
       assert_equal('post,1=2&3=4', str)
       called = true
     }
@@ -735,8 +776,9 @@ EOS
 
   def test_put
     assert_equal("put", @client.put(serverurl + 'servlet').content)
-    res = @client.put(serverurl + 'servlet', {1=>2, 3=>4})
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    param = {'1'=>'2', '3'=>'4'}
+    res = @client.put(serverurl + 'servlet', param)
+    assert_equal(param, params(res.header["x-query"][0]))
   end
 
   def test_put_bytesize
@@ -746,10 +788,11 @@ EOS
   end
 
   def test_put_async
-    conn = @client.put_async(serverurl + 'servlet', {1=>2, 3=>4})
+    param = {'1'=>'2', '3'=>'4'}
+    conn = @client.put_async(serverurl + 'servlet', param)
     Thread.pass while !conn.finished?
     res = conn.pop
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    assert_equal(param, params(res.header["x-query"][0]))
   end
 
   def test_delete
@@ -787,30 +830,34 @@ EOS
 
   def test_proppatch
     assert_equal("proppatch", @client.proppatch(serverurl + 'servlet').content)
-    res = @client.proppatch(serverurl + 'servlet', {1=>2, 3=>4})
+    param = {'1'=>'2', '3'=>'4'}
+    res = @client.proppatch(serverurl + 'servlet', param)
     assert_equal('proppatch', res.content)
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    assert_equal(param, params(res.header["x-query"][0]))
   end
 
   def test_proppatch_async
-    conn = @client.proppatch_async(serverurl + 'servlet', {1=>2, 3=>4})
+    param = {'1'=>'2', '3'=>'4'}
+    conn = @client.proppatch_async(serverurl + 'servlet', param)
     Thread.pass while !conn.finished?
     res = conn.pop
     assert_equal('proppatch', res.content.read)
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    assert_equal(param, params(res.header["x-query"][0]))
   end
 
   def test_trace
     assert_equal("trace", @client.trace(serverurl + 'servlet').content)
-    res = @client.trace(serverurl + 'servlet', {1=>2, 3=>4})
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    param = {'1'=>'2', '3'=>'4'}
+    res = @client.trace(serverurl + 'servlet', param)
+    assert_equal(param, params(res.header["x-query"][0]))
   end
 
   def test_trace_async
-    conn = @client.trace_async(serverurl + 'servlet', {1=>2, 3=>4})
+    param = {'1'=>'2', '3'=>'4'}
+    conn = @client.trace_async(serverurl + 'servlet', param)
     Thread.pass while !conn.finished?
     res = conn.pop
-    assert_equal('1=2&3=4', res.header["x-query"][0])
+    assert_equal(param, params(res.header["x-query"][0]))
   end
 
   def test_chunked
@@ -874,6 +921,13 @@ EOS
     assert_match("ABC: DEF", lines[5])
   end
 
+  def test_http_custom_date_header
+    @client.debug_dev = (str = "")
+    res = @client.get(serverurl + 'hello', :header => {'Date' => 'foo'})
+    lines = str.split(/(?:\r?\n)+/)
+    assert_equal('Date: foo', lines[4])
+  end
+
   def test_timeout
     assert_equal(60, @client.connect_timeout)
     assert_equal(120, @client.send_timeout)
@@ -1357,12 +1411,14 @@ EOS
   end
 
   def test_socket_local
-    @client.socket_local.host = 'localhost'
+    @client.socket_local.host = '127.0.0.1'
     assert_equal('hello', @client.get_content(serverurl + 'hello'))
     @client.reset_all
     @client.socket_local.port = serverport
-    assert_raises(Errno::EADDRINUSE) do
-      assert_equal('hello', @client.get_content(serverurl + 'hello'))
+    begin
+      @client.get_content(serverurl + 'hello')
+    rescue Errno::EADDRINUSE, SocketError
+      assert(true)
     end
   end
 
@@ -1412,15 +1468,6 @@ private
     @server_thread = start_server_thread(@server)
   end
 
-  def escape_env
-    env = {}
-    env.update(ENV)
-    yield
-  ensure
-    ENV.clear
-    ENV.update(env)
-  end
-
   def escape_noproxy
     backup = HTTPClient::NO_PROXY_HOSTS.dup
     HTTPClient::NO_PROXY_HOSTS.clear

data/test/test_ssl.rb

@@ -34,7 +34,7 @@ class TestSSL < Test::Unit::TestCase
     assert_nil(cfg.verify_callback)
     assert_nil(cfg.timeout)
     assert_equal(OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_SSLv2, cfg.options)
-    assert_equal("ALL:!ADH:!LOW:!EXP:!MD5:+SSLv2:@STRENGTH", cfg.ciphers)
+    assert_equal("ALL:!aNULL:!eNULL:!SSLv2", cfg.ciphers)
     assert_instance_of(OpenSSL::X509::Store, cfg.cert_store)
   end
 
@@ -155,6 +155,17 @@ end
     assert_equal("hello", @client.get_content(@url))
   end
 
+  def test_set_default_paths
+    assert_raise(OpenSSL::SSL::SSLError) do
+      @client.get(@url)
+    end
+    escape_env do
+      ENV['SSL_CERT_FILE'] = File.join(DIR, 'ca-chain.cert')
+      @client.ssl_config.set_default_paths
+      @client.get(@url)
+    end
+  end
+
 private
 
   def cert(filename)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpclient
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000 Z
+date: 2012-05-06 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nahi@ruby-lang.org
@@ -57,6 +57,7 @@ files:
 - test/server.cert
 - test/htdigest
 - test/test_ssl.rb
+- test/test_hexdump.rb
 - test/test_cookie.rb
 - test/runner.rb
 - test/htpasswd
@@ -66,8 +67,10 @@ files:
 - test/ca.cert
 - test/sslsvr.rb
 - test/subca.cert
+- test/ca-chain.cert
 - test/server.key
 - test/test_httpclient.rb
+- README.txt
 homepage: http://github.com/nahi/httpclient
 licenses: []
 post_install_message: 
@@ -80,15 +83,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3213102379838367907
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3213102379838367907
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: gives something like the functionality of libwww-perl (LWP) in Ruby