Skip to content

[Ruby] Add support for faraday 2.x #12112

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

Merged
wing328 merged 3 commits into from
Apr 16, 2022
Merged

[Ruby] Add support for faraday 2.x #12112

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfa16a6
[ruby] Add faraday 2.x support
ykitamura-mdsol Apr 11, 2022
f8d4cff
Remove redundant params_encoder config
ykitamura-mdsol Apr 11, 2022
1594f4e
Memoize Faraday connection and refactor
ykitamura-mdsol Apr 11, 2022
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
Prev Previous commit
Next Next commit
Remove redundant params_encoder config
  • Loading branch information
@ykitamura-mdsol
ykitamura-mdsol committed Apr 11, 2022
commit f8d4cff2a3c94a4f580fa7fd38d2ca6caf7f245d
5 changes: 1 addition & 4 deletions modules/openapi-generator/src/main/resources/ruby-client/api_client_faraday_partial.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
:client_cert => @config.ssl_client_cert,
:client_key => @config.ssl_client_key
}
request_options = {
:params_encoder => @config.params_encoder
}
connection = Faraday.new(:url => config.base_url, :ssl => ssl_options, :request => request_options) do |conn|
connection = Faraday.new(:url => config.base_url, :ssl => ssl_options) do |conn|
Copy link
Contributor Author

@ykitamura-mdsol ykitamura-mdsol Apr 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dkliban It seems the params_encoder option is configured again so I think we can remove it from here but let me know if my understanding is not correct.

openapi-generator/modules/openapi-generator/src/main/resources/ruby-client/api_client_faraday_partial.mustache

Lines 87 to 88 in d17316e

# Overload default options only if provided
request.options.params_encoder = @config.params_encoder if @config.params_encoder

if config.username && config.password
if Gem::Version.new(Faraday::VERSION) >= Gem::Version.new('2.0')
conn.request(:authorization, :basic, config.username, config.password)
Expand Down
5 changes: 1 addition & 4 deletions samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,7 @@ def call_api(http_method, path, opts = {})
:client_cert => @config.ssl_client_cert,
:client_key => @config.ssl_client_key
}
request_options = {
:params_encoder => @config.params_encoder
}
connection = Faraday.new(:url => config.base_url, :ssl => ssl_options, :request => request_options) do |conn|
connection = Faraday.new(:url => config.base_url, :ssl => ssl_options) do |conn|
if config.username && config.password
if Gem::Version.new(Faraday::VERSION) >= Gem::Version.new('2.0')
conn.request(:authorization, :basic, config.username, config.password)
Expand Down