nethttputils 0.3.2.9 → 0.4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 197097c1a40d4d0d409aa0c9f0965957ee9daf2a
-  data.tar.gz: 5f78308fd5162565db7eca00c630fd2c5e39197e
+  metadata.gz: ff2b86fcc4b55f5f9ea7818eb61b47458da62fa0
+  data.tar.gz: 610d74457c21418c24b092a65ba47abfd5571b37
 SHA512:
-  metadata.gz: c9275a5dc752288e03877fc8fbbad9fa3b808cca7a7aa463fbb6b7e55c8bc0466cff9c278896a3e7df6084dbca49ea725ab97dbae6dbc465e436e552b9dacedf
-  data.tar.gz: f84dbb68971f7aae2c51200e42b95f9492b9b5c1749be2c2bd5870a751a920527d1e93733e77036d629c1cff69b39664243a7cbb39828a88115625362e070282
+  metadata.gz: 819dc2799c568c4b4aa4d199d14e3f5a0b70253bc0eb6831205482274abb2bbe90f7fb8504d15f6e4561dfa2d1e7d464a4534943a2d6ebd188d7e345752cfc39
+  data.tar.gz: cde0231d2c7779642ecf68d052cc117178b9905ba8a1bf3427d7c901050f05b75d290624fda7c5a2e2a2f4ed5fc7114390aad00bcdcbc45bab8783d2ee844ff0

data/.travis.yml

@@ -1,7 +1,7 @@
 ---
 language: ruby
 
-script: "ruby lib/nethttputils.rb"
+script: "bundle install && bundle exec ruby lib/nethttputils.rb"
 
 os:
   - linux
@@ -19,3 +19,11 @@ matrix:
   allow_failures:
   # something with `NetHTTPUtils.request_data("http://localhost:8000/?1=2&3=4", form: {1=>3})` test
   - rvm: jruby-head
+  - rvm: 2.3
+    os: osx
+  - rvm: 2.2
+    os: osx
+  - rvm: 2.1
+    os: osx
+  - rvm: 2.0
+    os: osx

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+gem "byebug"
+gemspec

data/lib/nethttputils.rb

@@ -18,15 +18,18 @@ module NetHTTPUtils
     attr_reader :code
     def initialize body, code = nil
       @code = code
-      super "HTTP error ##{code} #{body}"
+      body = body[0...997] + "..." if body.size > 1000
+      super "HTTP error ##{code.inspect} #{body}"
     end
   end
+  class EOFError_from_rbuf_fill < StandardError
+  end
 
   class << self
 
     def remove_tags str
-      str.gsub(/<script( [a-z]+="[^"]*")*>.*?<\/script>/m, "").
-          gsub(/<style( [a-z]+="[^"]*")*>.*?<\/style>/m, "").
+      str.gsub(/<script( [a-z-]+="[^"]*")*>.*?<\/script>/m, "").
+          gsub(/<style( [a-z-]+="[^"]*")*>.*?<\/style>/m, "").
           gsub(/<[^>]*>/, "").split(?\n).map(&:strip).reject(&:empty?).join(?\n)
     end
 
@@ -54,7 +57,7 @@ module NetHTTPUtils
               def << msg
                 @@buffer ||= "[Net::HTTP debug] "
                 @@buffer.concat msg
-                @@buffer = @@buffer[0...997] + "..." if @@buffer.size > 500
+                @@buffer = @@buffer[0...997] + "..." if @@buffer.size > 1000
                 return unless @@buffer.end_with? ?\n
                 NetHTTPUtils.logger.debug @@buffer.sub ?\n, "  "
                 @@buffer = nil
@@ -155,7 +158,7 @@ module NetHTTPUtils
                 request.each_header.map{ |k, v| "-H \"#{k}: #{v}\" " unless k == "host" }.join
               }#{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 }}"
+              logger.debug "> body: #{request.body.inspect.tap{ |body| body.replace body[0...997] + "..." if body.size > 1000 }}"
               # TODO this is buggy -- mixes lines from different files into one line
               stack = caller.reverse.map do |level|
                 /((?:[^\/:]+\/)?[^\/:]+):([^:]+)/.match(level).captures
@@ -169,11 +172,16 @@ module NetHTTPUtils
             delay = 5
             response = begin
               http.request request, &block
-            rescue Errno::ECONNREFUSED, Net::ReadTimeout, Net::OpenTimeout, Zlib::BufError, Errno::ECONNRESET, OpenSSL::SSL::SSLError => e
+            rescue Errno::ECONNREFUSED, Net::ReadTimeout, Net::OpenTimeout, Zlib::BufError, Errno::ECONNRESET, OpenSSL::SSL::SSLError, Errno::ETIMEDOUT => e
               raise if max_read_retry_delay < delay *= 2
               logger.error "retrying in #{delay} seconds because of #{e.class} '#{e.message}' at: #{request.uri}"
               sleep delay
               retry
+            rescue EOFError => e
+              raise unless e.backtrace.empty?
+              # https://bugs.ruby-lang.org/issues/13018
+              # https://blog.kalina.tech/2019/04/exception-without-backtrace-in-ruby.html?spref=reddit
+              raise EOFError_from_rbuf_fill.new "probably the old Ruby empty backtrace EOFError exception from net/protocol.rb"
             end
             # response.instance_variable_set "@nethttputils_close", http.method(:finish)
             # response.singleton_class.instance_eval{ attr_accessor :nethttputils_socket_to_close }
@@ -204,7 +212,7 @@ module NetHTTPUtils
             # TODO: use WEBrick::Cookie
             old_cookies = cookies.dup
             response.to_hash.fetch("set-cookie", []).each do |c|
-              fail "bad cookie? #{c.inspect}" unless /\A([^\s=]+)=([^\s]*)\z/.match c.split(/\s*;\s*/).first
+              next logger.warn "bad cookie: #{c.inspect}" unless /\A([^\s=]+)=([^\s]*)\z/.match c.split(/\s*;\s*/).first
               logger.debug "set-cookie: #{$1}=#{$2}"
               old_cookies.delete $1
               cookies.store $1, $2
@@ -217,13 +225,15 @@ module NetHTTPUtils
             case response.code
             when /\A30\d\z/
               logger.info "redirect: #{response["location"]}"
-              new_uri = URI.join request.uri, URI.escape(response["location"])
+              require "addressable"
+              new_uri = URI.join request.uri.to_s, Addressable::URI.escape(response["location"])
               new_host = new_uri.host
+              raise Error.new "redirected in place" if new_uri == http.instance_variable_get(:@uri)
               if http.address != new_host ||
                  http.port != new_uri.port ||
                  http.use_ssl? != (new_uri.scheme == "https")
                 logger.debug "changing host from '#{http.address}' to '#{new_host}'"
-                # http.finish
+                # http.finish   # why commented out?
                 http = NetHTTPUtils.start_http new_uri, http.instance_variable_get(:@max_start_http_retry_delay), timeout
               end
               if request.method == "POST"
@@ -349,24 +359,44 @@ if $0 == __FILE__
   require "json"
   Thread.abort_on_exception = true
 
+  server = WEBrick::HTTPServer.new Port: 8000
+  tt = false
+  server.mount_proc "/" do |req, res|
+    next unless "HEAD" == req.request_method
+    fail if tt
+    tt = true
+    res.status = 300
+    res["location"] = "/"
+  end
+  t = Thread.new{ server.start }
+  begin
+    NetHTTPUtils.request_data "http://localhost:8000/"
+  rescue NetHTTPUtils::Error => e
+    raise if e.code
+  end
+  server.shutdown
+  t.join
+
   server = WEBrick::HTTPServer.new Port: 8000
   server.mount_proc "/1" do |req, res|
     next unless "GET" == req.request_method
-    res.cookies.push WEBrick::Cookie.new("1", "2")
-    res.cookies.push WEBrick::Cookie.new("3", "4")
-    res.cookies.push WEBrick::Cookie.new("8", "9")
-    res.cookies.push WEBrick::Cookie.new("a", "b")
-    res.cookies.push WEBrick::Cookie.new("1", "5")
+    res.cookies.push WEBrick::Cookie.new "1", "2"
+    res.cookies.push WEBrick::Cookie.new "3", "4"
+    res.cookies.push WEBrick::Cookie.new "8", "9"
+    res.cookies.push WEBrick::Cookie.new "a", "b"
+    res.cookies.push WEBrick::Cookie.new "1", "5"
+    res.cookies.push WEBrick::Cookie.new "f", "g h"
     res.status = 300
     res["location"] = "/2"
   end
   server.mount_proc "/2" do |req, res|
-    res.cookies.push WEBrick::Cookie.new("3", "6=c")
-    res.cookies.push WEBrick::Cookie.new("8", "")
-    res.cookies.push WEBrick::Cookie.new("4", "7")
+    res.cookies.push WEBrick::Cookie.new "3", "6=c"
+    res.cookies.push WEBrick::Cookie.new "a", "d e"
+    res.cookies.push WEBrick::Cookie.new "8", ""
+    res.cookies.push WEBrick::Cookie.new "4", "7"
   end
   t = Thread.new{ server.start }
-  fail unless %w{ 3=6=c 8= 4=7 1=5 a=b } == p(NetHTTPUtils.request_data("http://localhost:8000/1").
+  fail unless %w{ 3=6=c a=d\ e 8= 4=7 1=5 a=b } == p(NetHTTPUtils.request_data("http://localhost:8000/1").
     instance_variable_get(:@last_response).to_hash.fetch("set-cookie"))
   server.shutdown
   t.join
@@ -446,7 +476,7 @@ if $0 == __FILE__
   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/502")).start_with? "httpstat.us | 502: Bad gateway\nError\n502\n"
   fail unless NetHTTPUtils.method(:read).call(NetHTTPUtils.start_http("http://httpstat.us/503")) == "503 Service Unavailable"
   [
     ["https://imgur.com/a/cccccc"],
@@ -480,10 +510,6 @@ if $0 == __FILE__
     end
   end
 
-  begin
-    fail NetHTTPUtils.request_data "https://oi64.tinypic.com/29z7oxs.jpg?", timeout: 5, max_start_http_retry_delay: -1
-  rescue Net::OpenTimeout => e
-  end
   ## this stopped failing on High Sierra
   # begin
   #   # https://www.virtualself.co/?

data/nethttputils.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nethttputils"
-  spec.version      = "0.3.2.9"
+  spec.version      = "0.4.1.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 --
@@ -22,4 +22,6 @@ Gem::Specification.new do |spec|
 
   spec.require_path = "lib"
   spec.files        = `git ls-files -z`.split(?\0) - spec.test_files
+
+  spec.add_dependency "addressable"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nethttputils
 version: !ruby/object:Gem::Version
-  version: 0.3.2.9
+  version: 0.4.1.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-18 00:00:00.000000000 Z
-dependencies: []
+date: 2020-08-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
       Back in 2015 I was a guy automating things at my job and two scripts had a common need --
       they both had to pass the same credentials to Jenkins (via query params, I guess).
@@ -27,6 +41,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".travis.yml"
+- Gemfile
 - LICENSE
 - Rakefile
 - lib/nethttputils.rb
@@ -51,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: this tool is like a pet that I adopted young and now I depend on, sorry