Skip to content

Upgrade Faraday to v2 & drop faraday_middleware #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stympy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade Faraday to v2 & drop faraday_middleware #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ source 'https://rubygems.org'
# Specify your gem's dependencies in convertkit-ruby.gemspec
gemspec

gem 'base64'
gem 'dotenv', '~> 2.1', '>= 2.1.1'
gem 'webmock', '~> 2.1'
gem 'webmock', '~> 3.0'
gem 'vcr', '~> 3.0', '>= 3.0.3'
3 changes: 1 addition & 2 deletions convertkit-ruby.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "rspec", "~> 3.0"
spec.add_development_dependency "dotenv", "~> 2.1"

spec.add_runtime_dependency "faraday", "~> 1.0"
spec.add_runtime_dependency "faraday_middleware", "~> 1.0"
spec.add_runtime_dependency "faraday", ">= 2.0"
spec.add_runtime_dependency "json", '>= 1.8.3'
end
4 changes: 2 additions & 2 deletions lib/convertkit/connection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
require "convertkit/errors"
require "faraday"
require "faraday_middleware"
require "json"

module Convertkit
Expand Down Expand Up @@ -36,7 +35,6 @@ def delete(*args, &blk)
def faraday_connection(api_key, api_secret)
Faraday.new do |f|
f.url_prefix = "https://api.convertkit.com/v3/"
f.adapter :net_http

f.options.timeout = Convertkit.configuration.timeout
f.options.open_timeout = Convertkit.configuration.open_timeout
Expand All @@ -49,6 +47,8 @@ def faraday_connection(api_key, api_secret)
f.params['api_key'] = api_key if api_key

f.response :json, content_type: /\bjson$/

f.adapter :net_http
end
end

Expand Down