[NEP-19931] bump to rc2, adds some middleware

happi.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Simple faraday client wrapper preconfigured for specific usecase}
   spec.homepage      = "https://github.com/rdytech/happi"
   spec.license       = "MIT"
-  spec.required_ruby_version = '>= 3.2.0'
+  spec.required_ruby_version = '>= 3.2.0' # faraday gem supports only non-EOL versions of Ruby
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday-follow_redirects', '~> 0.3'
   spec.add_dependency 'faraday-http', '~> 2.0'
   spec.add_dependency 'faraday-multipart', '~> 1.1'
+  spec.add_dependency 'faraday-retry', '~> 2.3'
   spec.add_dependency 'activemodel', '>= 6.0'
-  spec.add_dependency 'oauth2', '~> 2.0'
   spec.add_dependency 'mime-types', '~> 3.7'
   spec.add_dependency 'multi_json', '~> 1.15'
 
@@ -34,4 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'pry'
 end

lib/happi/client.rb

@@ -1,6 +1,7 @@
 require 'faraday'
 require 'faraday/follow_redirects'
 require 'faraday/multipart'
+require 'faraday/retry'
 require 'faraday/http'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash'
@@ -94,21 +95,30 @@ def param_check(params)
     end]
   end
 
+  def retry_options
+    {
+      max: 3,
+      interval: 0.05,
+      interval_randomness: 0.5,
+      backoff_factor: 2
+    }
+  end
+
   def connection
     @connection ||= Faraday.new(config.host) do |f|
-      f.use FaradayMiddleware::OAuth2, config.oauth_token, connection_options
-      f.use JSON, content_type: 'application/json'
+      f.request :authorization, 'Bearer', -> { config.oauth_token }
+      f.request :retry, **retry_options
+      f.use Faraday::FollowRedirects::Middleware  # default limit is 3
 
       if self.config.use_json
-        f.use FaradayMiddleware::EncodeJson
         f.request :json
         f.response :json
       else
         f.request :multipart
         f.request :url_encoded
       end
 
-      f.adapter :net_http
+      f.adapter :http
     end
   end
 

lib/happi/version.rb

@@ -1,3 +1,3 @@
 module Happi
-  VERSION = '1.0.0-rc'
+  VERSION = '1.0.0-rc2'
 end

spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require 'simplecov'
+require 'pry'
+
 SimpleCov.start
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. lib])