nethttputils 0.2.3.0 → 0.2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bec88b8ff9beeae7cc18250b6a2d955aa6d7845b
-  data.tar.gz: 820c5f45fbd937fd89912eb30c35c264f98923df
+  metadata.gz: 1dcab77cae6a0a44cfd6fe0414a365763f114e95
+  data.tar.gz: f20d494f49424479fcf8c2534b3bc6d19be6b583
 SHA512:
-  metadata.gz: d5d9ab8603996adc703bb812d85fea42e359167736be39eecdd1aecc71d8c1667662672b8cb22ce7ff66384b655415aa342b4b0b0f005d3a5a7e09359074df88
-  data.tar.gz: 6ebc04827c686dfc8e15f9cdb14758ef5604a45e252e2472da070603dacb779a92f2ff11d5869b6b1d7bd64f9d4bb049b66dd69ddbbdc5bf91730e9a87877814
+  metadata.gz: 485981929b85428261d1e019d837c9915ee608bfd3e6e80c8af3988d55ddfa4d710a5c8ba4025ba850b268ea6bf67bddc0cb4df154d8f5a4a35f9830b62e7b80
+  data.tar.gz: 58b3cc0fb11c0557a8d0f59809f89fea37c971b6749ceee90f5cc6522d21bcc54c3f913ad99b02f9d2307d7d124699c00ed30a797f659a43f88f69c76a4b209a

data/lib/nethttputils.rb

@@ -58,24 +58,33 @@ module NetHTTPUtils
           # pp Object.instance_method(:method).bind(request).call(:set_form).source_location
           if (mtd == :POST || mtd == :PATCH) && !form.empty?
             case type
+              when :json ; request.body = JSON.dump form
+                           request.content_type = "application/json"
               when :form ; if form.any?{ |k, v| v.respond_to? :to_path }
                              request.set_form form, "multipart/form-data"
                            else
                              request.set_form_data form
                              request.content_type = "application/x-www-form-urlencoded;charset=UTF-8"
                            end
-              when :json ; request.body = JSON.dump form
-                           request.content_type = "application/json"
               else       ; raise "unknown content-type '#{type}'"
             end
           end
           header.each{ |k, v| request[k.to_s] = v }
 
-          logger.info "> #{request} #{request.path}"
+          logger.info "> #{request.class} #{uri.host} #{request.path}"
           next unless logger.debug?
-          logger.debug "curl -vsSL -o /dev/null #{request.each_header.map{ |k, v| "-H \"#{k}: #{v}\" " unless k == "host" }.join}#{url.gsub "&", "\\\\&"}"
+          logger.debug "content-type: #{request.content_type}" unless mtd == :GET
+          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 ; mtd == :GET ? "" : fail("unknown content-type '#{request.content_type}'")
+          end
+          logger.debug "curl -vsSL -o /dev/null #{
+            request.each_header.map{ |k, v| "-H \"#{k}: #{v}\" " unless k == "host" }.join
+          }#{curl_form}#{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 }}"
+          logger.debug "> body: #{request.body.inspect.tap{ |body| body[997..-1] = "..." if body.size > 500 }}"
           stack = caller.reverse.map do |level|
             /((?:[^\/:]+\/)?[^\/:]+):([^:]+)/.match(level).captures
           end.chunk(&:first).map do |file, group|
@@ -96,7 +105,18 @@ module NetHTTPUtils
           ) do |http|
             # http.open_timeout = timeout   # seems like when opening hangs, this line in unreachable
             # http.read_timeout = timeout
-            http.set_debug_output STDERR if logger.level == Logger::DEBUG # use `logger.debug?`?
+            http.set_debug_output( Object.new.tap do |obj|
+              obj.instance_eval do
+                def << msg
+                  @@buffer ||= "[Net::HTTP debug] "
+                  @@buffer.concat msg
+                  @@buffer = @@buffer[0...997] + "..." if @@buffer.size > 500
+                  return unless @@buffer.end_with? ?\n
+                  NetHTTPUtils.logger.debug @@buffer.sub ?\n, "  "
+                  @@buffer = nil
+                end
+              end
+            end ) if logger.level == Logger::DEBUG # use `logger.debug?`?
             http
           end
         rescue Errno::ECONNREFUSED => e
@@ -175,9 +195,15 @@ module NetHTTPUtils
           do_request.call prepare_request[new_uri]
         when "404"
           logger.error "404 at #{request.method} #{request.uri} with body: #{
-            response.body.is_a?(Net::ReadAdapter) ? "impossible to reread Net::ReadAdapter -- check the IO you've used in block form" : response.body.tap do |body|
-              body.replace remove_tags body if body[/<html[> ]/]
-            end.inspect
+            if 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[> ]/]
+              end.inspect
+            end
           }"
           response
         when "429"
@@ -209,13 +235,16 @@ module NetHTTPUtils
       end
       do_request[prepare_request[uri]].tap do |response|
         cookies.each{ |k, v| response.add_field "Set-Cookie", "#{k}=#{v};" }
-        logger.debug response.to_hash
+        logger.debug "< header: #{response.to_hash}"
       end
     end
 
     def request_data *args, &block
       response = get_response *args, &block
-      raise Error.new response.body, response.code.to_i unless response.code[/\A(20\d|3\d\d)\z/]
+      raise Error.new(
+        (response.to_hash["content-type"] == ["image/png"] ? response.to_hash["content-type"] : response.body),
+        response.code.to_i
+      ) unless response.code[/\A(20\d|3\d\d)\z/]
       if response["content-encoding"] == "gzip"
         Zlib::GzipReader.new(StringIO.new(response.body)).read
       else
@@ -265,15 +294,18 @@ if $0 == __FILE__
   fail unless NetHTTPUtils.get_response("http://httpstat.us/404").body == "404 Not Found"
   fail unless NetHTTPUtils.get_response("http://httpstat.us/500").body == "500 Internal Server Error"
   fail unless NetHTTPUtils.get_response("http://httpstat.us/503").body == "503 Service Unavailable"
-  %w{
-    https://imgur.com/a/cccccc
-    https://imgur.com/mM4Dh7Z
-  }.each do |url|
+  NetHTTPUtils.logger.level = Logger::FATAL
+  [
+    ["https://imgur.com/a/cccccc"],
+    ["https://imgur.com/mM4Dh7Z"],
+    ["https://i.redd.it/si758zk7r5xz.jpg", "HTTP error #404 [\"image/png\"]"],
+  ].each do |url, expectation|
     begin
       puts NetHTTPUtils.remove_tags NetHTTPUtils.request_data url
       fail
     rescue NetHTTPUtils::Error => e
-      raise unless e.code == 404
+      raise e.code.inspect unless e.code == 404
+      raise e.to_s if e.to_s != expectation if expectation
     end
   end
   %w{

data/nethttputils.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nethttputils"
-  spec.version      = "0.2.3.0"
+  spec.version      = "0.2.4.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.2.3.0
+  version: 0.2.4.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-05-23 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 --