nethttputils 0.3.2.1 → 0.3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: be5755b14b4796da9b7dcf94680280a6fc9b4a0ade93a3d28e2220790f777943
-  data.tar.gz: a5aeb671b813d2dd6ec7c1a835a228ce60bdc8f82a1ae42473fc3c11a626cfc4
+SHA1:
+  metadata.gz: ec41b21545731116bc0725bf44119fef0426b335
+  data.tar.gz: 2d1d9a34358628a0710f57ebdb49d2680ba17333
 SHA512:
-  metadata.gz: 292acc0a8a6caa59aba16fe703ccbceeebf872e6f7bbe6ce4aaa0a04e7b89565442ccd372d3745fc7309071ed66fdc93bb884217f30796963cdd2019e43f11db
-  data.tar.gz: '08f624ffd64a57f9e46f8883e3bca9856f5bf44bee3868892fa555beae265c5b8d4b781bb6377da94997b6237a1969daf22a515dbe73e06eeda6244d33ef710e'
+  metadata.gz: 6d41944dc91ce2825d8b8095091f94792e4c1760f554ae5914320fa545063311a221222261aee19f85a5f34c97a16dec1176e034a5bff3753a061b0554d6b0a2
+  data.tar.gz: 884d389aebd0be39b04c9dd811276d5d3e3c8410c3e21e32d971ce99dc9fcb7935cb91a5f9cc85874cf0d4d9606797b3b2ea72a5caa34114cf2b0bf2a2ead125

data/lib/nethttputils.rb

@@ -95,14 +95,15 @@ module NetHTTPUtils
         retry
       end.tap do |http|
         http.instance_variable_set :@uri, uri
-        http.instance_variable_set :@http, nil
-        http.define_singleton_method :read do |mtd = :GET, type = :form, form: {}, header: {}, auth: nil, timeout: 30,
-            max_read_retry_delay: 3600,
-            patch_request: nil,
-            &block|
+        http.instance_variable_set :@max_start_http_retry_delay, max_start_http_retry_delay
+      end
+    end
 
+    private
+    def read http, mtd = :GET, type = :form, form: {}, header: {}, auth: nil, timeout: 30, max_read_retry_delay: 3600, patch_request: nil, &block
           logger = NetHTTPUtils.logger
 
+          uri = http.instance_variable_get :@uri
           logger.warn "Warning: query params included in `url` argument 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"
 
@@ -142,15 +143,17 @@ module NetHTTPUtils
               logger.info "> #{request.class} #{uri.host} #{request.path}"
               next unless logger.debug?
               logger.debug "content-length: #{request.content_length.to_i}, content-type: #{request.content_type}" unless %i{ HEAD GET }.include? mtd
+              logger.debug "query: #{uri.query.inspect}"
+              logger.debug "content-type: #{request.content_type.inspect}"
               curl_form = case request.content_type
                 when "application/json" ; "-d #{JSON.dump form} "
                 when "multipart/form-data" ; form.map{ |k, v| "-F \"#{k}=#{v.respond_to?(:to_path) ? "@#{v.to_path}" : v}\" " }.join
                 when "application/x-www-form-urlencoded" ; "-d \"#{URI.encode_www_form form}\" "
                 else %i{ HEAD GET }.include?(mtd) ? "" : fail("unknown content-type '#{request.content_type}'")
               end
-              logger.debug "curl -vsSL --compressed -o /dev/null #{
+              logger.debug "curl -vsSL --compressed -o /dev/null #{"-X HEAD " if request.is_a? Net::HTTP::Head}#{
                 request.each_header.map{ |k, v| "-H \"#{k}: #{v}\" " unless k == "host" }.join
-              }#{curl_form}'#{url.gsub "&", "\\\\&"}#{"?#{uri.query}" if uri.query && uri.query.empty?}'"
+              }#{curl_form}'#{uri.scheme}://#{uri.host}#{uri.path}#{"?#{uri.query}" if uri.query && !uri.query.empty?}'"
               logger.debug "> header: #{request.each_header.to_a}"
               logger.debug "> body: #{request.body.inspect.tap{ |body| body[997..-1] = "..." if body.size > 500 }}"
               # TODO this is buggy -- mixes lines from different files into one line
@@ -162,7 +165,6 @@ module NetHTTPUtils
               logger.debug stack.join " -> "
             end
           end
-          http = instance_variable_get(:@http) || self
           do_request = lambda do |request|
             delay = 5
             response = begin
@@ -204,7 +206,6 @@ module NetHTTPUtils
               logger.debug "set-cookie: #{k}=#{v[/[^;]+/]}"
               cookies.store k, v[/[^;]+/]
             end
-            logger.debug "< header: #{response.to_hash}"
             case response.code
             when /\A30\d\z/
               logger.info "redirect: #{response["location"]}"
@@ -215,9 +216,12 @@ module NetHTTPUtils
                  http.use_ssl? != (new_uri.scheme == "https")
                 logger.debug "changing host from '#{http.address}' to '#{new_host}'"
                 # http.finish
-                instance_variable_set :@http, NetHTTPUtils.start_http(new_uri, max_start_http_retry_delay, timeout)
+                http = NetHTTPUtils.start_http new_uri, http.instance_variable_get(:@max_start_http_retry_delay), timeout
+              end
+              if request.method == "POST"
+                logger.info "POST redirects to GET (RFC)"
+                mtd = :GET
               end
-              mtd = :GET
               do_request.call prepare_request[new_uri]
             when "404"
               logger.error "404 at #{request.method} #{request.uri} with body: #{
@@ -251,9 +255,7 @@ module NetHTTPUtils
             when /\A20/
               response
             else
-              logger.warn "code #{response.code} at #{request.method} #{request.uri}#{
-                " and so #{url}" if request.uri.to_s != url
-              } from #{
+              logger.warn "code #{response.code} at #{request.method} #{request.uri} from #{
                 [__FILE__, caller.map{ |i| i[/(?<=:)\d+/] }].join ?:
               }"
               logger.debug "< body: #{
@@ -268,10 +270,8 @@ module NetHTTPUtils
           cookies.each{ |k, v| response.add_field "Set-Cookie", "#{k}=#{v};" }
           logger.debug "< header: #{response.to_hash}"
           (response.body || "").tap{ |r| r.instance_variable_set :@last_response, response }
-
-        end
-      end
     end
+    public
 
     def request_data http, mtd = :GET, type = :form, form: {}, header: {}, auth: nil, timeout: 30,
         max_start_http_retry_delay: 3600,
@@ -297,7 +297,7 @@ module NetHTTPUtils
       require "set"
       @@_405 ||= Set.new
       if mtd == :GET && !@@_405.include?(http.address)
-        body = request_data http, :HEAD, auth: auth,
+        body = request_data http, :HEAD, header: header, auth: auth,
           max_start_http_retry_delay: max_start_http_retry_delay,
           max_read_retry_delay: max_read_retry_delay
         if "405" == body.instance_variable_get(:@last_response).code
@@ -306,7 +306,7 @@ module NetHTTPUtils
           check_code.call body
         end
       end
-      body = http.read mtd, type, form: form, header: header, auth: auth, timeout: timeout,
+      body = read http, mtd, type, form: form, header: header, auth: auth, timeout: timeout,
         max_read_retry_delay: max_read_retry_delay,
         patch_request: patch_request, &block
       check_code.call body
@@ -332,6 +332,7 @@ if $0 == __FILE__
   NetHTTPUtils.logger.level = Logger::DEBUG
   require "pp"
 
+  NetHTTPUtils.request_data("https://goo.gl/ySqUb5")  # this will fail if domain redirects are broken
 
   require "webrick"
   require "json"
@@ -385,11 +386,11 @@ if $0 == __FILE__
       raise unless e.code == code
     end
   end
-  fail unless NetHTTPUtils.start_http("http://httpstat.us/400").read == "400 Bad Request"
-  fail unless NetHTTPUtils.start_http("http://httpstat.us/404").read == "404 Not Found"
-  fail unless NetHTTPUtils.start_http("http://httpstat.us/500").read == "500 Internal Server Error"
-  fail unless NetHTTPUtils.start_http("http://httpstat.us/502").read == "502 Bad Gateway"
-  fail unless NetHTTPUtils.start_http("http://httpstat.us/503").read == "503 Service Unavailable"
+  fail unless NetHTTPUtils.method(:read).call(NetHTTPUtils.start_http("http://httpstat.us/400")) == "400 Bad Request"
+  fail unless NetHTTPUtils.method(:read).call(NetHTTPUtils.start_http("http://httpstat.us/404")) == "404 Not Found"
+  fail unless NetHTTPUtils.method(:read).call(NetHTTPUtils.start_http("http://httpstat.us/500")) == "500 Internal Server Error"
+  fail unless NetHTTPUtils.method(:read).call(NetHTTPUtils.start_http("http://httpstat.us/502")) == "502 Bad Gateway"
+  fail unless NetHTTPUtils.method(:read).call(NetHTTPUtils.start_http("http://httpstat.us/503")) == "503 Service Unavailable"
   [
     ["https://imgur.com/a/cccccc"],
     ["https://imgur.com/mM4Dh7Z"],

data/nethttputils.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nethttputils"
-  spec.version      = "0.3.2.1"
+  spec.version      = "0.3.2.2"
   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.3.2.1
+  version: 0.3.2.2
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2019-01-20 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 --
@@ -51,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: this tool is like a pet that I adopted young and now I depend on, sorry