Allow Faraday 2.x, by switching from faraday-middleware to the new faraday_follow-redirects gem

The new gem is compatible with both faraday 1 and 2, while faraday-middleware (which included a redirect middleware) has a gemspec that does not allow faraday 2.

Author: jrochkind

lib/oai/client.rb

@@ -95,7 +95,8 @@ def initialize(base_url, options={})
           follow_redirects = 5 if follow_redirects == true
 
           if follow_redirects
-            require 'faraday_middleware'
+            require 'faraday/follow_redirects'
+            builder.use Faraday::FollowRedirects::Middleware
             builder.response :follow_redirects, :limit => follow_redirects.to_i
           end
           builder.adapter :net_http

ruby-oai.gemspec

@@ -12,8 +12,10 @@ Gem::Specification.new do |s|
     s.executables = 'oai'
 
     s.add_dependency('builder', '>=3.1.0')
-    s.add_dependency('faraday')
-    s.add_dependency('faraday_middleware')
+    s.add_dependency('faraday', "< 3")
+    #s.add_dependency('faraday_middleware')
+    s.add_dependency("faraday-follow_redirects", ">= 0.3.0", "< 2")
+
 
     s.add_development_dependency "activerecord", ">= 5.2.0", "< 6.1"
     s.add_development_dependency "appraisal"

test/client/tc_http_client.rb

@@ -58,8 +58,8 @@ def test_http_client_handles_trailing_slash_redirects
     end
 
     faraday_stub = Faraday.new do |builder|
-      require 'faraday_middleware'
-      builder.use FaradayMiddleware::FollowRedirects
+      require 'faraday/follow_redirects'
+      builder.use Faraday::FollowRedirects::Middleware
       builder.adapter :test, stubs
     end