Skip to content

Commit adfc64e

Browse files
committed
Update templates to use Addressable::URI
1 parent f1385d2 commit adfc64e

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

modules/swagger-codegen/src/main/resources/ruby/api_client.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require 'json'
77
require 'logger'
88
require 'tempfile'
99
require 'typhoeus'
10-
require 'uri'
10+
require 'addressable/uri'
1111

1212
module {{moduleName}}
1313
class ApiClient
@@ -260,7 +260,7 @@ module {{moduleName}}
260260
def build_request_url(path)
261261
# Add leading and trailing slashes to path
262262
path = "/#{path}".gsub(/\/+/, '/')
263-
URI.encode(@config.base_url + path)
263+
Addressable::URI.encode(@config.base_url + path)
264264
end
265265

266266
# Builds the HTTP request body

modules/swagger-codegen/src/main/resources/ruby/configuration.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{{> api_info}}
33
=end
44

5-
require 'uri'
5+
require 'addressable/uri'
66

77
module {{moduleName}}
88
class Configuration
@@ -167,7 +167,7 @@ module {{moduleName}}
167167

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

173173
# Gets API key (with prefix if set).

modules/swagger-codegen/src/main/resources/ruby/gemspec.mustache

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
2626

2727
s.add_runtime_dependency 'typhoeus', '~> 1.0', '>= 1.0.1'
2828
s.add_runtime_dependency 'json', '~> 2.1', '>= 2.1.0'
29+
s.add_runtime_dependency 'addressable', '~> 2.3', '>= 2.3.0'
2930

3031
s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0'
3132
s.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.1'

0 commit comments

Comments
 (0)