nethttputils 0.3.2.4 → 0.3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38a12dc1f12b37cdbb3094c424fcd5ab11777dd9
-  data.tar.gz: c9fc99deed5181dfc566968a4c7ab54aefe3ed9e
+  metadata.gz: bd8f869b3617b0ac419185dad8c2a63a17843e0b
+  data.tar.gz: 202eae3aaf1b2cc53eca758adcc4a103fe45f450
 SHA512:
-  metadata.gz: 503c47b1ba730c6525bd9325a8431875a0e1494ba8f87faa0a9e3e27536410b4c9640c368e1ef8ec8636a2150c867f3e6a952e8f74e11f0138ac7c5e8811e413
-  data.tar.gz: 8ca0c0f35fab0df31616d4c766029d8407a78fba6aed04f40cbad4a111dea689175c8f5c5f36de853ef85a58bf2640f5cecfb14c51e2258441893d2dcaa39195
+  metadata.gz: 5b6e931944769ed28ed65cfd1d5864137e98cece14c151c1aafbb2b5550591f51768d30a97e0a7b66de8f8894cb4008da89cd1f5963745554e6244da6e0f3d0c
+  data.tar.gz: 41afb56a5ccb929d975bc019930dab804bc1ed4e103867ba1763ac1e63275e1cabd93c2355feecb306f1161ba4fa70e56d30b1a7f232b1a2e07af4b0f9c4d801

data/lib/nethttputils.rb

@@ -289,7 +289,7 @@ module NetHTTPUtils
           else
             ct = body.instance_variable_get(:@last_response).to_hash["content-type"]
             raise Error.new(
-              (ct == ["image/png"] ? ct.first : body),
+              (ct == ["image/png"] ? "<#{ct.first}>" : body),
               code.to_i
             )
         end
@@ -297,10 +297,14 @@ module NetHTTPUtils
       require "set"
       @@_405 ||= Set.new
       if mtd == :GET && !@@_405.include?(http.address)
-        body = request_data http, :HEAD, form: form, 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
+        body = begin
+          request_data http, :HEAD, form: form, header: header, auth: auth,
+            max_start_http_retry_delay: max_start_http_retry_delay,
+            max_read_retry_delay: max_read_retry_delay
+        rescue NetHTTPUtils::Error => e
+          raise unless e.code == 400
+        end
+        if !body || "405" == body.instance_variable_get(:@last_response).code
           @@_405.add http.address
         else
           check_code.call body
@@ -332,12 +336,32 @@ 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
+  NetHTTPUtils.request_data "https://goo.gl/ySqUb5"   # this will fail if domain redirects are broken
 
   require "webrick"
   require "json"
   Thread.abort_on_exception = true
 
+  [
+    [WEBrick::HTTPStatus::NotFound, 404],
+    [WEBrick::HTTPStatus::BadRequest],
+    [WEBrick::HTTPStatus::MethodNotAllowed],
+  ].each do |webrick_exception, should_raise|
+    server = WEBrick::HTTPServer.new Port: 8000
+    server.mount_proc ?/ do |req, res|
+      res.set_error webrick_exception.new if "HEAD" == req.request_method
+    end
+    t = Thread.new{ server.start }
+    begin
+      NetHTTPUtils.request_data "http://localhost:8000/"
+      NetHTTPUtils.class_variable_get(:@@_405).clear
+      fail if should_raise
+    rescue NetHTTPUtils::Error => e
+      fail unless 404 == e.code
+    end
+    server.shutdown
+  end
+
   server = WEBrick::HTTPServer.new Port: 8000
   stack = []
   server.mount_proc ?/ do |req, res|
@@ -350,6 +374,9 @@ if $0 == __FILE__
   NetHTTPUtils.start_http("http://localhost:8000/").head("/")
   fail stack.inspect unless stack == %w{ HEAD }
   stack.clear
+  NetHTTPUtils.request_data("http://localhost:8000/", :head)
+  fail stack.inspect unless stack == %w{ HEAD }
+  stack.clear
   NetHTTPUtils.request_data("http://localhost:8000/")
   fail stack.inspect unless stack == %w{ HEAD GET }
   server.shutdown
@@ -394,7 +421,7 @@ if $0 == __FILE__
   [
     ["https://imgur.com/a/cccccc"],
     ["https://imgur.com/mM4Dh7Z"],
-    ["https://i.redd.it/si758zk7r5xz.jpg", "HTTP error #404 [\"image/png\"]"],
+    ["https://i.redd.it/si758zk7r5xz.jpg", "HTTP error #404 <image/png>"],
   ].each do |url, expectation|
     begin
       puts NetHTTPUtils.remove_tags NetHTTPUtils.request_data url

data/nethttputils.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nethttputils"
-  spec.version      = "0.3.2.4"
+  spec.version      = "0.3.2.5"
   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.4
+  version: 0.3.2.5
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-02 00:00:00.000000000 Z
+date: 2019-02-03 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 --