Fix compatibility with both Ruby 3.0 and Faraday 0.17.x (#206)

* Add webrick dependency

This is required for testing and is no longer bundled as of Ruby 3.0

* Allow specifying faraday version in Gemfile

* Specify faraday adapter in directory client

This is required for the test suite to pass in Faraday 0.17.x

* Fix kwarg issue under faraday 0.17.x and Ruby 3

Author: jhawthorn

Gemfile

@@ -2,6 +2,10 @@ source 'https://rubygems.org'
 
 gemspec
 
+if faraday_version = ENV['FARADAY_VERSION']
+  gem 'faraday', faraday_version
+end
+
 group :development, :test do
   gem 'pry'
   gem 'rubocop', '~> 0.49.0'

acme-client.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.9'
   spec.add_development_dependency 'vcr', '~> 2.9'
   spec.add_development_dependency 'webmock', '~> 3.8'
+  spec.add_development_dependency 'webrick'
 
   spec.add_runtime_dependency 'faraday', '>= 0.17', '< 2.0.0'
 end

lib/acme/client/faraday_middleware.rb

@@ -5,10 +5,10 @@ class Acme::Client::FaradayMiddleware < Faraday::Middleware
 
   CONTENT_TYPE = 'application/jose+json'
 
-  def initialize(app, client:, mode:)
+  def initialize(app, options)
     super(app)
-    @client = client
-    @mode = mode
+    @client = options.fetch(:client)
+    @mode = options.fetch(:mode)
   end
 
   def call(env)

lib/acme/client/resources/directory.rb

@@ -70,6 +70,8 @@ def load_directory
   def fetch_directory
     connection = Faraday.new(url: @directory, **@connection_options) do |configuration|
       configuration.use Acme::Client::FaradayMiddleware, client: nil, mode: nil
+
+      configuration.adapter Faraday.default_adapter
     end
     connection.headers[:user_agent] = Acme::Client::USER_AGENT
     response = connection.get(@url)