nethttputils 0.4.3.0 → 0.4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ecb7a8e00f832f9c1fa1f79610772f8f955a177f
-  data.tar.gz: ee617bf653fca7736e95e257929ebb7a597872a1
+SHA256:
+  metadata.gz: bf38b9ab048dec93ae1ed7cdc00746477bdfffe66394e3dca8c97dee19b85d2d
+  data.tar.gz: 44f1439d888cf72395de49ae8b2192193cb31f0648d57abb00be1a4d5cdcdb32
 SHA512:
-  metadata.gz: e3632e1d20d3d853f2b7542364785ce5ba4ca8b4ff25aa2304856061bbe133cdd145ac18843a1bd52af275939e9f8354223c0d37dac6d64df5791dc2f21fc9db
-  data.tar.gz: 90e9b8a75802bd2d48cb727cf5c28ac4aa1c481e4af0afdc90d4e5b0f251e36293867819ef788774db550b92c0796482024913d313b7475e82737440c2685197
+  metadata.gz: 8e445cb04ac14bb07b658d2211e048a1d51c1002ce4e0c50303a73e82474b4e6b74ce1d9d17b30de35a43f0cc0db1e12eeedd4a80cbc924a6974224f9d1dc282
+  data.tar.gz: 8c11645091d88847e45e4849d5782c9b562c98a5ef7613b502a5953263db5608e5f8eabadd5850089d85e06ce679912bc58716caec922e5c3cfb0e16a15bc56c

data/lib/nethttputils.rb

@@ -1,9 +1,9 @@
 require "net/http"
+require "cgi"
 require "openssl"
 
 require "logger"
 
-
 module NetHTTPUtils
   class << self
     attr_accessor :logger
@@ -16,8 +16,10 @@ module NetHTTPUtils
 
   class Error < RuntimeError
     attr_reader :code
+    attr_reader :body
     def initialize body, code = nil
       @code = code
+      @body = body
       body = body[0...997] + "..." if body.size > 1000
       super "HTTP error ##{code.inspect} #{body}"
     end
@@ -26,6 +28,7 @@ module NetHTTPUtils
   end
 
   class << self
+    require "addressable"
 
     def remove_tags str
       str.gsub(/<script( [a-z-]+="[^"]*")*>.*?<\/script>/m, "").
@@ -36,12 +39,14 @@ module NetHTTPUtils
     def start_http url, max_start_http_retry_delay = 3600, timeout = nil, no_redirect = false, proxy = nil
       timeout ||= 30
       uri = url
-      uri = URI.parse begin
+
+      uri = begin
         URI url
-        url
       rescue URI::InvalidURIError
-        URI.escape url
+        URI Addressable::URI.escape url
       end unless url.is_a? URI::HTTP
+      raise Error, "can't parse host" unless uri.host
+
       delay = 5
       begin
         Net::HTTP.start(
@@ -129,11 +134,12 @@ module NetHTTPUtils
               # request.basic_auth *p(auth.map(&URI.method(:escape))) if auth
               request.basic_auth *auth if auth
               if (mtd == :POST || mtd == :PATCH) && !form.empty?
+                form.replace form.map{ |k, v| [k.to_s, v.is_a?(Integer) ? v.to_s : v] }.to_h
                 case type
                   when :json
                                     request.body = JSON.dump form
                                     request.content_type = "application/json"
-                  when :multipart
+                  when :multipart   # in this case form can be of width 3 (when sending files)
                     request.set_form form, "multipart/form-data"
                   when :form
                                if form.any?{ |k, v| v.respond_to? :to_path }
@@ -171,7 +177,7 @@ module NetHTTPUtils
               end.chunk(&:first).map do |file, group|
                 "#{file}:#{group.map(&:last).chunk{|_|_}.map(&:first).join(",")}"
               end
-              logger.debug stack.join " -> "
+              logger.info stack.join " -> "
             end
           end
           do_request = lambda do |request|
@@ -206,10 +212,10 @@ module NetHTTPUtils
                 response.fetch("x-rate-limit-reset").to_i,
                 now.to_i,
               ]
-            elsif response.key? "x-ratelimit-remaining"
+            elsif response.key? "x-ratelimit-remaining"               # this is probably reddit-specific because ...
               [
                 response.fetch("x-ratelimit-remaining").to_i,
-                now + response.fetch("x-ratelimit-reset").to_i,
+                now.to_i + response.fetch("x-ratelimit-reset").to_i,  # ... reddit sucks and so does not use timestamp here
                 now.to_i,
               ]
             end
@@ -242,7 +248,6 @@ module NetHTTPUtils
             when /\A30\d\z/
               next response if no_redirect
               logger.info "redirect: #{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)

data/nethttputils.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "nethttputils"
-  spec.version      = "0.4.3.0"
+  spec.version      = "0.4.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 --
@@ -20,8 +20,6 @@ Gem::Specification.new do |spec|
   spec.email        = "nakilon@gmail.com"
   spec.license      = "MIT"
 
-  spec.require_path = "lib"
   spec.files        = %w{ LICENSE nethttputils.gemspec lib/nethttputils.rb }
-
   spec.add_dependency "addressable"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nethttputils
 version: !ruby/object:Gem::Version
-  version: 0.4.3.0
+  version: 0.4.4.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-16 00:00:00.000000000 Z
+date: 2023-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -62,8 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.3.25
 signing_key: 
 specification_version: 4
 summary: this tool is like a pet that I adopted young and now I depend on, sorry