Add Ruby 3 to Travis

.travis.yml

@@ -4,7 +4,7 @@ cache: bundler
 before_install:
   - "find /home/travis/.rvm/rubies -wholename '*default/bundler-*.gemspec' -delete"
   - rvm @global do gem uninstall bundler -a -x -I || true
-  - gem install bundler -v '~> 1.10'
+  - gem install bundler
 
 bundler_args: --without yard guard benchmarks
 env: JRUBY_OPTS="$JRUBY_OPTS --debug"
@@ -18,6 +18,7 @@ rvm:
   - 2.5
   - 2.6
   - 2.7
+  - 3.0
   - ruby-head
   - jruby-9.2.8.0
   - truffleruby-head

Gemfile

@@ -6,9 +6,10 @@ gemspec
 
 gem "nokogiri", "~> 1.8"
 gem "oga", "~> 3.2"
-gem "rubocop", "~> 0.80"
+gem "rubocop", "~> 1.0"
 
 group :test do
   gem "coveralls", require: false
+  gem "webrick"
   gem "evil-proxy", "~> 0.2"
 end

gemfiles/nokogiri.gemfile

@@ -8,6 +8,6 @@ gem "nokogiri", "~> 1.8"
 
 group :test do
   gem "coveralls", require: false
+  gem "webrick"
   gem "evil-proxy", "~> 0.2"
-  gem "rspec", "~> 3.9"
 end

gemfiles/oga.gemfile

@@ -8,6 +8,6 @@ gem "oga", "~> 3.0"
 
 group :test do
   gem "coveralls", require: false
+  gem "webrick"
   gem "evil-proxy", "~> 0.2"
-  gem "rspec", "~> 3.9"
 end

lib/proxy_fetcher/client/request.rb

@@ -41,15 +41,15 @@ class Request
       # @return [String]
       #   response body (requested resource content)
       #
-      def self.execute(args)
-        new(args).execute
+      def self.execute(**args)
+        new(**args).execute
       end
 
       # Initialize new HTTP request
       #
       # @return [Request]
       #
-      def initialize(args)
+      def initialize(**args)
         raise ArgumentError, "args must be a Hash!" unless args.is_a?(Hash)
 
         @url = args.fetch(:url)

lib/proxy_fetcher/utils/http_client.rb

@@ -41,9 +41,8 @@ class HTTPClient
     # @return [String]
     #   resource content
     #
-    def self.fetch(*args)
-      url = args.shift
-      new(url, **args.first).fetch
+    def self.fetch(*args, **kwargs, &block)
+      new(*args, **kwargs, &block).fetch
     end
 
     # Initialize HTTP client instance
@@ -56,20 +55,25 @@ def initialize(url, method: :get, params: {}, headers: {})
       @params = params
       @headers = headers
 
-      @http = HTTP.headers(default_headers.merge(headers)).timeout(connect: timeout, read: timeout)
+      unless HTTP::Request::METHODS.include?(@method)
+        raise ArgumentError, "'#{@method}' is a wrong HTTP method name"
+      end
+
       @timeout = ProxyFetcher.config.provider_proxies_load_timeout
+      @http = build_http_engine
 
-      @ssl_ctx = OpenSSL::SSL::SSLContext.new
-      @ssl_ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      @ssl_ctx = build_ssl_context
     end
 
     # Fetches resource content by sending HTTP request to it.
     #
     # @return [String]
     #   response body
     #
-    def fetch
-      response = process_http_request
+    def fetch(**options)
+      response = perform_http_request
+      return response if options.fetch(:raw, false)
+
       response.body.to_s
     rescue StandardError => e
       ProxyFetcher.config.logger.warn("Failed to process request to #{url} (#{e.message})")
@@ -78,13 +82,20 @@ def fetch
 
     protected
 
-    def process_http_request(http_method: method, http_params: params)
-      unless HTTP::Request::METHODS.include?(http_method)
-        raise ArgumentError, "'#{http_method}' is a wrong HTTP method name!"
+    def build_ssl_context
+      OpenSSL::SSL::SSLContext.new.tap do |content|
+        content.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
+    end
+
+    def build_http_engine
+      HTTP.headers(default_headers.merge(headers)).timeout(connect: timeout, read: timeout)
+    end
 
+    def perform_http_request(http_method: method, http_params: params)
       http.public_send(
-        http_method.to_sym, url,
+        http_method.to_sym,
+        url,
         form: http_params,
         ssl_context: ssl_ctx
       )

spec/proxy_fetcher/client/client_spec.rb

@@ -3,6 +3,11 @@
 require "spec_helper"
 require "json"
 
+begin
+  require "webrick"
+rescue LoadError
+  # nop
+end
 require "evil-proxy"
 require "evil-proxy/async"