Merge pull request #91 from code4lib/allow_faraday_2

Allow Faraday 2.x

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
@@ -330,14 +331,27 @@ def parse_date(value)
     # Regex is from WebCollab:
     #   http://webcollab.sourceforge.net/unicode.html
     def strip_invalid_utf_8_chars(xml)
-      xml && xml.gsub(/[\x00-\x08\x10\x0B\x0C\x0E-\x19\x7F]
+      return nil unless xml
+
+      # If it's in a specific encoding other than BINARY, it may trigger
+      # an exception to try to gsub these illegal bytes. Temporarily
+      # put it in BINARY. NOTE: We're not totally sure what's going on
+      # with encodings in this gem in general, it might not be totally reasonable.
+      orig_encoding = xml.encoding
+      xml.force_encoding("BINARY")
+
+      xml = xml.gsub(/[\x00-\x08\x10\x0B\x0C\x0E-\x19\x7F]
                              | [\x00-\x7F][\x80-\xBF]+
                              | ([\xC0\xC1]|[\xF0-\xFF])[\x80-\xBF]*
                              | [\xC2-\xDF]((?![\x80-\xBF])|[\x80-\xBF]{2,})
                              | [\xE0-\xEF](([\x80-\xBF](?![\x80-\xBF]))
                              | (?![\x80-\xBF]{2})|[\x80-\xBF]{3,})/x, '?')\
                 .gsub(/\xE0[\x80-\x9F][\x80-\xBF]
                        | \xED[\xA0-\xBF][\x80-\xBF]/,'?')
+
+      xml.force_encoding(orig_encoding)
+
+      xml
     end
 
   end

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", "< 7.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