Merge pull request #155 from ProductPlan/chore/faraday-2-support

faraday 2 support

.github/workflows/ruby-tests.yml

@@ -9,12 +9,17 @@ on:
 jobs:
   test:
 
+    name: Specs - Ruby ${{ matrix.ruby-version }} ${{matrix.gemfile}}
     runs-on: ubuntu-latest
     env:
       CC_TEST_REPORTER_ID: 2a6849be8214739deef0090b810b945ce9a550a4d8279d242cb03242d1ad53c5
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
 
     strategy:
       matrix:
+        gemfile:
+          - faraday-1
+          - faraday-2
         ruby-version:
           - "3.1"
           - "3.0"
@@ -35,4 +40,4 @@ jobs:
       run: bundle exec rake test
     - name: Upload Coverage
       uses: paambaati/[email protected]
-      if: matrix.ruby-version == '3.1'
+      if: matrix.ruby-version == '3.1' && matrix.gemfile == 'faraday-2'

gemfiles/faraday-1.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'faraday', '~> 1.10'
+
+gemspec path: '../'

gemfiles/faraday-2.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'faraday', '~> 2.2'
+
+gemspec path: '../'

lib/tracker_api.rb

@@ -2,7 +2,7 @@
 
 # dependencies
 require 'faraday'
-require 'faraday_middleware'
+require 'faraday/multipart'
 require 'pathname'
 require 'mini_mime'
 

lib/tracker_api/client.rb

@@ -25,7 +25,7 @@ def initialize(options={}, &block)
       @url               = Addressable::URI.parse(url).to_s
       @api_version       = options.fetch(:api_version, '/services/v5')
       @logger            = options.fetch(:logger, ::Logger.new(nil))
-      adapter            = options.fetch(:adapter) { defined?(JRUBY_VERSION) ? :net_http : :excon }
+      adapter            = options.fetch(:adapter, :net_http)
       connection_options = options.fetch(:connection_options, { ssl: { verify: true } })
       @auto_paginate     = options.fetch(:auto_paginate, true)
       @token             = options[:token]

lib/tracker_api/logger.rb

@@ -1,5 +1,5 @@
 module TrackerApi
-  class Logger < Faraday::Response::Middleware
+  class Logger < Faraday::Middleware
     extend Forwardable
 
     def initialize(app, logger = nil)

tracker_api.gemspec

@@ -29,9 +29,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'addressable'
   spec.add_dependency 'virtus'
-  spec.add_dependency 'faraday'
-  spec.add_dependency 'faraday_middleware'
-  spec.add_dependency 'excon'
+  spec.add_dependency 'faraday', ['>= 1.10', '< 3.0']
+  spec.add_dependency 'faraday-multipart'
   spec.add_dependency 'equalizer'
   spec.add_dependency 'representable'
   spec.add_dependency 'multi_json'