Merge pull request #78 from asonas/faraday_v2

Support faraday v2+ and drop support ruby < 2.6

.github/workflows/test.yml

@@ -26,16 +26,13 @@ jobs:
 
       matrix:
         ruby:
-          - ruby:2.4
-          - ruby:2.5
           - ruby:2.6
           - ruby:2.7
           - ruby:3.0
           - ruby:3.1
           - rubylang/ruby:master-nightly-bionic
         gemfile:
-          - faraday_0
-          - faraday_1
+          - faraday_2
         include:
           - ruby: rubylang/ruby:master-nightly-bionic
             allow_failures: "true"
@@ -75,9 +72,9 @@ jobs:
           flag-name: run-${{ matrix.ruby }}-${{ matrix.gemfile }}
           parallel: true
 
-      - run: bundle exec rubocop
-        continue-on-error: ${{ matrix.allow_failures == 'true' }}
-        if: matrix.ruby < 'ruby:3.0' # FIXME: remove this after upgrade rubocop
+      # TODO: Enable after rubocop is upgraded
+      # - run: bundle exec rubocop
+      #   continue-on-error: ${{ matrix.allow_failures == 'true' }}
 
   finish:
     needs: test

chatwork.gemspec

@@ -22,9 +22,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", ">= 0.9"
-  spec.add_dependency "faraday_middleware"
-  spec.add_dependency "hashie"
+  spec.required_ruby_version = ">= 2.6.0"
+
+  spec.add_dependency "faraday", ">= 2.0.0"
+  spec.add_dependency "faraday-mashify"
+  spec.add_dependency "faraday-multipart"
 
   spec.add_development_dependency "activesupport"
   spec.add_development_dependency "bundler", ">= 1.3"

gemfiles/common.gemfile

@@ -1,18 +0,0 @@
-if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.3.0")
-  group :test do
-    gem "backport_dig", group: :development
-  end
-end
-
-if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.2")
-  group :test do
-    gem "activesupport", "< 5.0.0", group: :development
-  end
-end
-
-if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.5.0")
-  group :test do
-    # NOTE: unparser v0.3.0+ requires Ruby 2.5+
-    gem "unparser", "< 0.3.0"
-  end
-end

gemfiles/faraday_0.gemfile → gemfiles/faraday_2.gemfile

@@ -5,4 +5,4 @@ gemspec path: "../"
 
 eval_gemfile "#{__dir__}/common.gemfile"
 
-gem "faraday", "~> 0.9"
+gem "faraday", "~> 2.0"

lib/chatwork.rb

@@ -1,6 +1,8 @@
 require "chatwork/version"
 require "hashie"
 require "faraday"
+require "faraday/mashify"
+require "faraday/multipart"
 
 module ChatWork
   autoload :BaseClient,         "chatwork/base_client"
@@ -34,7 +36,7 @@ module ChatWork
   @client_secret = nil
 
   Faraday::Request.register_middleware(
-    chatwork_multipart: -> { ChatWork::Multipart },
+    chatwork_multipart: ChatWork::Multipart,
   )
 
   class << self

lib/chatwork/base_client.rb

@@ -1,6 +1,3 @@
-require "faraday"
-require "faraday_middleware"
-
 module ChatWork
   class BaseClient
     include Converter

lib/chatwork/multipart.rb

@@ -1,5 +1,5 @@
 module ChatWork
-  class Multipart < ::Faraday::Request::Multipart
+  class Multipart < ::Faraday::Multipart::Middleware
     self.mime_type = "multipart/form-data".freeze
 
     def create_multipart(env, params)