Skip to content

Commit 7f9d77b

Browse files
tgxworldandrewjwu
andauthored
DEV: Update faraday to v2 (#253)
Co-authored-by: Andrew Wu <[email protected]>
1 parent 5b04d2b commit 7f9d77b

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

discourse_api.gemspec

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
1818
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
1919
spec.require_paths = ['lib']
2020

21-
spec.add_runtime_dependency 'faraday', '~> 1.0'
22-
spec.add_runtime_dependency 'faraday_middleware', '~> 1.0'
21+
spec.add_runtime_dependency 'faraday', '~> 2.7'
22+
spec.add_runtime_dependency 'faraday-follow_redirects'
23+
spec.add_runtime_dependency 'faraday-multipart'
2324
spec.add_runtime_dependency 'rack', '>= 1.6'
2425

2526
spec.add_development_dependency 'bundler', '~> 2.0'

lib/discourse_api/client.rb

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# frozen_string_literal: true
22
require "faraday"
3-
require "faraday_middleware"
3+
require "faraday/follow_redirects"
4+
require "faraday/multipart"
45
require "json"
56
require "uri"
67
require "discourse_api/version"
@@ -135,7 +136,9 @@ def connection
135136
conn.request :url_encoded
136137

137138
# Allow to interact with forums behind basic HTTP authentication
138-
conn.request :basic_auth, basic_auth[:user], basic_auth[:password] if basic_auth
139+
if basic_auth
140+
conn.request :authorization, :basic, basic_auth[:user], basic_auth[:password]
141+
end
139142

140143
# Follow redirects
141144
conn.response :follow_redirects, limit: 5

0 commit comments

Comments
 (0)