http-proxy 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaeb307b91714f53a84e1b24e5a0160e345f1d7e37dd5b232962b7a5d42d50a2
-  data.tar.gz: 26e0aff91af5bbb357bf92d82c2f259c26fbd380ce927be303bb46d5bfb75b47
+  metadata.gz: a8e6a800ddd9b75f3983dfb76b172e71971f82af1d0e38f3de15bdb1f15203df
+  data.tar.gz: e99c31054ab5314d7bd1955eca31b93adb5b51d7f5716889467e83ea6b08a4a6
 SHA512:
-  metadata.gz: c7e954eaa1f88f26bc1247771ad6f8cc02160f09d284ca7515956dc81391e81495165f64405ad2892de43f69a4affd010b048c808c8578d1d07bbeebb328f12d
-  data.tar.gz: f53b8d3430ce567b57ddce1a9466a85be309ec190731d24bf3c8db420821b3e0f4549d16d5856f27cb1e3b0b4db2bc16504933c6960c4edd5c9b5868c8b6420b
+  metadata.gz: 9b0aa3f9f64d5cad46d3b36fab27c9626ce26d9155d8ed00b540bba77ee72b6c5d00a2551b9919ee641135706f03bbe9595b540cc87aecdb628e51ab38efcb76
+  data.tar.gz: 0f264cc280c58a0cf4447eb3af7682b63a1f13ddd767952e4deb387ee4ec1a2a8a1f7c511a24abb223b37df520a1ba4db7fee8218906ddc7191e4246fe33c098

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    http-proxy (0.3.0)
+    http-proxy (0.3.1)
       http (~> 4.4, >= 4.4.1)
-      proxy_pool (~> 0.2.2)
+      proxy_pool (~> 0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -27,7 +27,7 @@ GEM
     http-parser (1.2.1)
       ffi-compiler (>= 1.0, < 2.0)
     minitest (5.11.3)
-    proxy_pool (0.2.2)
+    proxy_pool (0.3.0)
       http (~> 4.4, >= 4.4.1)
     public_suffix (4.0.5)
     rake (13.0.1)

data/README.md

@@ -1,6 +1,4 @@
 # HTTP::Proxy
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fzt2%2Fhttp-proxy.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fzt2%2Fhttp-proxy?ref=badge_shield)
-
 
 HTTP::Proxy allows you sending HTTP request via proxy automatically. This library extends gem HTTP by patching HTTP::Chainable to make proxy http request possible.
 
@@ -49,7 +47,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/zt2/http-proxy.
+Bug reports and pull requests are welcome on GitHub at https://github.com/hi_ztz/http-proxy.
 
 ## License
 

data/bin/console

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'http-proxy'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start(__FILE__)

data/http-proxy.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'http-proxy'
-  spec.version       = '0.3.0'
+  spec.version       = '0.3.1'
   spec.authors       = ['hi_ztz']
   spec.email         = ['hi_ztz@protonmail.com']
 
@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
 
-  spec.add_runtime_dependency 'proxy_pool', '~> 0.2.2'
+  spec.add_runtime_dependency 'proxy_pool', '~> 0.3.0'
   spec.add_runtime_dependency 'http', '~> 4.4', '>= 4.4.1'
 end

data/lib/http-proxy/chainable.rb

@@ -5,17 +5,32 @@ module HTTP
   module Chainable
     # Choose a proxy to send HTTP request
     #
-    # @param anonymous [Boolean] Using anonymous proxy or not
-    def proxy(anonymous = true, &block)
-      if anonymous
-        p = ProxyPool.get_high_anonymous_proxy
-      elsif block_given?
-        p = ProxyPool.get(&block)
-      else
-        p = ProxyPool.get
+    # @param lazy_mode [Boolean] Re-use the last working proxy
+    def proxy(lazy_mode: true, &block)
+      p = if lazy_mode && !@_last_proxy.nil?
+            @_last_proxy
+          else
+            block_given? ? ProxyPool.get(&block) : ProxyPool.get
+          end
+
+      begin
+        ret = via(p['host'], p['port'])
+        @_last_proxy = p
+      rescue HTTP::ConnectionError, HTTP::TimeoutError => e
+        # Remove it from pool
+        ProxyPool.remove(p)
+
+        # Select another one
+        p = block_given? ? ProxyPool.get(&block) : ProxyPool.get
+        while p.nil?
+          ProxyPool.update
+          p = block_given? ? ProxyPool.get(&block) : ProxyPool.get
+        end
+
+        retry
       end
 
-      via(p['host'], p['port'])
+      ret
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-proxy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - hi_ztz
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
 - http-proxy.gemspec
 - lib/http-proxy.rb
 - lib/http-proxy/chainable.rb