nethttputils 0.4.1.3 → 0.4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa8c5d5ae78a7dbad64fe4d0e624666cfcbe1642
-  data.tar.gz: 8d09dcf215b50515dc6033f5ef6b6760f14c844c
+  metadata.gz: 6b310f69be9a582878a60741eb385b2cbc61884b
+  data.tar.gz: fee129582c51e0ec02abc63e318a681534edc391
 SHA512:
-  metadata.gz: c315180c06335286428ffb1aff4c41ba6b1648644dc2c41b3f199c8fe2102238e0323359590bb74db31b487e4499b27c5d9823c0a300bae1eafe9f114a62cc59
-  data.tar.gz: 07b47969d1d87ffd4bdd409b038aef316b770f5d3b4d00d7ad0faa419ac559dfa362548c5f942df3300629a6ba9f5ef630370412e73a80afaef785dfde938bb3
+  metadata.gz: d7f628d6558dbe9aa0d08125c5a294c957235858829013ac4dd655b0b28fc63e38bed1827ce35fbb9de1d66ca6acde828fa3a5d77ea90a3e08238751cab9b0ea
+  data.tar.gz: ea174acf8e166ef034d6d151b171babdb19fa3736cd23fbdb006c460deb28236f1ce33c1bbc72194d30695498ccc1292108063b6319b54eace9631a5b3e68bc7

data/lib/nethttputils.rb

@@ -101,15 +101,17 @@ module NetHTTPUtils
     end
 
     private
-    def read http, mtd = :GET, type = :form, form: {}, header: {}, auth: nil, timeout: nil, no_redirect: false, max_read_retry_delay: 3600, patch_request: nil, &block
+    def read http, mtd = :GET, type = :form, form: {}, header: {}, auth: nil, force_post: false, timeout: nil, no_redirect: false, max_read_retry_delay: 3600, patch_request: nil, &block
       timeout ||= 30
-          logger = NetHTTPUtils.logger
+      logger = NetHTTPUtils.logger
+      logger.info [mtd, http].inspect
 
           uri = http.instance_variable_get :@uri
-          logger.debug "Warning: query params included in `url` argument are discarded because `:form` isn't empty" if uri.query && !form.empty?
+      if %i{ HEAD GET }.include?(mtd = mtd.upcase) && !form.empty?  # not .upcase! because it's not defined for Symbol
+        logger.debug "Warning: query params included in `url` argument are discarded because `:form` isn't empty" if uri.query
           # we can't just merge because URI fails to parse such queries as "/?1"
-
-          uri.query = URI.encode_www_form form if %i{ HEAD GET }.include?(mtd = mtd.upcase) && !form.empty?
+        uri.query = URI.encode_www_form form
+      end
           cookies = {}
           prepare_request = lambda do |uri|
             case mtd.upcase
@@ -233,6 +235,7 @@ module NetHTTPUtils
               response.add_field "Set-Cookie", "#{k}=#{v}"
             end
 
+            logger.info "response.code = #{response.code}"
             case response.code
             when /\A20/
               response
@@ -250,8 +253,8 @@ module NetHTTPUtils
                 # http.finish   # why commented out?
                 http = NetHTTPUtils.start_http new_uri, http.instance_variable_get(:@max_start_http_retry_delay), timeout, no_redirect
               end
-              if request.method == "POST"
-                logger.info "POST redirects to GET (RFC)"
+              if !force_post && request.method == "POST"
+                logger.info "POST redirects to GET (RFC)"   # TODO: do it only on code 307; note that some servers still do 302
                 mtd = :GET
               end
               do_request.call prepare_request[new_uri]
@@ -285,8 +288,9 @@ module NetHTTPUtils
               }"
               response
             else
-              logger.warn "code #{response.code} at #{request.method} #{request.uri} from #{
-                [__FILE__, caller.map{ |i| i[/(?<=:)\d+/] }].join ?:
+              logger.warn "code #{response.code} from #{request.method} #{request.uri} at #{
+                caller_path, caller_locs = caller_locations.chunk(&:path).first
+                [caller_path, caller_locs.map(&:lineno).chunk(&:itself).map(&:first)].join ":"
               }"
               logger.debug "< body: #{
                 response.body.tap do |body|
@@ -304,7 +308,7 @@ module NetHTTPUtils
 
     require "set"
     @@_405 ||= Set.new
-    def request_data http, mtd = :GET, type = :form, form: {}, header: {}, auth: nil, proxy: nil,
+    def request_data http, mtd = :GET, type = :form, form: {}, header: {}, auth: nil, proxy: nil, force_post: false,
         timeout: nil, no_redirect: false,
         max_start_http_retry_delay: 3600,
         max_read_retry_delay: 3600,
@@ -341,7 +345,7 @@ module NetHTTPUtils
           check_code.call body
         end
       end
-      body = read http, mtd, type, form: form, header: header, auth: auth,
+      body = read http, mtd, type, form: form, header: header, auth: auth, force_post: force_post,
         timeout: timeout, no_redirect: no_redirect,
         max_read_retry_delay: max_read_retry_delay,
         patch_request: patch_request, &block
@@ -352,7 +356,6 @@ module NetHTTPUtils
         Zlib::GzipReader.new(StringIO.new(body)).read
       else
         body
-      end.tap do |string|
       end
     # ensure
     #   response.instance_variable_get("@nethttputils_close").call if response

data/nethttputils.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nethttputils"
-  spec.version      = "0.4.1.3"
+  spec.version      = "0.4.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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nethttputils
 version: !ruby/object:Gem::Version
-  version: 0.4.1.3
+  version: 0.4.2.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable