Depend on Faraday 2.0 (#5)

Author: olleolleolle

.github/workflows/ci.yml

@@ -33,7 +33,6 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 2.5
           - 2.6
           - 2.7
           - '3.0'

Gemfile

@@ -3,7 +3,6 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'faraday', '~> 1.0'
 gem 'multipart-parser', '~> 0.1.1'
 gem 'rack-test', '>= 0.6'
 gem 'rake', '~> 13.0'

faraday-rack.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir.glob('lib/**/*') + %w[README.md LICENSE.md]
   spec.require_paths = ['lib']
+
+  spec.add_runtime_dependency 'faraday', '~> 2.0'
 end

lib/faraday/adapter/rack.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rack/test'
+require 'timeout'
 
 module Faraday
   class Adapter
@@ -40,7 +41,7 @@ def call(env)
         timeout = request_timeout(:open, env[:request])
         timeout ||= request_timeout(:read, env[:request])
         response = if timeout
-                     Timer.timeout(timeout, Faraday::TimeoutError) do
+                     ::Timeout.timeout(timeout, Faraday::TimeoutError) do
                        execute_request(env, rack_env)
                      end
                    else

lib/faraday/rack.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'faraday'
 require 'faraday/adapter/rack'
 require 'faraday/rack/version'