Better: Compatibility with faraday 2 (#666)

Gemfile

@@ -10,6 +10,7 @@ group :development, :test do
   gem "psych", '< 4.0.0' # safe_load signature not compatible with older rubies
   gem "rake"
   gem "typhoeus" unless defined? JRUBY_VERSION
+  gem 'faraday-typhoeus' unless defined? JRUBY_VERSION
 end
 
 group :test do

changelog.md

@@ -7,6 +7,8 @@ New features:
 
 Updated features:
 
+  * Removed restriction on faraday < 2 ([#666](https://github.com/arsduo/koala/pull/666))
+
 Removed features:
 
 Internal improvements:

koala.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.1'
 
-  gem.add_runtime_dependency("faraday", "< 2")
+  gem.add_runtime_dependency("faraday")
+  gem.add_runtime_dependency("faraday-multipart")
   gem.add_runtime_dependency("addressable")
   gem.add_runtime_dependency("json", ">= 1.8")
   gem.add_runtime_dependency("rexml")

lib/koala/http_service.rb

@@ -1,4 +1,5 @@
 require 'faraday'
+require 'faraday/multipart' unless defined? Faraday::FilePart # hack for faraday < 1.9 to avoid warnings
 require 'koala/http_service/uploadable_io'
 require 'koala/http_service/response'
 require 'koala/http_service/request'

lib/koala/http_service/uploadable_io.rb

@@ -1,4 +1,3 @@
-require "net/http/post/multipart"
 require "tempfile"
 
 module Koala

spec/cases/http_service_spec.rb

@@ -201,7 +201,7 @@ def adapter(arg)
 
       expect_any_instance_of(Faraday::Connection).to receive(:get) do |instance|
         expect(instance.builder.handlers).to eq([
-          Faraday::Request::Multipart,
+          Faraday::Multipart::Middleware,
           Faraday::Request::UrlEncoded,
         ])
         mock_http_response
@@ -219,7 +219,7 @@ def adapter(arg)
 
       expect_any_instance_of(Faraday::Connection).to receive(:get) do |instance|
         expect(instance.builder.handlers).to eq([
-          Faraday::Request::Multipart,
+          Faraday::Multipart::Middleware,
           Faraday::Request::UrlEncoded,
         ])
         mock_http_response

spec/support/koala_test.rb

@@ -238,11 +238,11 @@ def self.activate_adapter!
         # JRuby doesn't support typhoeus on Travis
         unless defined? JRUBY_VERSION
           require adapter
-          require 'typhoeus/adapters/faraday' if adapter.to_s == "typhoeus"
+          require "faraday/#{adapter}"
           Faraday.default_adapter = adapter.to_sym
         end
-      rescue ParserError
-        puts "Unable to load adapter #{adapter}, using Net::HTTP."
+      rescue => e
+        puts "Unable to load adapter #{adapter}, using Net::HTTP. #{e.class} #{e.message}"
       ensure
         @adapter_activation_attempted = true
       end