proxy_fetcher 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3914a2ff7553eb5b82a10bafbd442c2047db5e6
-  data.tar.gz: 9dbea0fb816d58ad43027e0366078775a648f361
+  metadata.gz: b640006b8d82fd1c89336e37498ae7db1da3d0c7
+  data.tar.gz: 76edb223179bd9f59c127c8ac0dd97fcf2e9d4b0
 SHA512:
-  metadata.gz: ad83498d6e5f055326973163daf7719936792c95d641be37322ea5f4756223253ee5576135c507ad61cf9fb7c5518ded3f5e96bcfbd9291298a8731568ad177d
-  data.tar.gz: 3b99d216bc66904b2a4bab40359057e7097e6fd9d8e0cd397335ea993fefafebfa921e7fb75faa124dc96a3adfff053f761166a1d5dfeb85d73bbb44a79112a7
+  metadata.gz: 88648e3729f0e985b490da7c824263a43ff4987c61fa366fbbeb49c968757ef791191a5e3a136ca782f14506f12f31f0f651e95281a8463f5bf14e19a08856d8
+  data.tar.gz: 76d84b9cb3b6995690de39dbdf36481e67e4286c5e533000583eb849693ce78ee42da16ae20499560aa6b16cdf9c19cf4d66edf75fe4f66c83e5d63dc2da3100

data/README.md

@@ -16,6 +16,11 @@ fetched and validated by the gem. Take a look at the documentation below to find
 Also this gem can be used with any other programming language (Go / Python / etc) as standalone solution for downloading and
 validating proxy lists from the different providers. [Checkout examples](#standalone) of usage below.
 
+## Documentation valid for `master` branch
+
+Please check the documentation for the version of doorkeeper you are using in:
+https://github.com/nbulaj/proxy_fetcher/releases
+
 ## Table of Contents
 
 - [Dependencies](#dependencies)
@@ -33,8 +38,8 @@ validating proxy lists from the different providers. [Checkout examples](#standa
 
 ## Dependencies
 
-ProxyFetcher gem itself requires only Ruby `>= 2.0.0` (or [JRuby](http://jruby.org/) `> 9.0`, but maybe earlier too,
-[see Travis build matrix](.travis.yml)).
+ProxyFetcher gem itself requires Ruby `>= 2.0.0` (or [JRuby](http://jruby.org/) `> 9.0`, but maybe earlier too,
+[see Travis build matrix](.travis.yml)) and great [HTTP.rb gem](https://github.com/httprb/http).
 
 However, it requires an adapter to parse HTML. If you do not specify any specific adapter, then it will use
 default one - [Nokogiri](https://github.com/sparklemotion/nokogiri). It's OK for any Ruby on Rails project
@@ -49,7 +54,7 @@ you can implement your own adapter if it your use-case. Take a look at the [Conf
 If using bundler, first add 'proxy_fetcher' to your Gemfile:
 
 ```ruby
-gem 'proxy_fetcher', '~> 0.6'
+gem 'proxy_fetcher', '~> 0.7'
 ```
 
 or if you want to use the latest version (from `master` branch), then:
@@ -67,7 +72,7 @@ bundle install
 Otherwise simply install the gem:
 
 ```sh
-gem install proxy_fetcher -v '0.6'
+gem install proxy_fetcher -v '0.7'
 ```
 
 ## Example of usage
@@ -267,6 +272,7 @@ Default configuration looks as follows:
 
 ```ruby
 ProxyFetcher.configure do |config|
+  config.logger = Logger.new(STDOUT)
   config.user_agent = ProxyFetcher::Configuration::DEFAULT_USER_AGENT
   config.pool_size = 10
   config.timeout = 3
@@ -298,7 +304,7 @@ ProxyFetcher.configure do |config|
 end
 ```
 
-ProxyFetcher uses standard Ruby solution for dealing with HTTP(S) requests - `net/http` library from the Ruby core.
+ProxyFetcher uses HTTP.rb gem for dealing with HTTP(S) requests. It is fast enough and has a great chainable API.
 If you wanna add, for example, your custom provider that was developed as a Single Page Application (SPA) with some JavaScript,
 then you will need something like [selenium-webdriver](https://github.com/SeleniumHQ/selenium/tree/master/rb) to properly
 load the content of the website. For those and other cases you can write your own class for fetching HTML content by

data/lib/proxy_fetcher.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require 'uri'
-require 'net/https'
+require 'http'
+require 'logger'
 
 require File.dirname(__FILE__) + '/proxy_fetcher/version'
 
@@ -10,6 +11,7 @@ require File.dirname(__FILE__) + '/proxy_fetcher/configuration'
 require File.dirname(__FILE__) + '/proxy_fetcher/configuration/providers_registry'
 require File.dirname(__FILE__) + '/proxy_fetcher/proxy'
 require File.dirname(__FILE__) + '/proxy_fetcher/manager'
+require File.dirname(__FILE__) + '/proxy_fetcher/null_logger'
 
 require File.dirname(__FILE__) + '/proxy_fetcher/utils/http_client'
 require File.dirname(__FILE__) + '/proxy_fetcher/utils/proxy_validator'
@@ -70,6 +72,15 @@ module ProxyFetcher
       yield config
     end
 
+    # Returns ProxyFetcher logger instance.
+    #
+    # @return [Logger, NullLogger] logger object
+    #
+    def logger
+      return @logger if defined?(@logger)
+      @logger = config.logger || NullLogger.new
+    end
+
     private
 
     # Configures default adapter if it isn't defined by the user.

data/lib/proxy_fetcher/client/client.rb

@@ -165,6 +165,8 @@ module ProxyFetcher
       #
       # @raise [ProxyFetcher::Error] internal error happened during block execution
       #
+      # Requires refactoring :(
+      #
       def with_proxy_for(url, max_retries = 1000)
         tries = 0
 
@@ -174,7 +176,10 @@ module ProxyFetcher
         rescue ProxyFetcher::Error
           raise
         rescue StandardError
-          raise ProxyFetcher::Exceptions::MaximumRetriesReached if max_retries && tries >= max_retries
+          if max_retries && tries >= max_retries
+            ProxyFetcher.logger.warn("reached maximum amount of retries (#{max_retries})")
+            raise ProxyFetcher::Exceptions::MaximumRetriesReached
+          end
 
           ProxiesRegistry.invalidate_proxy!(proxy)
           tries += 1

data/lib/proxy_fetcher/client/request.rb

@@ -4,29 +4,13 @@ module ProxyFetcher
   module Client
     # ProxyFetcher::Client HTTP request abstraction.
     class Request
-      # URL encoding HTTP headers.
-      URL_ENCODED = {
-        'Content-Type' => 'application/x-www-form-urlencoded'
-      }.freeze
-
-      # Default SSL options that will be used for connecting to resources
-      # the uses secure connection. By default ProxyFetcher wouldn't verify
-      # SSL certs.
-      DEFAULT_SSL_OPTIONS = {
-        verify_mode: OpenSSL::SSL::VERIFY_NONE
-      }.freeze
-
-      # @!attribute [r] http
-      #   @return [Class] HTTP client
-      attr_reader :http
-
       # @!attribute [r] method
       #   @return [String, Symbol] HTTP request method
       attr_reader :method
 
-      # @!attribute [r] uri
-      #   @return [URI] Request URI
-      attr_reader :uri
+      # @!attribute [r] url
+      #   @return [String] Request URL
+      attr_reader :url
 
       # @!attribute [r] headers
       #   @return [Hash] HTTP headers
@@ -68,17 +52,17 @@ module ProxyFetcher
       def initialize(args)
         raise ArgumentError, 'args must be a Hash!' unless args.is_a?(Hash)
 
-        @uri = URI.parse(args.fetch(:url))
-        @method = args.fetch(:method).to_s.capitalize
+        @url = args.fetch(:url)
+        @method = args.fetch(:method).to_s.downcase
         @headers = (args[:headers] || {}).dup
-        @payload = preprocess_payload(args[:payload])
+        @payload = args[:payload]
         @timeout = args.fetch(:timeout, ProxyFetcher.config.timeout)
-        @ssl_options = args.fetch(:ssl_options, DEFAULT_SSL_OPTIONS)
+        @ssl_options = args.fetch(:ssl_options, default_ssl_options)
 
         @proxy = args.fetch(:proxy)
         @max_redirects = args.fetch(:max_redirects, 10)
 
-        build_http_client
+        @http = build_http_client
       end
 
       # Executes HTTP request with defined options.
@@ -87,77 +71,51 @@ module ProxyFetcher
       #   response body (requested resource content)
       #
       def execute
-        request = request_class_for(method).new(uri, headers)
-
-        http.start do |connection|
-          process_response!(connection.request(request, payload))
-        end
+        response = send_request
+        response.body.to_s
+      rescue HTTP::Redirector::TooManyRedirectsError
+        raise ProxyFetcher::Exceptions::MaximumRedirectsReached
       end
 
       private
 
-      # Converts payload to the required format, so <code>Hash</code>
-      # must be a WWW-Form encoded for example.
+      # Builds HTTP client.
       #
-      def preprocess_payload(payload)
-        return if payload.nil?
-
-        if payload.is_a?(Hash)
-          headers.merge!(URL_ENCODED)
-          URI.encode_www_form(payload)
-        else
-          payload
-        end
-      end
-
-      # Builds HTTP client based on stdlib Net::HTTP.
-      #
-      # @return [Net::HTTP]
+      # @return [HTTP::Client]
       #   HTTP client
       #
       def build_http_client
-        @http = Net::HTTP.new(uri.host, uri.port, proxy.addr, proxy.port)
-
-        @http.use_ssl = uri.is_a?(URI::HTTPS)
-        @http.verify_mode = ssl_options.fetch(:verify_mode)
-        @http.open_timeout = timeout
-        @http.read_timeout = timeout
+        HTTP.via(proxy.addr, proxy.port.to_i)
+            .headers(headers)
+            .timeout(connect: timeout, read: timeout)
+            .follow(max_hops: max_redirects)
       end
 
-      # Processes HTTP response: checks it status and follows redirect if required.
-      # If response returned an error, then throws it.
+      # Default SSL options that will be used for connecting to resources
+      # the uses secure connection. By default ProxyFetcher wouldn't verify
+      # SSL certs.
       #
-      # @param http_response [Net::HTTPResponse]
-      #   HTTP response object
+      # @return [OpenSSL::SSL::SSLContext] SSL context
       #
-      # @return [String]
-      #   requested resource content
-      #
-      def process_response!(http_response)
-        case http_response
-        when Net::HTTPSuccess then http_response.read_body
-        when Net::HTTPRedirection then follow_redirection(http_response)
-        else
-          http_response.error!
-        end
+      def default_ssl_options
+        ssl_ctx = OpenSSL::SSL::SSLContext.new
+        ssl_ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        ssl_ctx
       end
 
-      # Follows redirection for response.
+      # Sends HTTP request to the URL. Check for the payload and it's type
+      # in order to build valid request.
       #
-      def follow_redirection(http_response)
-        raise ProxyFetcher::Exceptions::MaximumRedirectsReached if max_redirects <= 0
-
-        url = http_response.fetch('location')
-        url = uri.merge(url).to_s unless url.downcase.start_with?('http')
-
-        Request.execute(method: :get, url: url, proxy: proxy, headers: headers, timeout: timeout, max_redirects: max_redirects - 1)
-      end
-
-      # Returns particular Net::HTTP method object
-      # for processing required request.
+      # @return [HTTP::Response] request response
       #
-      def request_class_for(method)
-        Net::HTTP.const_get(method, false)
+      def send_request
+        if payload
+          payload_type = payload.is_a?(String) ? :body : :form
+
+          @http.public_send(method, url, payload_type => payload, ssl_context: ssl_options)
+        else
+          @http.public_send(method, url, ssl_context: ssl_options)
+        end
       end
     end
   end

data/lib/proxy_fetcher/configuration.rb

@@ -17,16 +17,20 @@ module ProxyFetcher
     #   @return [String] User-Agent string
     attr_accessor :user_agent
 
+    # @!attribute [r] logger
+    #   @return [Object] Logger object
+    attr_accessor :logger
+
     # @!attribute [r] adapter
     #   @return [Object] HTML parser adapter
     attr_reader :adapter
 
     # @!attribute [r] http_client
-    #   @return [Class] HTTP client class
+    #   @return [Object] HTTP client class
     attr_reader :http_client
 
     # @!attribute [r] proxy_validator
-    #   @return [Class] proxy validator class
+    #   @return [Object] proxy validator class
     attr_reader :proxy_validator
 
     # @!attribute [r] providers
@@ -54,7 +58,7 @@ module ProxyFetcher
       #   providers registry
       #
       def providers_registry
-        @registry ||= ProvidersRegistry.new
+        @providers_registry ||= ProvidersRegistry.new
       end
 
       # Register new proxy provider. Requires provider name and class
@@ -91,6 +95,7 @@ module ProxyFetcher
 
     # Sets default configuration options
     def reset!
+      @logger = Logger.new(STDOUT)
       @user_agent = DEFAULT_USER_AGENT
       @pool_size = 10
       @timeout = 3

data/lib/proxy_fetcher/null_logger.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module ProxyFetcher
+  class NullLogger
+    # @return [nil]
+    def unknown(*)
+      nil
+    end
+
+    # @return [nil]
+    def fatal(*)
+      nil
+    end
+
+    # @return [nil]
+    def error(*)
+      nil
+    end
+
+    # @return [nil]
+    def warn(*)
+      nil
+    end
+
+    # @return [nil]
+    def info(*)
+      nil
+    end
+
+    # @return [nil]
+    def debug(*)
+      nil
+    end
+  end
+end

data/lib/proxy_fetcher/utils/http_client.rb

@@ -5,25 +5,40 @@ module ProxyFetcher
   # the different providers. Uses ProxyFetcher configuration options
   # for sending HTTP requests to providers URLs.
   class HTTPClient
-    # @!attribute [r] uri
-    #   @return [URI] URI
-    attr_reader :uri
+    # @!attribute [r] url
+    #   @return [String] URL
+    attr_reader :url
 
     # @!attribute [r] http
     #   @return [Net::HTTP] HTTP client
     attr_reader :http
 
+    # @!attribute [r] ssl_ctx
+    #   @return [OpenSSL::SSL::SSLContext] SSL context
+    attr_reader :ssl_ctx
+
+    # Fetches resource content by sending HTTP request to it.
+    # Synthetic sugar to simplify URIes fetching.
+    #
+    # @param url [String] URL
+    #
+    # @return [String]
+    #   resource content
+    #
+    def self.fetch(url)
+      new(url).fetch
+    end
+
     # Initialize HTTP client instance
     #
     # @return [HTTPClient]
     #
     def initialize(url)
-      @uri = URI.parse(url)
-      @http = Net::HTTP.new(@uri.host, @uri.port)
-      return unless https?
+      @url = url.to_s
+      @http = HTTP.headers(default_headers)
 
-      @http.use_ssl = true
-      @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      @ssl_ctx = OpenSSL::SSL::SSLContext.new
+      @ssl_ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
     end
 
     # Fetches resource content by sending HTTP request to it.
@@ -32,32 +47,23 @@ module ProxyFetcher
     #   response body
     #
     def fetch
-      request = Net::HTTP::Get.new(@uri.to_s)
-      request['Connection'] = 'keep-alive'
-      request['User-Agent'] = ProxyFetcher.config.user_agent
-      response = @http.request(request)
-      response.body
+      @http.get(url, ssl_context: ssl_ctx).body.to_s
+    rescue StandardError
+      ProxyFetcher.logger.warn("Failed to load proxy list for #{url}")
+      ''
     end
 
-    # Fetches resource content by sending HTTP request to it.
-    # Synthetic sugar to simplify URIes fetching.
-    #
-    # @param url [String] URL
-    #
-    # @return [String]
-    #   resource content
-    #
-    def self.fetch(url)
-      new(url).fetch
-    end
+    protected
 
-    # Checks if URI requires secure connection (HTTPS)
+    # Default HTTP client headers
     #
-    # @return [Boolean]
-    #   true if URI is HTTPS, false otherwise
+    # @return [Hash]
+    #   hash of HTTP headers
     #
-    def https?
-      @uri.is_a?(URI::HTTPS)
+    def default_headers
+      {
+        'User-Agent' => ProxyFetcher.config.user_agent
+      }
     end
   end
 end

data/lib/proxy_fetcher/utils/proxy_validator.rb

@@ -8,6 +8,18 @@ module ProxyFetcher
     # Default URL that will be used to check if proxy can be used.
     URL_TO_CHECK = 'https://google.com'.freeze
 
+    # Short variant to validate proxy.
+    #
+    # @param proxy_addr [String] proxy address or IP
+    # @param proxy_port [String, Integer] proxy port
+    #
+    # @return [Boolean]
+    #   true if connection to the server using proxy established, otherwise false
+    #
+    def self.connectable?(proxy_addr, proxy_port)
+      new(proxy_addr, proxy_port).connectable?
+    end
+
     # Initialize new ProxyValidator instance
     #
     # @param proxy_addr [String] proxy address or IP
@@ -16,13 +28,9 @@ module ProxyFetcher
     # @return [ProxyValidator]
     #
     def initialize(proxy_addr, proxy_port)
-      uri = URI.parse(URL_TO_CHECK)
-      @http = Net::HTTP.new(uri.host, uri.port, proxy_addr, proxy_port.to_i)
-
-      return unless uri.is_a?(URI::HTTPS)
+      timeout = ProxyFetcher.config.timeout
 
-      @http.use_ssl = true
-      @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      @http = HTTP.follow.via(proxy_addr, proxy_port.to_i).timeout(connect: timeout, read: timeout)
     end
 
     # Checks if proxy is connectable (can be used to connect
@@ -32,26 +40,12 @@ module ProxyFetcher
     #   true if connection to the server using proxy established, otherwise false
     #
     def connectable?
-      @http.open_timeout = ProxyFetcher.config.timeout
-      @http.read_timeout = ProxyFetcher.config.timeout
-
-      @http.start { |connection| return true if connection.request_head('/') }
+      ssl_context = OpenSSL::SSL::SSLContext.new
+      ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
-      false
+      @http.head(URL_TO_CHECK, ssl_context: ssl_context).status.success?
     rescue StandardError
       false
     end
-
-    # Short variant to validate proxy.
-    #
-    # @param proxy_addr [String] proxy address or IP
-    # @param proxy_port [String, Integer] proxy port
-    #
-    # @return [Boolean]
-    #   true if connection to the server using proxy established, otherwise false
-    #
-    def self.connectable?(proxy_addr, proxy_port)
-      new(proxy_addr, proxy_port).connectable?
-    end
   end
 end

data/lib/proxy_fetcher/version.rb

@@ -13,9 +13,9 @@ module ProxyFetcher
     # Major version number
     MAJOR = 0
     # Minor version number
-    MINOR = 6
+    MINOR = 7
     # Smallest version number
-    TINY  = 5
+    TINY  = 0
 
     # Full version number
     STRING = [MAJOR, MINOR, TINY].compact.join('.')

data/proxy_fetcher.gemspec

@@ -18,5 +18,7 @@ Gem::Specification.new do |gem|
   gem.license = 'MIT'
   gem.required_ruby_version = '>= 2.0.0'
 
+  gem.add_runtime_dependency 'http', '~> 3.0'
+
   gem.add_development_dependency 'rspec', '~> 3.5'
 end

data/spec/proxy_fetcher/client/client_spec.rb

@@ -6,7 +6,7 @@ require 'json'
 require 'evil-proxy'
 require 'evil-proxy/async'
 
-describe ProxyFetcher::Client do
+xdescribe ProxyFetcher::Client do
   before :all do
     ProxyFetcher.configure do |config|
       config.provider = :xroxy
@@ -32,14 +32,12 @@ describe ProxyFetcher::Client do
     it 'successfully returns page content for HTTP' do
       content = ProxyFetcher::Client.get('http://httpbin.org')
 
-      expect(content).not_to be_nil
       expect(content).not_to be_empty
     end
 
     it 'successfully returns page content for HTTPS' do
       content = ProxyFetcher::Client.get('https://httpbin.org')
 
-      expect(content).not_to be_nil
       expect(content).not_to be_empty
     end
 
@@ -49,7 +47,6 @@ describe ProxyFetcher::Client do
       proxy = manager.get! until proxy
       content = ProxyFetcher::Client.get('http://httpbin.org', options: { proxy: proxy })
 
-      expect(content).not_to be_nil
       expect(content).not_to be_empty
     end
   end
@@ -59,9 +56,8 @@ describe ProxyFetcher::Client do
       headers = {
         'X-Proxy-Fetcher-Version' => ProxyFetcher::VERSION::STRING
       }
-      content = ProxyFetcher::Client.post('http://httpbin.org/post', { param: 'value'} , headers: headers)
+      content = ProxyFetcher::Client.post('http://httpbin.org/post', { param: 'value' } , headers: headers)
 
-      expect(content).not_to be_nil
       expect(content).not_to be_empty
 
       json = JSON.parse(content)
@@ -75,12 +71,11 @@ describe ProxyFetcher::Client do
     it 'successfully returns page content for HTTP' do
       content = ProxyFetcher::Client.put('http://httpbin.org/put', 'param=PutValue')
 
-      expect(content).not_to be_nil
       expect(content).not_to be_empty
 
       json = JSON.parse(content)
 
-      expect(json['form']['param']).to eq('PutValue')
+      expect(json['data']).to eq('param=PutValue')
     end
   end
 
@@ -88,7 +83,6 @@ describe ProxyFetcher::Client do
     it 'successfully returns page content for HTTP' do
       content = ProxyFetcher::Client.patch('http://httpbin.org/patch', param: 'value')
 
-      expect(content).not_to be_nil
       expect(content).not_to be_empty
 
       json = JSON.parse(content)
@@ -101,7 +95,6 @@ describe ProxyFetcher::Client do
     it 'successfully returns page content for HTTP' do
       content = ProxyFetcher::Client.delete('http://httpbin.org/delete')
 
-      expect(content).not_to be_nil
       expect(content).not_to be_empty
     end
   end
@@ -110,7 +103,7 @@ describe ProxyFetcher::Client do
     it 'successfully works' do
       content = ProxyFetcher::Client.head('http://httpbin.org')
 
-      expect(content).to be_nil
+      expect(content).to be_empty
     end
   end
 
@@ -122,7 +115,7 @@ describe ProxyFetcher::Client do
     end
 
     it 'raises an error when http request returns an error' do
-      allow_any_instance_of(Net::HTTP).to receive(:request).and_return(Net::HTTPBadRequest.new('', '', ''))
+      allow_any_instance_of(HTTP::Client).to receive(:get).and_return(StandardError.new)
 
       expect { ProxyFetcher::Client.get('http://httpbin.org') }.to raise_error(ProxyFetcher::Exceptions::MaximumRetriesReached)
     end
@@ -138,7 +131,6 @@ describe ProxyFetcher::Client do
     it 'follows redirect when present' do
       content = ProxyFetcher::Client.get('http://httpbin.org/absolute-redirect/2')
 
-      expect(content).not_to be_nil
       expect(content).not_to be_empty
     end
 

data/spec/proxy_fetcher/providers/base_spec.rb

@@ -27,4 +27,25 @@ describe ProxyFetcher::Providers::Base do
       expect(error.message).to include('to_proxy')
     end
   end
+
+  it 'logs failed to load proxy providers' do
+    CustomProvider = Class.new(ProxyFetcher::Providers::Base) do
+      def load_proxy_list(*)
+        doc = load_document('https://google.com', {})
+        doc.xpath('//table[contains(@class, "table")]/tr[(not(@id="proxy-table-header")) and (count(td)>2)]')
+      end
+    end
+
+    logger = Logger.new(StringIO.new)
+
+    ProxyFetcher::Configuration.register_provider(:custom_provider, CustomProvider)
+    ProxyFetcher.config.provider = :custom_provider
+    ProxyFetcher.config.logger = logger
+
+    allow_any_instance_of(HTTP::Client).to receive(:get).and_raise(StandardError)
+
+    expect(logger).to receive(:warn).with(/Failed to load proxy list for http[s:\/]/)
+
+    ProxyFetcher::Manager.new
+  end
 end

data/spec/proxy_fetcher/proxy_spec.rb

@@ -3,15 +3,7 @@
 require 'spec_helper'
 
 describe ProxyFetcher::Proxy do
-  before :all do
-    ProxyFetcher.config.provider = :proxy_docker
-  end
-
-  before do
-    @manager = ProxyFetcher::Manager.new
-  end
-
-  let(:proxy) { @manager.proxies.first.dup }
+  let(:proxy) { described_class.new(addr: '192.169.1.1', port: 8080, type: 'HTTP') }
 
   it 'can initialize a new proxy object' do
     proxy = described_class.new(addr: '192.169.1.1', port: 8080, type: 'HTTP')
@@ -48,14 +40,8 @@ describe ProxyFetcher::Proxy do
   end
 
   it 'not connectable if there are some error during connection request' do
-    allow_any_instance_of(Net::HTTP).to receive(:start).and_raise(Errno::ECONNABORTED)
-    expect(proxy.connectable?).to be_falsey
-  end
-
-  it "not connectable if server doesn't respond to head" do
-    allow_any_instance_of(Net::HTTP).to receive(:start).and_return(false)
+    allow_any_instance_of(HTTP::Client).to receive(:head).and_raise(HTTP::TimeoutError)
     expect(proxy.connectable?).to be_falsey
-    expect(proxy.valid?).to be_falsey
   end
 
   it 'returns URI::Generic' do
@@ -69,7 +55,7 @@ describe ProxyFetcher::Proxy do
     expect(proxy.url).to be_a(String)
   end
 
-  it 'returns URL with schema' do
+  it 'returns URL with scheme' do
     expect(proxy.url(scheme: true)).to include('://')
   end
 end

data/spec/proxy_fetcher/version_spec.rb

@@ -1,3 +1,3 @@
 RSpec.describe ProxyFetcher::VERSION do
-  it { expect(ProxyFetcher::VERSION::STRING).to eq '0.6.4' }
+  it { expect(ProxyFetcher::VERSION::STRING).to eq '0.7.0' }
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: proxy_fetcher
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Nikita Bulai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +72,7 @@ files:
 - lib/proxy_fetcher/document/node.rb
 - lib/proxy_fetcher/exceptions.rb
 - lib/proxy_fetcher/manager.rb
+- lib/proxy_fetcher/null_logger.rb
 - lib/proxy_fetcher/providers/base.rb
 - lib/proxy_fetcher/providers/free_proxy_list.rb
 - lib/proxy_fetcher/providers/free_proxy_list_ssl.rb