glebtv-httpclient 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f60ae5d8ff1599208d3444724647db9d54b8b05
-  data.tar.gz: d3cc6ddcd4da48b914b330f12f73e705928c9d6e
+  metadata.gz: 1b3a52b69fd448d0c599833a4a537da54d5e2fe0
+  data.tar.gz: c4dabdf30e8d87b39956940f1b59884635c35912
 SHA512:
-  metadata.gz: c4fb73b7d1bc0600169d1005c9cf25981db8221418fc8085c99ec34f29d371f2442002fa29d13abaff5ac170726d3a14ed4d2f88ec9310839bd9bcfe33335923
-  data.tar.gz: f7c0801250447ed0672efc01685698dcc5632ac024524ca4013684f083d1b780410cf190741e27f24654317214f3005a324eb09cce00c399a647f2fbf0b6c2ac
+  metadata.gz: f2fb7a147cf97fbd8b294378c2087b6a4756c87a86822b98d83e5dcda96698792aa9709a0c5c4636d62ce4db020ee9ff6b7f681f628ca5e094b199e094aae839
+  data.tar.gz: a26ef8ba9516957134d043da93f2411a0f237e8846998784289e7dc6d8f827eb77f94f46ef700ef7aa18dd66cbc1c5639c7be359a782687221af6c4b7165e71d

data/lib/httpclient/session.rb

@@ -982,22 +982,22 @@ class HTTPClient
       buf = HTTPClient::Util.get_buf
       while true
         len = @socket.gets(RS)
-        if len.nil? # EOF
+         if len.nil? # EOF
           close
           return
         end
         @chunk_length = len.hex
-        if @chunk_length == 0
+         if @chunk_length == 0
           @content_length = 0
           @socket.gets(RS)
           return
         end
-        timeout(@receive_timeout, ReceiveTimeoutError) do
+         timeout(@receive_timeout, ReceiveTimeoutError) do
           @socket.read(@chunk_length, buf)
           @socket.read(2) # CRLF
         end
-        unless buf.empty?
-          yield buf.slice(0, @chunk_length)
+         unless buf.empty?
+          yield buf
         end
       end
     end

data/lib/httpclient/version.rb

@@ -1,3 +1,3 @@
 class HTTPClient
-  VERSION = '3.0.1'
+  VERSION = '3.0.2' unless defined?(VERSION)
 end

data/lib/httpclient.rb

@@ -74,7 +74,7 @@ require 'httpclient/cookie'
 #
 # === Invoking other HTTP methods
 #
-# See head, get, post, put, delete, options, propfind, proppatch and trace.  
+# See head, get, post, put, delete, options, propfind, proppatch and trace.
 # It returns a HTTP::Message instance as a response.
 #
 # 1. Do HEAD request.
@@ -703,12 +703,12 @@ class HTTPClient
   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, *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, *args, &block)
     request('TRACE', uri, argument_to_hash(args, :query, :header), &block)
@@ -823,14 +823,14 @@ class HTTPClient
     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, *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, *args)
@@ -958,8 +958,13 @@ private
       body.pos = pos if pos
       res = do_request(method, uri, query, body, header, &filtered_block)
       if res.redirect?
-        method = :get if res.see_other? # See RFC2616 10.3.4
-        method = :get if res.found? # All browsers convert POST to GET on 302 redirects for historical reasons
+        # See RFC2616 10.3.4
+        # All browsers convert POST to GET on 302 redirects for historical reasons
+        if res.see_other? || res.found?
+          method = :get
+          body = ''
+          pos = nil
+        end
         uri = urify(@redirect_uri_callback.call(uri, res))
         retry_number += 1
       else
@@ -973,7 +978,7 @@ private
     if res.ok?
       return res.content
     else
-      raise BadResponseError.new("unexpected response: #{res.header.inspect}", res)
+      raise BadResponseError.new("unexpected response:\n#{res.header.dump}\n#{res.content}", res)
     end
   end
 

data/test/test_cookie.rb

@@ -137,7 +137,7 @@ class TestCookieManager < Test::Unit::TestCase
 
   def teardown()
   end
-  
+
   def test_parse()
     str = "inkid=n92b0ADOgACIgUb9lsjHqAAAHu2a; expires=Wed, 01-Dec-2010 00:00:00 GMT; path=/"
     @cm.parse(str, urify('http://www.test.jp'))
@@ -174,7 +174,7 @@ class TestCookieManager < Test::Unit::TestCase
     assert_equal(true, cookie.secure?)
     assert_equal(true, cookie.http_only?)
   end
-  
+
   def test_parse_double_semicolon()
     str = "xmen=off,0,0,1;; path=\"/;;\"; domain=.excite.co.jp; expires=Wednesday, 31-Dec-2037 12:00:00 GMT"
     @cm.parse(str, urify('http://www.excite.co.jp'))
@@ -275,10 +275,10 @@ class TestCookieManager < Test::Unit::TestCase
     begin
       File.open("tmp_test.tmp","w") {|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://example.org/	key	value	0	.example.org	/	13	0			
-http://example.org/	key	value		.example.org	/	13	0			
+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://example.org/	key	value	0	.example.org	/	13	0
+http://example.org/	key	value		.example.org	/	13	0
 EOF
       }
 

data/test/test_httpclient.rb

@@ -604,9 +604,13 @@ EOS
   def test_post_content_io
     post_body = StringIO.new("1234567890")
     assert_equal('post,1234567890', @client.post_content(serverurl + 'servlet', post_body))
-    post_body = StringIO.new("1234567890")
+
     # all browsers use GET for 302
-    assert_equal('get', @client.post_content(serverurl + 'servlet_redirect', post_body))
+    post_body = StringIO.new("1234567890")
+    assert_equal('', @client.get_content(serverurl + 'servlet_redirect_413'))
+    assert_equal('', @client.post_content(serverurl + 'servlet_redirect_413', post_body))
+
+
     post_body = StringIO.new("1234567890")
     assert_equal('post,1234567890', @client.post_content(serverurl + 'servlet_temporary_redirect', post_body))
     post_body = StringIO.new("1234567890")
@@ -1614,7 +1618,8 @@ private
       :hello, :sleep, :servlet_redirect, :servlet_temporary_redirect, :servlet_see_other,
       :redirect1, :redirect2, :redirect3,
       :redirect_self, :relative_redirect, :redirect_see_other, :chunked,
-      :largebody, :status, :compressed, :charset, :continue
+      :largebody, :status, :compressed, :charset, :continue,
+      :servlet_redirect_413, :servlet_413
     ].each do |sym|
       @server.mount(
         "/#{sym}",
@@ -1648,9 +1653,19 @@ private
   def do_servlet_redirect(req, res)
     res.set_redirect(WEBrick::HTTPStatus::Found, serverurl + "servlet")
   end
+
+  def do_servlet_redirect_413(req, res)
+    res.set_redirect(WEBrick::HTTPStatus::Found, serverurl + "servlet_413")
+  end
+
+  def do_servlet_413(req, res)
+    res.body = req.body.to_s
+  end
+
   def do_servlet_temporary_redirect(req, res)
     res.set_redirect(WEBrick::HTTPStatus::TemporaryRedirect, serverurl + "servlet")
   end
+
   def do_servlet_see_other(req, res)
     res.set_redirect(WEBrick::HTTPStatus::SeeOther, serverurl + "servlet")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-httpclient
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-06-09 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: glebtv@gmail.com
@@ -18,61 +18,61 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/httpclient
-- lib/httpclient.rb
-- lib/hexdump.rb
-- lib/glebtv-httpclient.rb
+- lib/http-access2/http.rb
+- lib/http-access2/cookie.rb
+- lib/httpclient/ssl_config.rb
 - lib/httpclient/cacert.p7s
-- lib/httpclient/http.rb
-- lib/httpclient/cookie.rb
-- lib/httpclient/timeout.rb
-- lib/httpclient/version.rb
-- lib/httpclient/include_client.rb
-- lib/httpclient/auth.rb
 - lib/httpclient/connection.rb
-- lib/httpclient/ssl_config.rb
 - lib/httpclient/session.rb
+- lib/httpclient/http.rb
 - lib/httpclient/util.rb
+- lib/httpclient/version.rb
+- lib/httpclient/auth.rb
+- lib/httpclient/include_client.rb
+- lib/httpclient/timeout.rb
+- lib/httpclient/cookie.rb
+- lib/httpclient.rb
 - lib/oauthclient.rb
+- lib/hexdump.rb
+- lib/glebtv-httpclient.rb
 - lib/http-access2.rb
-- lib/http-access2/http.rb
-- lib/http-access2/cookie.rb
-- sample/cookie.rb
+- sample/ssl/1000cert.pem
+- sample/ssl/0cert.pem
+- sample/ssl/htdocs/index.html
+- sample/ssl/1000key.pem
+- sample/ssl/0key.pem
+- sample/ssl/ssl_client.rb
+- sample/ssl/webrick_httpsd.rb
+- sample/dav.rb
+- sample/howto.rb
+- sample/auth.rb
+- sample/thread.rb
+- sample/oauth_twitter.rb
 - sample/stream.rb
 - sample/async.rb
-- sample/auth.rb
+- sample/cookie.rb
 - sample/oauth_friendfeed.rb
-- sample/howto.rb
 - sample/oauth_buzz.rb
-- sample/dav.rb
-- sample/oauth_twitter.rb
-- sample/thread.rb
-- sample/ssl/1000key.pem
-- sample/ssl/0key.pem
-- sample/ssl/webrick_httpsd.rb
-- sample/ssl/1000cert.pem
-- sample/ssl/0cert.pem
-- sample/ssl/ssl_client.rb
-- sample/ssl/htdocs/index.html
 - sample/wcat.rb
-- test/test_http-access2.rb
-- test/test_auth.rb
 - test/htpasswd
+- test/sslsvr.rb
+- test/test_cookie.rb
+- test/htdigest
+- test/test_ssl.rb
+- test/subca.cert
+- test/test_http-access2.rb
+- test/test_httpclient.rb
+- test/server.key
+- test/test_hexdump.rb
 - test/helper.rb
+- test/test_auth.rb
+- test/test_include_client.rb
+- test/client.cert
 - test/ca-chain.cert
-- test/test_hexdump.rb
-- test/subca.cert
 - test/server.cert
-- test/server.key
+- test/client.key
 - test/runner.rb
-- test/test_include_client.rb
-- test/test_httpclient.rb
-- test/test_cookie.rb
-- test/sslsvr.rb
 - test/ca.cert
-- test/test_ssl.rb
-- test/htdigest
-- test/client.key
-- test/client.cert
 - README.rdoc
 homepage: http://github.com/glebtv/httpclient
 licenses: