nethttputils 0.2.1.1 → 0.2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b121e7caf98fdda077b6a6ce67ef2e1277829f7c
-  data.tar.gz: 07e674c4a0871c31dd395a16708c36f6ad49d823
+  metadata.gz: ca4a5b681f2630f07305d6d9c6df59eea09e4bbf
+  data.tar.gz: 90f8e4f7d626205f0f9673b4eb2069e6bcde7df8
 SHA512:
-  metadata.gz: 20ef4802fb7b8f94cd368a9dba376de344d095143e7fc42c9bc9dbca22218ec52e20b0c203f2feabd3d1475e9ee214328df1082bef532810ba3579e65dcab59b
-  data.tar.gz: c584c61a2dcede5c3b503c45a32aa97b946c2362862edec6fd225be5b98bb8b0aa6907874835f1633376942304110992bb7df42775d4352c19e4527ec034cafa
+  metadata.gz: 6bbc62b4643d52eb8d78cd2ea83eea72888fcff29695c176f368774fa0e8fd1858bf0478c7be6ce99580223f659eef5813c3102bb11578eb6469b4b7f746b838
+  data.tar.gz: f7690fbcf2ea1ac772e768429411b4b061ccf8d8dc02ed9382ab6798a3ba8ff8be554dfbee41c3adb449a6bf3e1f8cbf4d8c79787b0e214684fd161549bedfbb

data/lib/nethttputils.rb

@@ -30,7 +30,12 @@ module NetHTTPUtils
 
     # 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, max_socketerror_retry_delay: 3600, patch_request: nil, &block
-      uri = URI.parse URI.escape url
+      uri = URI.parse begin
+        URI url
+        url
+      rescue URI::InvalidURIError
+        URI.escape url
+      end
 
       logger.warn "Warning: query params included `url` are discarded because `:form` isn't empty" if uri.query && !form.empty?
       # we can't just merge because URI fails to parse such queries as "/?1"
@@ -62,7 +67,7 @@ module NetHTTPUtils
 
           logger.info "> #{request} #{request.path}"
           next unless logger.debug?
-          logger.debug "curl -s -D - #{request.each_header.map{ |k, v| "-H \"#{k}: #{v}\" " unless k == "host" }.join}#{url.gsub "&", "\\\\&"}"
+          logger.debug "curl -vsSL -o /dev/null #{request.each_header.map{ |k, v| "-H \"#{k}: #{v}\" " unless k == "host" }.join}#{url.gsub "&", "\\\\&"}"
           logger.debug "> header: #{request.each_header.to_a}"
           logger.debug "> body: #{request.body.inspect.tap{ |body| body[100..-1] = "..." if body.size > 100 }}"
           stack = caller.reverse.map do |level|
@@ -279,7 +284,7 @@ if $0 == __FILE__
     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
+      fail NetHTTPUtils.request_data url, timeout: 5, max_read_retry_delay: -1
     rescue Net::ReadTimeout
     end
   end

data/nethttputils.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nethttputils"
-  spec.version      = "0.2.1.1"
+  spec.version      = "0.2.2.0"
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nethttputils
 version: !ruby/object:Gem::Version
-  version: 0.2.1.1
+  version: 0.2.2.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon