Skip to content

Commit 6b53d5a

Browse files
authored
Merge pull request #86 from sshaw/faraday2-support
Support for Faraday v2
2 parents eaa117a + c85de7c commit 6b53d5a

4 files changed

Lines changed: 3 additions & 7 deletions

File tree

lib/zoho_hub/auth.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
require 'multi_json'
44
require 'faraday'
5-
require 'faraday_middleware'
65
require 'addressable'
76

87
module ZohoHub

lib/zoho_hub/connection.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# frozen_string_literal: true
22

33
require 'faraday'
4-
require 'faraday_middleware'
54
require 'rainbow'
65
require 'addressable'
76

@@ -116,8 +115,7 @@ def authorization_header
116115
def adapter
117116
Faraday.new(url: base_url) do |conn|
118117
conn.headers = authorization_header if access_token?
119-
conn.use FaradayMiddleware::EncodeJson
120-
conn.use FaradayMiddleware::ParseJson
118+
conn.request :json
121119
conn.response :json, parser_options: { symbolize_names: true }
122120
conn.response :logger if ZohoHub.configuration.debug?
123121
conn.adapter Faraday.default_adapter

spec/zoho_hub/with_connection_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
describe '.get' do
1111
it 'fires a get request with ZohoHub::Connection' do
1212
get_stub = stub_request(:get, 'https://crmsandbox.zoho.eu/settings/modules')
13-
.to_return(status: 200, body: '', headers: {})
13+
.to_return(status: 200, body: '', headers: {'content-type' => 'application/json'})
1414

1515
test_class.get('/settings/modules')
1616

zoho_hub.gemspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ Gem::Specification.new do |spec|
2727

2828
spec.add_dependency 'addressable'
2929
spec.add_dependency 'backports'
30-
spec.add_dependency 'faraday'
31-
spec.add_dependency 'faraday_middleware'
30+
spec.add_dependency 'faraday', '~> 2.0'
3231
spec.add_dependency 'launchy'
3332
spec.add_dependency 'multi_json'
3433
spec.add_dependency 'rainbow'

0 commit comments

Comments
 (0)