nethttputils 0.2.4.0 → 0.2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dcab77cae6a0a44cfd6fe0414a365763f114e95
-  data.tar.gz: f20d494f49424479fcf8c2534b3bc6d19be6b583
+  metadata.gz: c8d2a8ec9215219787c3f2f8a13569d032d5588b
+  data.tar.gz: 913adf0d1c1dcbfb733233e4a41308f86cb56e82
 SHA512:
-  metadata.gz: 485981929b85428261d1e019d837c9915ee608bfd3e6e80c8af3988d55ddfa4d710a5c8ba4025ba850b268ea6bf67bddc0cb4df154d8f5a4a35f9830b62e7b80
-  data.tar.gz: 58b3cc0fb11c0557a8d0f59809f89fea37c971b6749ceee90f5cc6522d21bcc54c3f913ad99b02f9d2307d7d124699c00ed30a797f659a43f88f69c76a4b209a
+  metadata.gz: cf192d72f3dd6226afa7c2368ce3f41054f563396178543b67cd4b837425cc6db5b349c8ab3de372c96cc7ffa11f9a51698bd96c3668b82b7b179e74919be285
+  data.tar.gz: dffcfb68ff473068e718bfc74c4f88004f08ca3789f6cce540295f3af6c6b571ba621ee1a2c2efd484e8246d8222d33d24a10ac2dc500489d3400b264a6c2c7d

data/lib/nethttputils.rb

@@ -25,7 +25,9 @@ module NetHTTPUtils
   class << self
 
     def remove_tags str
-      str.gsub(/<script( type="text\/javascript"| src="[^"]+")?>.*?<\/script>/m, "").gsub(/<[^>]*>/, "").strip
+      str.gsub(/<script( [a-z]+="[^"]*")*>.*?<\/script>/m, "").
+          gsub(/<style( type="text\/css")?>.*?<\/style>/m, "").
+          gsub(/<[^>]*>/, "").split(?\n).map(&:strip).reject(&:empty?).join(?\n)
     end
 
     # TODO: make it private?
@@ -80,11 +82,12 @@ module NetHTTPUtils
             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 #{
+          logger.debug "curl -vsSL --compressed -o /dev/null #{
             request.each_header.map{ |k, v| "-H \"#{k}: #{v}\" " unless k == "host" }.join
-          }#{curl_form}#{url.gsub "&", "\\\\&"}"
+          }#{curl_form}'#{url.gsub "&", "\\\\&"}#{"?#{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 }}"
+          # TODO this is buggy -- mixes lines from different files into one line
           stack = caller.reverse.map do |level|
             /((?:[^\/:]+\/)?[^\/:]+):([^:]+)/.match(level).captures
           end.chunk(&:first).map do |file, group|
@@ -165,15 +168,24 @@ module NetHTTPUtils
         # response.instance_variable_set "@nethttputils_close", http.method(:finish)
         # response.singleton_class.instance_eval{ attr_accessor :nethttputils_socket_to_close }
 
-        if response.key? "x-ratelimit-userremaining"
-          c = response.fetch("x-ratelimit-userremaining").to_i
-          logger.debug "x-ratelimit-userremaining: #{c}"
-          t = response.fetch("x-ratelimit-clientremaining").to_i
-          logger.debug "x-ratelimit-clientremaining: #{t}"
-          unless 100 < c
-            a = response.fetch("x-timer")[/\d+/].to_i
-            b = response.fetch("x-ratelimit-userreset").to_i
-            t = (b - a + 1).fdiv c
+        remaining, reset_time, current_timestamp = if response.key? "x-ratelimit-userremaining"
+          logger.debug "x-ratelimit-clientremaining: #{response.fetch("x-ratelimit-clientremaining").to_i}"
+          [
+            response.fetch("x-ratelimit-userremaining").to_i,
+            response.fetch("x-ratelimit-userreset").to_i,
+            response.fetch("x-timer")[/\d+/].to_i,
+          ]
+        elsif response.key? "x-rate-limit-remaining"
+          [
+            response.fetch("x-rate-limit-remaining").to_i,
+            response.fetch("x-rate-limit-reset").to_i,
+            Time.now.to_i,
+          ]
+        end
+        if remaining
+          logger.debug "x-remaining: #{remaining}"
+          if remaining <= 100
+            t = (reset_time - current_timestamp + 1).fdiv remaining
             logger.warn "x-ratelimit sleep #{t} seconds"
             sleep t
           end

data/nethttputils.gemspec

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