Merge pull request #2940 from sul-dlss/faraday

Upgrade to faraday 2

Author: jcoyne

Gemfile

@@ -46,6 +46,7 @@ gem 'config'
 gem 'dry-monads'
 gem 'equivalent-xml', '>= 0.6.0' # For ignoring_attr_values() with arguments
 gem 'faraday'
+gem 'faraday-multipart'
 gem 'honeybadger', '~> 4.1'
 gem 'lograge'
 gem 'sidekiq', '~> 6.0'
@@ -71,12 +72,12 @@ gem 'openapi_parser', '< 1.0'
 # Stanford related gems
 gem 'blacklight', '~> 7.20'
 gem 'blacklight-hierarchy', '~> 5.1'
-gem 'dor-services-client', '~> 7.10'
-gem 'dor-workflow-client', '~> 3.19'
+gem 'dor-services-client', '~> 8.0'
+gem 'dor-workflow-client', '~> 4.0'
 gem 'druid-tools'
 gem 'mods_display', '~> 1.0.0.alpha1'
 gem 'okcomputer' # monitors application and its dependencies
-gem 'preservation-client', '~> 3.2'
+gem 'preservation-client', '~> 4.0'
 gem 'rsolr'
 gem 'sdr-client', '~> 0.60'
 

Gemfile.lock

@@ -76,15 +76,15 @@ GEM
       parser (>= 2.4)
       smart_properties
     bindex (0.8.1)
-    blacklight (7.22.2)
+    blacklight (7.23.0.1)
       deprecation
       globalid
       i18n (>= 1.7.0)
       jbuilder (~> 2.7)
       kaminari (>= 0.15)
       ostruct (>= 0.3.2)
-      rails (>= 5.1, < 7)
-      view_component (~> 2.42)
+      rails (>= 5.1, < 7.1)
+      view_component (~> 2.43)
     blacklight-hierarchy (5.4.0)
       blacklight (~> 7.18)
       deprecation
@@ -168,17 +168,18 @@ GEM
       capistrano-one_time_key
       capistrano-shared_configs
     docile (1.4.0)
-    dor-services-client (7.12.0)
+    dor-services-client (8.0.0)
       activesupport (>= 4.2, < 8)
       cocina-models (~> 0.66.0)
       deprecation
-      faraday (>= 0.15, < 2)
+      faraday (~> 2.0)
+      faraday-retry
       zeitwerk (~> 2.1)
-    dor-workflow-client (3.24.0)
+    dor-workflow-client (4.0.0)
       activesupport (>= 3.2.1, < 8)
       deprecation (>= 0.99.0)
-      faraday (>= 0.9.2, < 2.0)
-      faraday_middleware
+      faraday (~> 2.0)
+      faraday-retry
       nokogiri (~> 1.6)
       zeitwerk (~> 2.1)
     druid-tools (2.1.0)
@@ -240,31 +241,13 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (1.10.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+    faraday (2.2.0)
+      faraday-net_http (~> 2.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
     faraday-multipart (1.0.3)
       multipart-post (>= 1.2, < 3)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
+    faraday-net_http (2.0.1)
     faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
     ffi (1.15.5)
     globalid (1.0.0)
       activesupport (>= 5.0)
@@ -313,7 +296,7 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
     minitest (5.15.0)
-    moab-versioning (4.4.2)
+    moab-versioning (5.0.0)
       druid-tools (>= 1.0.0)
       json
       nokogiri
@@ -363,10 +346,10 @@ GEM
       ttfunk (~> 1.4.0)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
-    preservation-client (3.5.0)
+    preservation-client (4.0.0)
       activesupport (>= 4.2, < 8)
-      faraday (>= 0.15, < 2.0)
-      moab-versioning (~> 4.3)
+      faraday (~> 2.0)
+      moab-versioning (~> 5.0)
       zeitwerk (~> 2.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -584,14 +567,15 @@ DEPENDENCIES
   devise
   devise-remote-user (~> 1.0)
   dlss-capistrano
-  dor-services-client (~> 7.10)
-  dor-workflow-client (~> 3.19)
+  dor-services-client (~> 8.0)
+  dor-workflow-client (~> 4.0)
   druid-tools
   dry-monads
   equivalent-xml (>= 0.6.0)
   erb_lint (~> 0.0.31)
   factory_bot_rails
   faraday
+  faraday-multipart
   honeybadger (~> 4.1)
   http_logger
   jbuilder (~> 2.5)
@@ -606,7 +590,7 @@ DEPENDENCIES
   openapi_parser (< 1.0)
   prawn (~> 1)
   prawn-table
-  preservation-client (~> 3.2)
+  preservation-client (~> 4.0)
   pry-byebug
   pry-rails
   pry-remote

app/services/modsulator_client.rb

@@ -52,13 +52,13 @@ def convert_spreadsheet_to_mods
   # @return   [String]   XML, either generated from a given spreadsheet, or a normalized version of a given XML file.
   def call_remote_modsulator(url, content_type)
     response_xml = nil
-    payload = Faraday::UploadIO.new(uploaded_filename, content_type)
+    payload = Faraday::Multipart::FilePart.new(uploaded_filename, content_type)
 
     connection = Faraday.new(url: url) do |faraday|
       faraday.use Faraday::Response::RaiseError
       faraday.request :multipart
       faraday.request :url_encoded
-      faraday.adapter :net_http # A MUST for file upload to work with UploadIO
+      faraday.adapter :net_http # A MUST for file upload to work with Faraday::Multipart::FilePart
     end
 
     response_xml = connection.post do |req|