updated rubocop to 1.0.0 on possible rubies, making the necessary changes

.rubocop-2.4.yml

@@ -1 +1,7 @@
 inherit_from: .rubocop-2.3.yml
+
+Style/OptionalBooleanParameter:
+  Enabled: false
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false

.rubocop-2.5.yml

@@ -1 +1 @@
-inherit_from: .rubocop-2.3.yml
+inherit_from: .rubocop-2.4.yml

.rubocop-2.6.yml

@@ -1 +1 @@
-inherit_from: .rubocop-2.3.yml
+inherit_from: .rubocop-2.4.yml

.rubocop-2.7.yml

@@ -1 +1 @@
-inherit_from: .rubocop-2.3.yml
+inherit_from: .rubocop-2.4.yml

.rubocop-3.0.yml

@@ -1 +1 @@
-inherit_from: .rubocop-2.3.yml
+inherit_from: .rubocop-2.4.yml

.rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   DisplayCopNames: true
   Include:
     - lib/**/*.rb

.rubocop_todo.yml

@@ -37,3 +37,8 @@ Style/Documentation:
 Naming/AccessorMethodName:
   Enabled: false
 
+Lint/UriEscapeUnescape:
+  Enabled: false
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false

Gemfile

@@ -16,8 +16,10 @@ group :test do
     gem "net-ssh", "~> 4.2.0"
   elsif RUBY_VERSION < "2.3"
     gem "rubocop", "~> 0.68.1"
+  elsif RUBY_VERSION < "2.3"
+    gem "rubocop", "~> 0.81.1"
   else
-    gem "rubocop", "~> 0.80.0"
+    gem "rubocop", "~> 1.0.0"
     gem "rubocop-performance", "~> 1.5.2"
   end
 

lib/httpx/adapters/faraday.rb

@@ -121,7 +121,7 @@ module Faraday
           end
 
           def respond_to_missing?(meth)
-            @env.respond_to?(meth)
+            @env.respond_to?(meth) || super
           end
 
           def method_missing(meth, *args, &blk)

lib/httpx/connection.rb

@@ -142,7 +142,7 @@ module HTTPX
       end
     end
 
-    def purge_pending
+    def purge_pending(&block)
       pendings = []
       if @parser
         @inflight -= @parser.pending.size
@@ -150,9 +150,7 @@ module HTTPX
       end
       pendings << @pending
       pendings.each do |pending|
-        pending.reject! do |request|
+        pending.reject!(&block)
-          yield request
-        end
       end
     end
 
@@ -460,7 +458,6 @@ module HTTPX
       throw(:jump_tick)
     rescue Errno::ECONNREFUSED,
            Errno::EADDRNOTAVAIL,
-           Errno::EHOSTUNREACH,
            OpenSSL::SSL::SSLError => e
       # connect errors, exit gracefully
       handle_error(e)

lib/httpx/connection/http1.rb

@@ -181,7 +181,7 @@ module HTTPX
     def manage_connection(response)
       connection = response.headers["connection"]
       case connection
-      when /keep\-alive/i
+      when /keep-alive/i
         keep_alive = response.headers["keep-alive"]
         return unless keep_alive
 

lib/httpx/errors.rb

@@ -28,6 +28,7 @@ module HTTPX
 
   NativeResolveError = Class.new(ResolveError) do
     attr_reader :connection, :host
+
     def initialize(connection, host, message = "Can't resolve #{host}")
       @connection = connection
       @host = host

lib/httpx/extensions.rb

@@ -54,6 +54,18 @@ module HTTPX
     Numeric.__send__(:include, NegMethods)
   end
 
+  module RegexpExtensions
+    # If you wonder why this is there: the oauth feature uses a refinement to enhance the
+    # Regexp class locally with #match? , but this is never tested, because ActiveSupport
+    # monkey-patches the same method... Please ActiveSupport, stop being so intrusive!
+    # :nocov:
+    refine(Regexp) do
+      def match?(*args)
+        !match(*args).nil?
+      end
+    end
+  end
+
   module URIExtensions
     refine URI::Generic do
       def non_ascii_hostname

lib/httpx/io/tcp.rb

@@ -7,11 +7,7 @@ module HTTPX
   class TCP
     include Loggable
 
-    attr_reader :ip, :port
+    attr_reader :ip, :port, :addresses, :state
-
-    attr_reader :addresses
-
-    attr_reader :state
 
     alias_method :host, :ip
 

lib/httpx/io/unix.rb

@@ -8,6 +8,7 @@ module HTTPX
 
     def_delegator :@uri, :port, :scheme
 
+    # rubocop:disable Lint/MissingSuper
     def initialize(uri, addresses, options)
       @uri = uri
       @addresses = addresses
@@ -29,6 +30,7 @@ module HTTPX
       end
       @io ||= build_socket
     end
+    # rubocop:enable Lint/MissingSuper
 
     def hostname
       @uri.host

lib/httpx/parser/http1.rb

@@ -57,7 +57,7 @@ module HTTPX
         idx = @buffer.index("\n")
         return unless idx
 
-        (m = %r{\AHTTP(?:\/(\d+\.\d+))?\s+(\d\d\d)(?:\s+(.*))?}in.match(@buffer)) ||
+        (m = %r{\AHTTP(?:/(\d+\.\d+))?\s+(\d\d\d)(?:\s+(.*))?}in.match(@buffer)) ||
           raise(Error, "wrong head line format")
         version, code, _ = m.captures
         raise(Error, "unsupported HTTP version (HTTP/#{version})") unless VERSIONS.include?(version)

lib/httpx/plugins/compression.rb

@@ -46,11 +46,8 @@ module HTTPX
           super
           return if @body.nil?
 
-          if (threshold = options.compression_threshold_size)
+          threshold = options.compression_threshold_size
-            unless unbounded_body?
+          return if threshold && !unbounded_body? && @body.bytesize < threshold
-              return if @body.bytesize < threshold
-            end
-          end
 
           @headers.get("content-encoding").each do |encoding|
             next if encoding == "identity"

lib/httpx/plugins/cookies/cookie.rb

@@ -11,13 +11,7 @@ module HTTPX
       # least)
       MAX_LENGTH = 4096
 
-      attr_reader :domain
+      attr_reader :domain, :path, :name, :value, :created_at
-
-      attr_reader :path
-
-      attr_reader :name, :value
-
-      attr_reader :created_at
 
       def path=(path)
         path = String(path)

lib/httpx/plugins/cookies/set_cookie_parser.rb

@@ -3,23 +3,10 @@
 require "strscan"
 require "time"
 
-module HTTPX::Plugins::Cookies
+module HTTPX
+  module Plugins::Cookies
     module SetCookieParser
-    unless Regexp.method_defined?(:match?)
+      using(RegexpExtensions) unless Regexp.method_defined?(:match?)
-      # If you wonder why this is there: the oauth feature uses a refinement to enhance the
-      # Regexp class locally with #match? , but this is never tested, because ActiveSupport
-      # monkey-patches the same method... Please ActiveSupport, stop being so intrusive!
-      # :nocov:
-      module RegexpExtensions
-        refine(Regexp) do
-          def match?(*args)
-            !match(*args).nil?
-          end
-        end
-      end
-      using(RegexpExtensions)
-      # :nocov:
-    end
 
       # Whitespace.
       RE_WSP = /[ \t]+/.freeze
@@ -78,7 +65,7 @@ module HTTPX::Plugins::Cookies
         name = scanner.scan(RE_NAME)
         name.rstrip! if name
 
-      if scanner.skip(/\=/)
+        if scanner.skip(/=/)
           value = scan_value(scanner, comma_as_separator)
         else
           scan_value(scanner, comma_as_separator)
@@ -152,3 +139,4 @@ module HTTPX::Plugins::Cookies
       end
     end
   end
+end

lib/httpx/plugins/digest_authentication.rb

@@ -81,7 +81,7 @@ module HTTPX
 
           uri = request.path
 
-          params = Hash[auth_info.split(/ *, */)
+          params = Hash[auth_info.split(/ *, */) # rubocop:disable Style/HashTransformValues
                                  .map { |val| val.split("=") }
                                  .map { |k, v| [k, v.delete("\"")] }]
           nonce = params["nonce"]

lib/httpx/plugins/expect.rb

@@ -33,11 +33,8 @@ module HTTPX
           super
           return if @body.nil?
 
-          if (threshold = options.expect_threshold_size)
+          threshold = options.expect_threshold_size
-            unless unbounded_body?
+          return if threshold && !unbounded_body? && @body.bytesize < threshold
-              return if @body.bytesize < threshold
-            end
-          end
 
           @headers["expect"] = "100-continue"
         end

lib/httpx/plugins/proxy/socks4.rb

@@ -91,6 +91,8 @@ module HTTPX
         end
 
         module Packet
+          using(RegexpExtensions) unless Regexp.method_defined?(:match?)
+
           module_function
 
           def connect(parameters, uri)
@@ -101,7 +103,7 @@ module HTTPX
 
               packet << [ip.to_i].pack("N")
             rescue IPAddr::InvalidAddressError
-              if parameters.uri.scheme =~ /^socks4a?$/
+              if /^socks4a?$/.match?(parameters.uri.scheme)
                 # resolv defaults to IPv4, and socks4 doesn't support IPv6 otherwise
                 ip = IPAddr.new(Resolv.getaddress(uri.host))
                 packet << [ip.to_i].pack("N")

lib/httpx/pool.rb

@@ -166,7 +166,6 @@ module HTTPX
         resolver.on(:error, &method(:on_resolver_error))
         resolver.on(:close) { on_resolver_close(resolver) }
         resolver
-      # rubocop: disable Layout/RescueEnsureAlignment
       rescue ArgumentError
         # this block is here because of an error which happens on CI from time to time
         warn "tried resolver: #{resolver_type}"
@@ -174,7 +173,6 @@ module HTTPX
         warn "new: #{resolver_type.method(:new).source_location}"
         raise
       end
-      # rubocop: enable Layout/RescueEnsureAlignment
     end
   end
 end

lib/httpx/request.rb

@@ -33,9 +33,7 @@ module HTTPX
 
     USER_AGENT = "httpx.rb/#{VERSION}"
 
-    attr_reader :verb, :uri, :headers, :body, :state
+    attr_reader :verb, :uri, :headers, :body, :state, :options, :response
-
-    attr_reader :options, :response
 
     def_delegator :@body, :empty?
 

lib/httpx/resolver/https.rb

@@ -213,7 +213,7 @@ module HTTPX
       case response.headers["content-type"]
       when "application/dns-json",
            "application/json",
-           %r{^application\/x\-javascript} # because google...
+           %r{^application/x-javascript} # because google...
         payload = JSON.parse(response.to_s)
         payload["Answer"]
       when "application/dns-udpwireformat",

lib/httpx/selector.rb

@@ -51,7 +51,7 @@ class HTTPX::Selector
   READ_INTERESTS = %i[r rw].freeze
   WRITE_INTERESTS = %i[w rw].freeze
 
-  def select_many(interval)
+  def select_many(interval, &block)
     selectables, r, w = nil
 
     # first, we group IOs based on interest type. On call to #interests however,
@@ -102,9 +102,7 @@ class HTTPX::Selector
       writers.delete(io)
     end if readers
 
-    writers.each do |io|
+    writers.each(&block) if writers
-      yield io
-    end if writers
   end
 
   def select_one(interval)

lib/httpx/session.rb

@@ -190,7 +190,6 @@ module HTTPX
       begin
         # guarantee ordered responses
         loop do
-          begin
           request = requests.first
           pool.next_tick until (response = fetch_response(request, connections, request_options))
 
@@ -199,7 +198,6 @@ module HTTPX
 
           break if requests.empty? || pool.empty?
         end
-        end
         responses
       ensure
         close(connections) unless @persistent

profiler/helpers.rb

@@ -91,10 +91,8 @@ module ProfilerHelpers
     end
   end
 
-  def memory_profile
+  def memory_profile(&block)
     require "memory_profiler"
-    MemoryProfiler.report(allow_files: ["lib/httpx"]) do
+    MemoryProfiler.report(allow_files: ["lib/httpx"], &block).pretty_print
-      yield
-    end.pretty_print
   end
 end

test/http_test.rb

@@ -40,8 +40,8 @@ class HTTPTest < Minitest::Test
     assert log_output.match(/HEADER: Connection: close/)
     # assert response headers
     assert log_output.match(%r{HEADLINE: 200 HTTP/1\.1})
-    assert log_output.match(/HEADER: content\-type: \w+/)
+    assert log_output.match(/HEADER: content-type: \w+/)
-    assert log_output.match(/HEADER: content\-length: \d+/)
+    assert log_output.match(/HEADER: content-length: \d+/)
   end
 
   private

test/https_test.rb

@@ -70,8 +70,8 @@ class HTTPSTest < Minitest::Test
     assert log_output.match(%r{HEADER: accept: */*})
     # assert response headers
     assert log_output.match(/HEADER: :status: 200/)
-    assert log_output.match(/HEADER: content\-type: \w+/)
+    assert log_output.match(/HEADER: content-type: \w+/)
-    assert log_output.match(/HEADER: content\-length: \d+/)
+    assert log_output.match(/HEADER: content-length: \d+/)
   end
 
   private

test/support/requests/plugins/cookies.rb

@@ -192,7 +192,7 @@ module Requests
       end
 
       def cookies_set_uri(cookies)
-        build_uri("/cookies/set?" + URI.encode_www_form(cookies))
+        build_uri("/cookies/set?#{URI.encode_www_form(cookies)}")
       end
 
       def verify_cookies(jar, cookies)

test/support/requests/plugins/follow_redirects.rb

@@ -67,7 +67,7 @@ module Requests
       private
 
       def redirect_uri(redirect_uri = redirect_location)
-        build_uri("/redirect-to?url=" + redirect_uri)
+        build_uri("/redirect-to?url=#{redirect_uri}")
       end
 
       def max_redirect_uri(n)

test/support/requests/with_body.rb

@@ -88,8 +88,8 @@ module Requests
       define_method :"test_#{meth}_multiple_params" do
         uri = build_uri("/#{meth}")
         response1, response2 = HTTPX.request([
-                                               [meth, uri, body: "data"],
+                                               [meth, uri, { body: "data" }],
-                                               [meth, uri, form: { "foo" => "bar" }],
+                                               [meth, uri, { form: { "foo" => "bar" } }],
                                              ], max_concurrent_requests: 1) # because httpbin sucks and can't handle pipeline requests
 
         verify_status(response1, 200)