proxy_pool 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91b8f68f49e945f8138a4b44898cabec2e0c547d266c8f1fa3bee4f812834123
-  data.tar.gz: a140daaf608931a1f02c003ff95c2a39b634a1bd90e23d0f785c9dd51a8a5f43
+  metadata.gz: b683e7a0cfd44068402a78d7944ebd8753c74ca3e513ef800ab764a4d5f8612e
+  data.tar.gz: 4fbe67c2a42da997920db4f4e8d908a2f37f5d6be33e7e68b53e025a18d6584d
 SHA512:
-  metadata.gz: 85e6ddfacd502eebf0b9c75538e621342f447f222e13915228bfc073aa0a5cced67d0aeac4ad2ed3799c3c5b892bdb19f0907ee4ef6aef259ff8e29413b4932b
-  data.tar.gz: cbc1f7cd40f2d368bb0eeab63a9749ae896fa1895d8f09ffa0c01dbea570b4ebc774f384d39d0016717bb7bdfabb39baac9db9974f9979ad3adbb7e5202ef2ba
+  metadata.gz: ee5a0612c6f1833115dfa06ac3ea58d66452b305c07fa317e29fbbe134727da3415cc06e99ea200188f72ffca8f3e1391d67574e33a4ef456febdd33d0120c05
+  data.tar.gz: 6282dfc302b006c8e2454e04d7bedf7bf715be3c4bfdc2398ec81f2cb446f5e8090a3da98a92651f42b54928bf6aa057fbcc4aee215ed768232f543d90a01f57

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.3
+ruby-2.7.0

data/Gemfile

@@ -1,4 +1,6 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in proxy_pool.gemspec
 gemspec

data/Gemfile.lock

@@ -1,31 +1,36 @@
 PATH
   remote: .
   specs:
-    proxy_pool (0.1.0)
-      http (~> 4.1, >= 4.1.1)
+    proxy_pool (0.2.0)
+      http (~> 4.4, >= 4.4.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    http (4.1.1)
+    ffi (1.12.2)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
+    http (4.4.1)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
-      http-form_data (~> 2.0)
-      http_parser.rb (~> 0.6.0)
+      http-form_data (~> 2.2)
+      http-parser (~> 1.2.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (2.1.1)
-    http_parser.rb (0.6.0)
-    minitest (5.11.3)
-    public_suffix (3.1.1)
-    rake (13.0.1)
+    http-form_data (2.3.0)
+    http-parser (1.2.1)
+      ffi-compiler (>= 1.0, < 2.0)
+    minitest (5.14.1)
+    public_suffix (4.0.5)
+    rake (10.5.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.7.7)
 
 PLATFORMS
   ruby
@@ -34,7 +39,7 @@ DEPENDENCIES
   bundler (~> 2.0)
   minitest (~> 5.0)
   proxy_pool!
-  rake (~> 13.0)
+  rake (~> 10.0)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/Rakefile

@@ -1,10 +1,12 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "proxy_pool"
+require 'bundler/setup'
+require 'proxy_pool'
 
 # 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.
@@ -10,5 +11,5 @@ require "proxy_pool"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/proxy_pool.rb

@@ -1,47 +1,60 @@
+# frozen_string_literal: true
+
 module ProxyPool
   #
   # Errors
   #
 
   # Base error
-  class Error < StandardError;
+  class Error < StandardError
   end
 
   require 'proxy_pool/version'
   require 'proxy_pool/dealer'
 
   class << self
-    # Get anonymous proxy from pool randomly
+    # Get a proxy from proxy pool
     #
-    # @param filter [Hash] Filter
     # @return [Hash] Proxy
-    def get_anonymous_proxy(filter={})
-      ProxyPool::Dealer.instance.get(true, filter)
+    def get(&block)
+      ProxyPool::Dealer.instance.get(&block)
     end
 
-    # Update and get anonymous proxy from pool randomly
+    # Get high anonymous proxy
     #
-    # @param filter [Hash] Filter
     # @return [Hash] Proxy
-    def get_anonymous_proxy!(filter={})
-      ProxyPool::Dealer.instance.get(true, filter, true)
+    def get_high_anonymous_proxy
+      get { |proxy| proxy['anonymity'] == 'high_anonymous' }
     end
 
-    # Get transparent proxy from pool randomly
+    # Get proxy by country
     #
-    # @param filter [Hash] Filter
+    # @param cn [String] Country code
     # @return [Hash] Proxy
-    def get_transparent_proxy(filter={})
-      ProxyPool::Dealer.instance.get(false, filter)
+    def get_by_country(cn)
+      get { |proxy| proxy['country'].downcase == cn.downcase }
     end
 
-    # Update and get transparent proxy from pool randomly
+    # Get http proxy
     #
-    # @param filter [Hash] Filter
     # @return [Hash] Proxy
-    def get_transparent_proxy!(filter={})
-      ProxyPool::Dealer.instance.get(false, filter, true)
+    def get_http_proxy
+      get { |proxy| proxy['type'] == 'http' }
     end
-  end
 
+    # Get https proxy
+    #
+    # @return [Hash] Proxy
+    def get_https_proxy
+      get { |proxy| proxy['type'] == 'https' }
+    end
+
+    # Remove this proxy from pool
+    #
+    # @param proxy [Hash] Proxy
+    # @return [nil]
+    def remove(proxy)
+      ProxyPool::Dealer.instance.remove(proxy)
+    end
+  end
 end

data/lib/proxy_pool/dealer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Standard library
 #
@@ -17,72 +19,77 @@ module ProxyPool
     include Singleton
 
     # HTTP error
-    class HTTPError < Error;
+    class HTTPError < Error
     end
 
     # Parse error
-    class ParseError < Error;
-    end
-
-    # Filter error
-    class FilterError < Error;
+    class ParseError < Error
     end
 
-    attr_reader :transparent_pools, :anonymous_pools
+    attr_reader :pools
 
     # Update to latest proxy list from fate0/proxylist
     #
     def update
-      @transparent_pools = []
-      @anonymous_pools = []
+      @pools = []
 
       res = HTTP.get 'https://raw.githubusercontent.com/fate0/proxylist/master/proxy.list'
       raise HTTPError, "invalid http code #{res.code}" if res.code != 200
 
-      res.body.to_s.split("\n").each {|line| _pool_parse(line)}
+      @updated_at = Time.now
+
+      res.body.to_s.split("\n").each { |line| _pool_parse(line) }
     end
 
     # Get a random proxy
     #
-    # @param anonymous [Boolean] Return high anonymous proxy if true
-    # @param filter [Hash] Filter
-    # @param force_update [Boolean] Update pool before select proxy server
     # @return [Hash] Proxy
-    def get(anonymous=true, filter={}, force_update=false)
-      update if force_update || (@transparent_pools.nil? && @anonymous_pools.nil?)
+    def get
+      update if _need_update?
 
-      target_pools = if anonymous
-                       @anonymous_pools
+      target_pools = if block_given?
+                       @pools.select { |proxy| yield proxy }
                      else
-                       @transparent_pools
+                       @pools
                      end
-      filter.each_pair { |k, v| target_pools = _pool_filter(target_pools, k.to_s, v) }
-
       target_pools.sample
     end
 
+    # Remove this proxy from pool
+    #
+    # @param proxy [Hash] Proxy
+    # @return [nil]
+    def remove(proxy)
+      @pools.delete(proxy)
+
+      nil
+    end
+
     private
 
+    # Return true if we need to update proxy list
+    #
+    # @return [Boolean]
+    def _need_update?
+      return true if @updated_at.nil?
+
+      # Re-update after 10 min
+      delta = Time.now - @updated_at
+      delta > 600
+    end
+
+    # Parse proxy list
+    #
+    # @param line [String]
     def _pool_parse(line)
       proxy = JSON.parse(line)
-      raise ParseError, "no anonymity field: #{line}" unless proxy.key?('anonymity')
-
-      case proxy['anonymity']
-      when 'high_anonymous'
-        @anonymous_pools << proxy
-      else
-        @transparent_pools << proxy
+      unless proxy.key?('anonymity')
+        raise ParseError, "no anonymity field: #{line}"
       end
+
+      @pools << proxy
     rescue JSON::ParserError
       raise ParseError, "JSON parser error when parsing #{line}"
     end
-
-    def _pool_filter(proxy_pools, key, value)
-      proxy_pools.select do |proxy|
-        raise FilterError, "invalid filter: #{key}" unless proxy.key?(key)
-        proxy[key] == value
-      end
-    end
-
   end
-end
+end

data/lib/proxy_pool/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ProxyPool
-  VERSION = "0.1.3".freeze
+  VERSION = '0.2.0'
 end

data/proxy_pool.gemspec

@@ -1,35 +1,37 @@
-lib = File.expand_path("lib", __dir__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "proxy_pool/version"
+require 'proxy_pool/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "proxy_pool"
+  spec.name          = 'proxy_pool'
   spec.version       = ProxyPool::VERSION
-  spec.authors       = ["hi_ztz"]
-  spec.email         = ["hi_ztz@protonmail.com"]
+  spec.authors       = ['hi_ztz']
+  spec.email         = ['hi_ztz@protonmail.com']
 
-  spec.summary       = %q{select a ip from proxy list randomly}
-  spec.description   = %q{proxy_pool can give you free and random proxy ip}
-  spec.homepage      = "https://github.com/zt2/proxy_pool"
-  spec.license       = "MIT"
+  spec.summary       = 'select a ip from proxy list randomly'
+  spec.description   = 'proxy_pool can give you free and random proxy ip'
+  spec.homepage      = 'https://github.com/zt2/proxy_pool'
+  spec.license       = 'MIT'
 
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = spec.homepage
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'rake', '~> 10.0'
 
   spec.add_runtime_dependency 'http', '~> 4.4', '>= 4.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxy_pool
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - hi_ztz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: select a ip from proxy list randomly