Skip to content
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

Jump to bottom

Ruby: Avoid double escaping path items #3093

Merged
merged 1 commit into from
Jun 5, 2019
Merged

Ruby: Avoid double escaping path items #3093

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
1 change: 0 additions & 1 deletion modules/openapi-generator/src/main/resources/ruby-client/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
{{> api_info}}
=end

require 'uri'
require 'cgi'

module {{moduleName}}
Expand Down
3 changes: 1 addition & 2 deletions modules/openapi-generator/src/main/resources/ruby-client/api_client.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ require 'json'
require 'logger'
require 'tempfile'
require 'typhoeus'
require 'uri'

module {{moduleName}}
class ApiClient
Expand Down Expand Up @@ -256,7 +255,7 @@ module {{moduleName}}
def build_request_url(path)
# Add leading and trailing slashes to path
path = "/#{path}".gsub(/\/+/, '/')
URI.encode(@config.base_url + path)
@config.base_url + path
end

# Builds the HTTP request body
Expand Down
5 changes: 1 addition & 4 deletions modules/openapi-generator/src/main/resources/ruby-client/configuration.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
{{> api_info}}
=end

require 'uri'

module {{moduleName}}
class Configuration
# Defines url scheme
Expand Down Expand Up @@ -166,8 +164,7 @@ module {{moduleName}}
end

def base_url
url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
URI.encode(url)
"#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
end

# Gets API key (with prefix if set).
Expand Down
1 change: 0 additions & 1 deletion samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

=end

require 'uri'
require 'cgi'

module Petstore
Expand Down
1 change: 0 additions & 1 deletion samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

=end

require 'uri'
require 'cgi'

module Petstore
Expand Down
1 change: 0 additions & 1 deletion samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

=end

require 'uri'
require 'cgi'

module Petstore
Expand Down
1 change: 0 additions & 1 deletion samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

=end

require 'uri'
require 'cgi'

module Petstore
Expand Down
1 change: 0 additions & 1 deletion samples/client/petstore/ruby/lib/petstore/api/store_api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

=end

require 'uri'
require 'cgi'

module Petstore
Expand Down
1 change: 0 additions & 1 deletion samples/client/petstore/ruby/lib/petstore/api/user_api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

=end

require 'uri'
require 'cgi'

module Petstore
Expand Down
3 changes: 1 addition & 2 deletions samples/client/petstore/ruby/lib/petstore/api_client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
require 'logger'
require 'tempfile'
require 'typhoeus'
require 'uri'

module Petstore
class ApiClient
Expand Down Expand Up @@ -262,7 +261,7 @@ def sanitize_filename(filename)
def build_request_url(path)
# Add leading and trailing slashes to path
path = "/#{path}".gsub(/\/+/, '/')
URI.encode(@config.base_url + path)
@config.base_url + path
end

# Builds the HTTP request body
Expand Down
5 changes: 1 addition & 4 deletions samples/client/petstore/ruby/lib/petstore/configuration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

=end

require 'uri'

module Petstore
class Configuration
# Defines url scheme
Expand Down Expand Up @@ -174,8 +172,7 @@ def base_path=(base_path)
end

def base_url
url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
URI.encode(url)
"#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
end

# Gets API key (with prefix if set).
Expand Down
1 change: 0 additions & 1 deletion samples/openapi3/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

=end

require 'uri'
require 'cgi'

module Petstore
Expand Down
1 change: 0 additions & 1 deletion samples/openapi3/client/petstore/ruby/lib/petstore/api/default_api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

=end

require 'uri'
require 'cgi'

module Petstore
Expand Down
1 change: 0 additions & 1 deletion samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

=end

require 'uri'
require 'cgi'

module Petstore
Expand Down
1 change: 0 additions & 1 deletion samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

=end

require 'uri'
require 'cgi'

module Petstore
Expand Down
1 change: 0 additions & 1 deletion samples/openapi3/client/petstore/ruby/lib/petstore/api/pet_api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

=end

require 'uri'
require 'cgi'

module Petstore
Expand Down
1 change: 0 additions & 1 deletion samples/openapi3/client/petstore/ruby/lib/petstore/api/store_api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

=end

require 'uri'
require 'cgi'

module Petstore
Expand Down
1 change: 0 additions & 1 deletion samples/openapi3/client/petstore/ruby/lib/petstore/api/user_api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

=end

require 'uri'
require 'cgi'

module Petstore
Expand Down
3 changes: 1 addition & 2 deletions samples/openapi3/client/petstore/ruby/lib/petstore/api_client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
require 'logger'
require 'tempfile'
require 'typhoeus'
require 'uri'

module Petstore
class ApiClient
Expand Down Expand Up @@ -262,7 +261,7 @@ def sanitize_filename(filename)
def build_request_url(path)
# Add leading and trailing slashes to path
path = "/#{path}".gsub(/\/+/, '/')
URI.encode(@config.base_url + path)
@config.base_url + path
end

# Builds the HTTP request body
Expand Down
5 changes: 1 addition & 4 deletions samples/openapi3/client/petstore/ruby/lib/petstore/configuration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

=end

require 'uri'

module Petstore
class Configuration
# Defines url scheme
Expand Down Expand Up @@ -174,8 +172,7 @@ def base_path=(base_path)
end

def base_url
url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
URI.encode(url)
"#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
end

# Gets API key (with prefix if set).
Expand Down