nethttputils 0.3.1.0 → 0.3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d553d1c931adfe28123f8c57313a0817d88f1396
-  data.tar.gz: 15527b1fc760308058e0bf48d7cdff662d681ae6
+SHA256:
+  metadata.gz: dbd1ca6e3281c7f96be6d420512c69b4de18f5c42d06f2ac7b7641ed03a1b27e
+  data.tar.gz: 22dae6fd0d8304246db829fe7408b496047514731775169f3899aebbba2cbbf3
 SHA512:
-  metadata.gz: 4417fc854b1f76bdc96d06e5b44e5c0f4f1e709fadf2360b9e9059c42721121c78d48b9a4126a821400620a072035aaca7b88abd81320ae2fd55d9b397257769
-  data.tar.gz: c3ba3f3bb0efb29f88a2d42f792be19b2793ec51afec179dd36cf5403116a8bbb8dcc0511af637f9478eb29acde7ec566036a809295934df2dd85f6cf1e9cf66
+  metadata.gz: a2a4f3d7378a86797bdb1aa0bac71c1c5a37953f1e95d79c9f4e29bcc1900b33eb078fea2d38d1b9bbb1937d947832e4c7c73220f1ebdd3d0b6a6dc152f6e90c
+  data.tar.gz: 3d090b3ffd767e60a692427db61c39276587bbe15c117623e212340866321bfa6d58bcc17227b47dfc60504c1ec57317020bedc8e4d7495cc779968876a4d302

data/lib/nethttputils.rb

@@ -95,6 +95,7 @@ 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,
@@ -135,7 +136,7 @@ module NetHTTPUtils
                   else       ; raise "unknown content-type '#{type}'"
                 end
               end
-              header.each{ |k, v| request[k.to_s] = v }
+              header.each{ |k, v| request[k.to_s] = v.is_a?(Array) ? v.first : v }
               request["cookie"] = [*request["cookie"], cookies.map{ |k, v| "#{k}=#{v}" }].join "; " unless cookies.empty?
 
               logger.info "> #{request.class} #{uri.host} #{request.path}"
@@ -161,7 +162,7 @@ module NetHTTPUtils
               logger.debug stack.join " -> "
             end
           end
-          http = NetHTTPUtils.start_http url, max_start_http_retry_delay, timeout
+          http = instance_variable_get(:@http) || self
           do_request = lambda do |request|
             delay = 5
             response = begin
@@ -205,7 +206,7 @@ module NetHTTPUtils
             end
             logger.debug "< header: #{response.to_hash}"
             case response.code
-            when /\A3\d\d\z/
+            when /\A30\d\z/
               logger.info "redirect: #{response["location"]}"
               new_uri = URI.join request.uri, URI.escape(response["location"])
               new_host = new_uri.host
@@ -214,18 +215,21 @@ module NetHTTPUtils
                  http.use_ssl? != (new_uri.scheme == "https")
                 logger.debug "changing host from '#{http.address}' to '#{new_host}'"
                 # http.finish
-                http = NetHTTPUtils.start_http new_uri, max_start_http_retry_delay, timeout
+                instance_variable_set :@http, NetHTTPUtils.start_http(new_uri, max_start_http_retry_delay, timeout)
               end
+              mtd = :GET
               do_request.call prepare_request[new_uri]
             when "404"
               logger.error "404 at #{request.method} #{request.uri} with body: #{
-                if response.body.is_a? Net::ReadAdapter
-                  "impossible to reread Net::ReadAdapter -- check the IO you've used in block form"
+                if !response.body
+                  response.body.class
+                elsif response.body.is_a? Net::ReadAdapter
+                  "<<impossible to reread Net::ReadAdapter -- check the IO you've used in block form>>"
                 elsif response.to_hash["content-type"] == ["image/png"]
                   response.to_hash["content-type"].to_s
                 else
                   response.body.tap do |body|
-                    body.replace remove_tags body if body[/<html[> ]/]
+                    body.replace NetHTTPUtils.remove_tags body if body[/<html[> ]/]
                   end.inspect
                 end
               }"
@@ -235,9 +239,13 @@ module NetHTTPUtils
               response
             when /\A50\d\z/
               logger.error "#{response.code} at #{request.method} #{request.uri} with body: #{
-                response.body.tap do |body|
-                  body.replace remove_tags body if body[/<html[> ]/]
-                end.inspect
+                if !response.body
+                  response.body.class
+                else
+                  response.body.tap do |body|
+                    body.replace NetHTTPUtils.remove_tags body if body[/<html[> ]/]
+                  end.inspect
+                end
               }"
               response
             when /\A20/
@@ -250,13 +258,13 @@ module NetHTTPUtils
               }"
               logger.debug "< body: #{
                 response.body.tap do |body|
-                  body.replace remove_tags body if body[/<html[> ]/]
+                  body.replace NetHTTPUtils.remove_tags body if body[/<html[> ]/]
                 end.inspect
-              }"
+              }" if request.is_a? Net::HTTP::Get
               response
             end
           end
-          response = do_request[prepare_request[uri]]
+          response = do_request.call prepare_request[uri]
           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 }
@@ -271,25 +279,42 @@ module NetHTTPUtils
         patch_request: nil, &block
       http = start_http http, max_start_http_retry_delay, timeout unless http.is_a? Net::HTTP
       path = http.instance_variable_get(:@uri).path
-      if mtd == :GET
-        head = http.head path, header
-        raise Error.new(
-          (head.to_hash["content-type"] == ["image/png"] ? head.to_hash["content-type"] : head.body),
-          head.code.to_i
-        ) unless head.code[/\A(20\d|3\d\d)\z/]
+
+      check_code = lambda do |body|
+        fail unless code = body.instance_variable_get(:@last_response).code
+        case code
+          # TODO: raise on 405
+          when /\A(20\d|3\d\d|405)\z/
+            nil
+          else
+            ct = body.instance_variable_get(:@last_response).to_hash.fetch("content-type")
+            raise Error.new(
+              (ct == ["image/png"] ? ct : body),
+              code.to_i
+            )
+        end
+      end
+      require "set"
+      @@_405 ||= Set.new
+      if mtd == :GET && !@@_405.include?(http.address)
+        body = request_data http, :HEAD, 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
+          @@_405.add http.address
+        else
+          check_code.call body
+        end
       end
       body = http.read 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
+
       last_response = body.instance_variable_get :@last_response
       if last_response.to_hash["content-encoding"] == "gzip"
         Zlib::GzipReader.new(StringIO.new(body)).read
       else
         body
       end.tap do |string|
-        string.instance_variable_set :@code, last_response.code
-        string.instance_variable_set :@uri_path, path   # useless?
-        string.instance_variable_set :@header, last_response.to_hash
       end
     # ensure
     #   response.instance_variable_get("@nethttputils_close").call if response
@@ -302,6 +327,7 @@ end
 if $0 == __FILE__
   STDOUT.sync = true
   print "self testing... "
+  NetHTTPUtils.logger.level = Logger::DEBUG
   require "pp"
 
 
@@ -312,17 +338,17 @@ if $0 == __FILE__
   server = WEBrick::HTTPServer.new Port: 8000
   stack = []
   server.mount_proc ?/ do |req, res|
-    stack.push req.request_method
+    p stack.push req.request_method
   end
   t = Thread.new{ server.start }
   NetHTTPUtils.start_http("http://localhost:8000/")
-  fail unless stack == %w{ }
+  fail stack.inspect unless stack == %w{ }
   stack.clear
   NetHTTPUtils.start_http("http://localhost:8000/").head("/")
-  fail unless stack == %w{ HEAD }
+  fail stack.inspect unless stack == %w{ HEAD }
   stack.clear
   NetHTTPUtils.request_data("http://localhost:8000/")
-  fail unless stack == %w{ HEAD GET }
+  fail stack.inspect unless stack == %w{ HEAD GET }
   server.shutdown
 
   # TODO: test that HEAD method request goes through redirects
@@ -338,11 +364,14 @@ if $0 == __FILE__
   end
   Thread.abort_on_exception = true
   Thread.new{ server.start }
-  fail unless JSON.dump(["/", %w{ accept-encoding accept user-agent host connection }]) == NetHTTPUtils.request_data("http://localhost:8000/")
-  fail unless JSON.dump(["/?1", %w{ accept-encoding accept user-agent host connection }]) == NetHTTPUtils.request_data("http://localhost:8000/?1")
-  fail unless JSON.dump(["/?1=2", %w{ accept-encoding accept user-agent host connection }]) == NetHTTPUtils.request_data("http://localhost:8000/?1=2")
-  fail unless JSON.dump(["/?1=3", %w{ accept-encoding accept user-agent host connection }]) == NetHTTPUtils.request_data("http://localhost:8000/?1=2&3=4", form: {1=>3})
-  fail unless JSON.dump(["/", %w{ accept-encoding accept user-agent host content-type connection content-length }]) == NetHTTPUtils.request_data("http://localhost:8000/", :post, form: {1=>2})
+  check = lambda do |path, headers, response|
+    fail response unless JSON.dump([path, headers]) == response
+  end
+  check["/", %w{ accept-encoding accept user-agent host connection }, NetHTTPUtils.request_data("http://localhost:8000/")]
+  check["/?1", %w{ accept-encoding accept user-agent host connection }, NetHTTPUtils.request_data("http://localhost:8000/?1")]
+  check["/?1=2", %w{ accept-encoding accept user-agent host connection }, NetHTTPUtils.request_data("http://localhost:8000/?1=2")]
+  check["/?1=3", %w{ accept-encoding accept user-agent host connection }, NetHTTPUtils.request_data("http://localhost:8000/?1=2&3=4", form: {1=>3})]
+  check["/", %w{ accept-encoding accept user-agent host content-type connection content-length }, NetHTTPUtils.request_data("http://localhost:8000/", :post, form: {1=>2})]
   server.shutdown
 
 
@@ -359,7 +388,6 @@ if $0 == __FILE__
   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"
-  NetHTTPUtils.logger.level = Logger::FATAL
   [
     ["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.1.0"
+  spec.version      = "0.3.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.3.1.0
+  version: 0.3.2.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-30 00:00:00.000000000 Z
+date: 2019-01-11 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.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: this tool is like a pet that I adopted young and now I depend on, sorry