glebtv-httpclient 3.2.8 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e431a2b363f87ec472a3c7d50656a1fcd1c054d7
-  data.tar.gz: 85a6326b3ba79941dd50b8636a99a423cd581328
+SHA256:
+  metadata.gz: c9ffbd1d6d65a599d654d899f1a2253e2c402aa7dd6113993cf2af5e00bae05b
+  data.tar.gz: f35bb6f33a7de1aa68ad516c759f3cd51d64caa1b3bc8164b34c2d065d9b55b4
 SHA512:
-  metadata.gz: eb3f3735bea1202b763ad5f32eaee8f40a16fdca132b4df1594095c06fc335ec45a7904f03a41b7342794ffde71d48e1440a051b1c2ded6f81e37f2caff9ec18
-  data.tar.gz: 7baf041485d74dc7aef7398f96690e43cf56a8e3fb211b41a50cd40ebb3a1e714d3ce9c42a1d621f77bfc2027420adbab2571f4733286f4a35326097320a30d8
+  metadata.gz: 7e990cee47554c0c29f40d6dc25e3444ad76ebd1b453f73381b1b1bd4ff08d5b2092927c6ed5632c66b210811376057f476bd5820c1914bc3344c945ca703dd2
+  data.tar.gz: 783b60d207f1c0be6737402bf03ae0a9b18da8d99fece4431ceb7effdd201d4cbc775f350d6e5e75593fe75def14f8baee055e76deb5d5c3eba933be68de624c

data/Gemfile.lock

@@ -1,65 +1,47 @@
 PATH
   remote: .
   specs:
-    glebtv-httpclient (3.2.8)
+    glebtv-httpclient (3.3.0)
       lru_redux
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.1.4)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
-    coveralls (0.7.0)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    i18n (0.6.11)
-    json (1.8.1)
-    lru_redux (0.8.1)
-    mime-types (2.3)
-    minitest (5.4.0)
-    multi_json (1.10.1)
-    netrc (0.7.7)
-    rake (10.3.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.3)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.3)
+    climate_control (0.2.0)
+    coveralls (0.8.22)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    json (2.1.0)
+    lru_redux (1.1.0)
+    rake (12.3.2)
+    rdoc (6.1.1)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.3)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.3)
-    simplecov (0.9.0)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    term-ansicolor (1.3.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tins (1.3.0)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+    thor (0.19.4)
+    tins (1.20.2)
 
 PLATFORMS
   ruby
@@ -72,3 +54,6 @@ DEPENDENCIES
   rake
   rdoc
   rspec
+
+BUNDLED WITH
+   2.0.1

data/README.md

@@ -2,9 +2,8 @@
 
 I just try to make it work properly (as a browser would) for my use cases.
 
-[![Build Status](https://travis-ci.org/glebtv/httpclient.png?branch=master)](https://travis-ci.org/glebtv/httpclient)
-[![Gem Version](https://badge.fury.io/rb/glebtv-httpclient.png)](http://badge.fury.io/rb/glebtv-httpclient)
-[![Dependency Status](https://www.versioneye.com/user/projects/534eebc9fe0d0784f30008f6/badge.png)](https://www.versioneye.com/user/projects/534eebc9fe0d0784f30008f6)
+[![Build Status](https://travis-ci.org/glebtv/httpclient.svg?branch=master)](https://travis-ci.org/glebtv/httpclient)
+[![Gem Version](https://badge.fury.io/rb/httpclient.svg)](http://badge.fury.io/rb/httpclient)
 [![Dependency Status](https://www.versioneye.com/user/projects/53e73f2b35080d699f000093/badge.svg?style=flat)](https://www.versioneye.com/user/projects/53e73f2b35080d699f000093)
 
 If you don't like how something works, please send a PR or use original gem: https://github.com/nahi/httpclient

data/lib/httpclient/session.rb

@@ -621,7 +621,7 @@ class HTTPClient
       # Use absolute URI (not absolute path) iif via proxy AND not HTTPS.
       req.header.request_absolute_uri = !@proxy.nil? and !https?(@dest)
       begin
-        timeout(@send_timeout, SendTimeoutError) do
+        Timeout.timeout(@send_timeout, SendTimeoutError) do
           set_header(req)
           req.dump(@socket)
           # flush the IO stream as IO::sync mode is false
@@ -767,7 +767,7 @@ class HTTPClient
       site = @proxy || @dest
       retry_number = 0
       begin
-        timeout(@connect_timeout, ConnectTimeoutError) do
+        Timeout.timeout(@connect_timeout, ConnectTimeoutError) do
           @socket = create_socket(site)
           if https?(@dest)
             if @socket.is_a?(LoopBackSocket)
@@ -918,7 +918,7 @@ class HTTPClient
 
     StatusParseRegexp = %r(\AHTTP/(\d+\.\d+)\s+(\d\d\d)\s*([^\r\n]+)?\r?\n\z)
     def parse_header
-      timeout(@receive_timeout, ReceiveTimeoutError) do
+      Timeout.timeout(@receive_timeout, ReceiveTimeoutError) do
         initial_line = nil
         begin
           begin
@@ -997,7 +997,7 @@ class HTTPClient
 
         maxbytes = @read_block_size
         maxbytes = @content_length if maxbytes > @content_length && @content_length > 0
-        timeout(@receive_timeout, ReceiveTimeoutError) do
+        Timeout.timeout(@receive_timeout, ReceiveTimeoutError) do
           begin
             @socket.readpartial(maxbytes, buf)
           rescue EOFError
@@ -1031,7 +1031,7 @@ class HTTPClient
           @socket.gets(RS)
           return
         end
-         timeout(@receive_timeout, ReceiveTimeoutError) do
+         Timeout.timeout(@receive_timeout, ReceiveTimeoutError) do
           @socket.read(@chunk_length, buf)
           @socket.read(2) # CRLF
         end
@@ -1049,7 +1049,7 @@ class HTTPClient
       while true
         buf = HTTPClient::Util.get_buf
 
-        timeout(@receive_timeout, ReceiveTimeoutError) do
+        Timeout.timeout(@receive_timeout, ReceiveTimeoutError) do
           begin
             @socket.readpartial(@read_block_size, buf)
           rescue EOFError

data/lib/httpclient/version.rb

@@ -1,4 +1,4 @@
 class HTTPClient
-  VERSION = '3.2.8' unless defined?(VERSION)
+  VERSION = '3.3.0' unless defined?(VERSION)
 end
 

data/spec/httpclient_spec.rb

@@ -76,7 +76,7 @@ describe 'HTTPClient' do
   end
   
   it "redirect returns not modified" do
-    timeout(2) do
+    Timeout.timeout(2) do
       @client.get(@srv.u("status"), {:status => 306}, :follow_redirect => true)
     end
   end
@@ -86,7 +86,7 @@ describe 'HTTPClient' do
       begin
         @client.proxy = "http://"
       rescue
-        expect($!.class.to_s).to match(/InvalidURIError/)
+        expect($!.class.to_s).to match(/ArgumentError/)
       end
       @client.proxy = ""
       expect(@client.proxy).to be_nil
@@ -442,7 +442,7 @@ hello"
   end
   
   it "no content" do
-    timeout(2) do
+    Timeout.timeout(2) do
       @client.get(@srv.u("status"), :status => 101)
       @client.get(@srv.u("status"), :status => 204)
       @client.get(@srv.u("status"), :status => 304)

data/test/test_httpclient.rb

@@ -83,7 +83,7 @@ class TestHTTPClient < ActiveSupport::TestCase
 
   def test_redirect_returns_not_modified
     assert_nothing_raised do
-      timeout(2) do
+      Timeout.timeout(2) do
         @client.get(serverurl + 'status', {:status => 306}, {:follow_redirect => true})
       end
     end
@@ -435,7 +435,7 @@ EOS
 
   def test_no_content
     assert_nothing_raised do
-      timeout(2) do
+      Timeout.timeout(2) do
         @client.get(serverurl + 'status', :status => 101)
         @client.get(serverurl + 'status', :status => 204)
         @client.get(serverurl + 'status', :status => 304)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-httpclient
 version: !ruby/object:Gem::Version
-  version: 3.2.8
+  version: 3.3.0
 platform: ruby
 authors:
 - glebtv
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-10 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Fork of httpclient with some fixes and patches I needed.