nethttputils 0.2.0.0 → 0.2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71be1aac2cdebb5316afe367b7b7bd2eb8b5b60d
-  data.tar.gz: 4026ab5f4299bc880b3f8c13881114f4e49c67fd
+  metadata.gz: b121e7caf98fdda077b6a6ce67ef2e1277829f7c
+  data.tar.gz: 07e674c4a0871c31dd395a16708c36f6ad49d823
 SHA512:
-  metadata.gz: 7fe70ebe65005756f847deb19f318d77ae8c46298420f869caa5d4a2cb75de826b0634f758048f8190188b7704469fa73a84435572dd585e325d62b30e26290e
-  data.tar.gz: 58debad4370c8c99abbbd149fcb02c553e674d79dcd89cd294d306f59429c7ede3e58518c4b20127107dfeb7fed5476aa25a5e8ffadc4eeabd54d9870ed44233
+  metadata.gz: 20ef4802fb7b8f94cd368a9dba376de344d095143e7fc42c9bc9dbca22218ec52e20b0c203f2feabd3d1475e9ee214328df1082bef532810ba3579e65dcab59b
+  data.tar.gz: c584c61a2dcede5c3b503c45a32aa97b946c2362862edec6fd225be5b98bb8b0aa6907874835f1633376942304110992bb7df42775d4352c19e4527ec034cafa

data/.travis.yml

@@ -0,0 +1,22 @@
+---
+language: ruby
+
+script: "ruby lib/nethttputils.rb"
+
+os:
+  - linux
+  - osx
+rvm:
+  - ruby-head
+  - 2.5
+  - 2.4
+  - 2.3
+  - 2.2
+  - 2.1
+  - 2.0
+  - jruby-head
+matrix:
+  allow_failures:
+  # something with `NetHTTPUtils.request_data("http://localhost:8000/?1=2&3=4", form: {1=>3})` test
+  - rvm: jruby-head
+    os: linux

data/lib/nethttputils.rb

@@ -29,7 +29,7 @@ module NetHTTPUtils
     end
 
     # TODO: make it private?
-    def get_response url, mtd = :GET, type = :form, form: {}, header: {}, auth: nil, timeout: 30, max_timeout_retry_delay: 3600, max_sslerror_retry_delay: 3600, max_read_retry_delay: 3600, max_econnrefused_retry_delay: 3600, patch_request: nil, &block
+    def get_response url, mtd = :GET, type = :form, form: {}, header: {}, auth: nil, timeout: 30, max_timeout_retry_delay: 3600, max_sslerror_retry_delay: 3600, max_read_retry_delay: 3600, max_econnrefused_retry_delay: 3600, max_socketerror_retry_delay: 3600, patch_request: nil, &block
       uri = URI.parse URI.escape url
 
       logger.warn "Warning: query params included `url` are discarded because `:form` isn't empty" if uri.query && !form.empty?
@@ -89,22 +89,25 @@ module NetHTTPUtils
             http
           end
         rescue Errno::ECONNREFUSED => e
-          e.message.concat " to #{uri}"
-          raise if max_econnrefused_retry_delay < delay *= 2
+          if max_econnrefused_retry_delay < delay *= 2
+            e.message.concat " to #{uri}"
+            raise
+          end
           logger.warn "retrying in #{delay} seconds because of #{e.class} '#{e.message}'"
           sleep delay
           retry
-        rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ECONNRESET, SocketError => e
-          if e.is_a?(SocketError) && e.message["getaddrinfo: "]
-            e.message.concat ": #{uri.host}"
-            raise e
-            # logger.warn "retrying in 60 seconds because of #{e.class} '#{e.message}'"
-            # sleep 60
-            # retry
-          end
+        rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ECONNRESET => e
           logger.warn "retrying in 5 seconds because of #{e.class} '#{e.message}'"
           sleep 5
           retry
+        rescue SocketError => e
+          if max_socketerror_retry_delay < delay *= 2
+            e.message.concat " to #{uri}"
+            raise e
+          end
+          logger.warn "retrying in #{delay} seconds because of #{e.class} '#{e.message}' at: #{uri}"
+          sleep delay
+          retry
         rescue Errno::ETIMEDOUT, Net::OpenTimeout => e
           raise if max_timeout_retry_delay < delay *= 2
           logger.warn "retrying in #{delay} seconds because of #{e.class} '#{e.message}' at: #{uri}"
@@ -119,7 +122,7 @@ module NetHTTPUtils
       end
       http = start_http[uri]
       do_request = lambda do |request|
-        delay = 1
+        delay = 5
         response = begin
           http.request request, &block
         rescue Errno::ECONNREFUSED, Net::ReadTimeout, Net::OpenTimeout, Zlib::BufError, Errno::ECONNRESET, OpenSSL::SSL::SSLError => e
@@ -267,11 +270,19 @@ if $0 == __FILE__
     http://www.cutehalloweencostumeideas.org/wp-content/uploads/2017/10/Niagara-Falls_04.jpg
   }.each do |url|
     begin
-      fail NetHTTPUtils.request_data url
+      fail NetHTTPUtils.request_data url, max_socketerror_retry_delay: -1
     rescue SocketError => e
       raise unless e.message["getaddrinfo: "]
     end
   end
+  %w{
+    http://www.aeronautica.difesa.it/organizzazione/REPARTI/divolo/PublishingImages/6%C2%B0%20Stormo/2013-decollo%20al%20tramonto%20REX%201280.jpg
+  }.each do |url|   # TODO: test that setting user-agent header fixes this timeout
+    begin
+      fail NetHTTPUtils.request_data url, max_read_retry_delay: -1
+    rescue Net::ReadTimeout
+    end
+  end
 
   begin
     fail NetHTTPUtils.request_data "https://oi64.tinypic.com/29z7oxs.jpg?", timeout: 5, max_timeout_retry_delay: -1

data/nethttputils.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nethttputils"
-  spec.version      = "0.2.0.0"
+  spec.version      = "0.2.1.1"
   spec.summary      = "this tool is like a pet that I adopted young and now I depend on, sorry"
   spec.description = <<-EOF
     Back in 2015 I was a guy automating things at my job and two scripts had a common need --

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nethttputils
 version: !ruby/object:Gem::Version
-  version: 0.2.0.0
+  version: 0.2.1.1
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Back in 2015 I was a guy automating things at my job and two scripts had a common need --
@@ -26,6 +26,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".travis.yml"
 - LICENSE
 - Rakefile
 - lib/nethttputils.rb