nice_http 1.8.7 → 1.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d4be3fb22aecfd4d84cb2c9384da399cf7a521742bba214f5e2746491120f4b
-  data.tar.gz: c2a143357e458385078c5e6709100d06ae473f7363282eb9c36c766618631dcf
+  metadata.gz: 0d34a54e00d6d1befdc3127bbc8a9a5c23d1d4e84cce71f5d8847db2d50ed0c7
+  data.tar.gz: 8be85233d7d4e9047f237238d27fc022d5a00572ea47d45f7e11c177f5be4721
 SHA512:
-  metadata.gz: 7e752817f9ca1b87b944904435c2a507b41cc8c76e0744ff10a4db1f21ea7009a75255d97b45d6a381cd7f1ed30d91ef1fc46371fb935e6cd18482df3867f693
-  data.tar.gz: 6269a98fa4e85bf2a9b13069d279bd58f184267b5b38342a1aa5c3cfbe855207bbacb94b91f5f22e2735426fc726326be381edaab27229f943455569ce157e3d
+  metadata.gz: 143ef9899c2ea697d7d946dd7f9b2b2b90df17f5088dc7f101aeb2b7a77d7c514ac200811703e679010acade18f3b6c42f06d1473fcc9856f22737565c68c5c6
+  data.tar.gz: 28910b261bbdfac6ab516868a8185188c3541f95a3d13576f100206566c2344a4e07b5a2e8484509da69684eac2d3910420d0b861e5451d45223b5c311bbd900

data/lib/nice_http/http_methods.rb

@@ -85,7 +85,7 @@ module NiceHttpHttpMethods
         else
           @start_time_net = Time.now if @start_time_net.nil?
           resp = @http.get(path, headers_t)
-          if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
+          if (resp.code == 401 or resp.code == 408) and @headers_orig.values.map(&:class).include?(Proc)
             try = false
             @headers_orig.each do |k,v| 
               if v.is_a?(Proc) and headers_t.key?(k)
@@ -103,14 +103,19 @@ module NiceHttpHttpMethods
         end
       rescue Exception => stack
         @logger.warn stack
-        @logger.warn "The connection seems to be closed in the host machine. Trying to reconnect"
-        @http.finish()
-        @http.start()
-        @start_time_net = Time.now if @start_time_net.nil?
-        @headers_orig.each {|k,v| headers_t[k] = v.call if v.is_a?(Proc) and headers_t.key?(k)}
-        resp = @http.get(path, headers_t)
-        data = resp.body
-        manage_response(resp, data)
+        if !@timeout.nil? and (Time.now - @start_time_net) > @timeout
+          @logger.warn "The connection seems to be closed in the host machine. Timeout."
+          return { fatal_error: "Net::ReadTimeout", code: nil, message: nil, data: "" }
+        else
+          @logger.warn "The connection seems to be closed in the host machine. Trying to reconnect"
+          @http.finish()
+          @http.start()
+          @start_time_net = Time.now if @start_time_net.nil?
+          @headers_orig.each {|k,v| headers_t[k] = v.call if v.is_a?(Proc) and headers_t.key?(k)}
+          resp = @http.get(path, headers_t)
+          data = resp.body
+          manage_response(resp, data)
+        end
       end
       if @auto_redirect and @response[:code].to_i >= 300 and @response[:code].to_i < 400 and @response.include?(:location)
         if @num_redirects <= 30
@@ -219,7 +224,7 @@ module NiceHttpHttpMethods
         else
           resp = @http.post(path, data, headers_t)
           #todo: do it also for forms and multipart
-          if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
+          if (resp.code == 401 or resp.code == 408) and @headers_orig.values.map(&:class).include?(Proc)
             try = false
             @headers_orig.each do |k,v| 
               if v.is_a?(Proc) and headers_t.key?(k)
@@ -236,12 +241,17 @@ module NiceHttpHttpMethods
         end
       rescue Exception => stack
         @logger.warn stack
-        @logger.warn "The connection seems to be closed in the host machine. Trying to reconnect"
-        @http.finish()
-        @http.start()
-        @start_time_net = Time.now if @start_time_net.nil?
-        @headers_orig.each {|k,v| headers_t[k] = v.call if v.is_a?(Proc) and headers_t.key?(k)}
-        resp, data = @http.post(path, data, headers_t)
+        if !@timeout.nil? and (Time.now - @start_time_net) > @timeout
+          @logger.warn "The connection seems to be closed in the host machine. Timeout."
+          return { fatal_error: "Net::ReadTimeout", code: nil, message: nil, data: "" }
+        else
+          @logger.warn "The connection seems to be closed in the host machine. Trying to reconnect"
+          @http.finish()
+          @http.start()
+          @start_time_net = Time.now if @start_time_net.nil?
+          @headers_orig.each {|k,v| headers_t[k] = v.call if v.is_a?(Proc) and headers_t.key?(k)}
+          resp, data = @http.post(path, data, headers_t)
+        end
       end
       manage_response(resp, data)
       if @auto_redirect and @response[:code].to_i >= 300 and @response[:code].to_i < 400 and @response.include?(:location)
@@ -315,7 +325,7 @@ module NiceHttpHttpMethods
       begin
         @start_time_net = Time.now if @start_time_net.nil?
         resp = @http.send_request("PUT", path, data, headers_t)
-        if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
+        if (resp.code == 401 or resp.code == 408) and @headers_orig.values.map(&:class).include?(Proc)
           try = false
           @headers_orig.each do |k,v| 
             if v.is_a?(Proc) and headers_t.key?(k)
@@ -331,12 +341,17 @@ module NiceHttpHttpMethods
         data = resp.body
       rescue Exception => stack
         @logger.warn stack
-        @logger.warn "The connection seems to be closed in the host machine. Trying to reconnect"
-        @http.finish()
-        @http.start()
-        @headers_orig.each {|k,v| headers_t[k] = v.call if v.is_a?(Proc) and headers_t.key?(k)}
-        @start_time_net = Time.now if @start_time_net.nil?
-        resp, data = @http.send_request("PUT", path, data, headers_t)
+        if !@timeout.nil? and (Time.now - @start_time_net) > @timeout
+          @logger.warn "The connection seems to be closed in the host machine. Timeout."
+          return { fatal_error: "Net::ReadTimeout", code: nil, message: nil, data: "" }
+        else
+          @logger.warn "The connection seems to be closed in the host machine. Trying to reconnect"
+          @http.finish()
+          @http.start()
+          @headers_orig.each {|k,v| headers_t[k] = v.call if v.is_a?(Proc) and headers_t.key?(k)}
+          @start_time_net = Time.now if @start_time_net.nil?
+          resp, data = @http.send_request("PUT", path, data, headers_t)
+        end
       end
       manage_response(resp, data)
 
@@ -396,7 +411,7 @@ module NiceHttpHttpMethods
       begin
         @start_time_net = Time.now if @start_time_net.nil?
         resp = @http.patch(path, data, headers_t)
-        if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
+        if (resp.code == 401 or resp.code == 408) and @headers_orig.values.map(&:class).include?(Proc)
           try = false
           @headers_orig.each do |k,v| 
             if v.is_a?(Proc) and headers_t.key?(k)
@@ -412,12 +427,17 @@ module NiceHttpHttpMethods
         data = resp.body
       rescue Exception => stack
         @logger.warn stack
-        @logger.warn "The connection seems to be closed in the host machine. Trying to reconnect"
-        @http.finish()
-        @http.start()
-        @headers_orig.each {|k,v| headers_t[k] = v.call if v.is_a?(Proc) and headers_t.key?(k)}        
-        @start_time_net = Time.now if @start_time_net.nil?
-        resp, data = @http.patch(path, data, headers_t)
+        if !@timeout.nil? and (Time.now - @start_time_net) > @timeout
+          @logger.warn "The connection seems to be closed in the host machine. Timeout."
+          return { fatal_error: "Net::ReadTimeout", code: nil, message: nil, data: "" }
+        else
+          @logger.warn "The connection seems to be closed in the host machine. Trying to reconnect"
+          @http.finish()
+          @http.start()
+          @headers_orig.each {|k,v| headers_t[k] = v.call if v.is_a?(Proc) and headers_t.key?(k)}        
+          @start_time_net = Time.now if @start_time_net.nil?
+          resp, data = @http.patch(path, data, headers_t)
+        end
       end
       manage_response(resp, data)
       if @auto_redirect and @response[:code].to_i >= 300 and @response[:code].to_i < 400 and @response.include?(:location)
@@ -492,7 +512,7 @@ module NiceHttpHttpMethods
         @start_time_net = Time.now if @start_time_net.nil?
         if data.to_s == ""
           resp = @http.delete(path, headers_t)
-          if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
+          if (resp.code == 401 or resp.code == 408) and @headers_orig.values.map(&:class).include?(Proc)
             try = false
             @headers_orig.each do |k,v| 
               if v.is_a?(Proc) and headers_t.key?(k)
@@ -509,7 +529,7 @@ module NiceHttpHttpMethods
           request = Net::HTTP::Delete.new(path, headers_t)
           request.body = data
           resp = @http.request(request)
-          if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
+          if (resp.code == 401 or resp.code == 408) and @headers_orig.values.map(&:class).include?(Proc)
             try = false
             @headers_orig.each do |k,v| 
               if v.is_a?(Proc) and headers_t.key?(k)
@@ -528,12 +548,17 @@ module NiceHttpHttpMethods
         data = resp.body
       rescue Exception => stack
         @logger.warn stack
-        @logger.warn "The connection seems to be closed in the host machine. Trying to reconnect"
-        @http.finish()
-        @http.start()
-        @headers_orig.each {|k,v| headers_t[k] = v.call if v.is_a?(Proc) and headers_t.key?(k)}        
-        @start_time_net = Time.now if @start_time_net.nil?
-        resp, data = @http.delete(path, headers_t)
+        if !@timeout.nil? and (Time.now - @start_time_net) > @timeout
+          @logger.warn "The connection seems to be closed in the host machine. Timeout."
+          return { fatal_error: "Net::ReadTimeout", code: nil, message: nil, data: "" }
+        else
+          @logger.warn "The connection seems to be closed in the host machine. Trying to reconnect"
+          @http.finish()
+          @http.start()
+          @headers_orig.each {|k,v| headers_t[k] = v.call if v.is_a?(Proc) and headers_t.key?(k)}        
+          @start_time_net = Time.now if @start_time_net.nil?
+          resp, data = @http.delete(path, headers_t)
+        end          
       end
       manage_response(resp, data)
 
@@ -578,7 +603,7 @@ module NiceHttpHttpMethods
       begin
         @start_time_net = Time.now if @start_time_net.nil?
         resp = @http.head(path, headers_t)
-        if resp.code == 401 and @headers_orig.values.map(&:class).include?(Proc)
+        if (resp.code == 401 or resp.code == 408) and @headers_orig.values.map(&:class).include?(Proc)
           try = false
           @headers_orig.each do |k,v| 
             if v.is_a?(Proc) and headers_t.key?(k)
@@ -594,12 +619,17 @@ module NiceHttpHttpMethods
         data = resp.body
       rescue Exception => stack
         @logger.warn stack
-        @logger.warn "The connection seems to be closed in the host machine. Trying to reconnect"
-        @http.finish()
-        @http.start()
-        @headers_orig.each {|k,v| headers_t[k] = v.call if v.is_a?(Proc) and headers_t.key?(k)}        
-        @start_time_net = Time.now if @start_time_net.nil?
-        resp, data = @http.head(path, headers_t)
+        if !@timeout.nil? and (Time.now - @start_time_net) > @timeout
+          @logger.warn "The connection seems to be closed in the host machine. Timeout."
+          return { fatal_error: "Net::ReadTimeout", code: nil, message: nil, data: "" }
+        else
+          @logger.warn "The connection seems to be closed in the host machine. Trying to reconnect"
+          @http.finish()
+          @http.start()
+          @headers_orig.each {|k,v| headers_t[k] = v.call if v.is_a?(Proc) and headers_t.key?(k)}        
+          @start_time_net = Time.now if @start_time_net.nil?
+          resp, data = @http.head(path, headers_t)
+        end
       end
       manage_response(resp, data)
       return @response

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nice_http
 version: !ruby/object:Gem::Version
-  version: 1.8.7
+  version: 1.8.8
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nice_hash