Skip to content

Commit 1ffcd68

Browse files
authored
Merge pull request #10445 from kitop/support-ruby-2.7
[RUBY] Replace deprecated `URI.encode` to support ruby 2.7 without warnings
2 parents f1385d2 + 803a5f0 commit 1ffcd68

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+101
-63
lines changed

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

Lines changed: 3 additions & 3 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
@@ -55,7 +55,7 @@ module {{moduleName}}
5555
:message => response.return_message)
5656
else
5757
fail ApiError.new(:code => response.code,
58-
:response_headers => response.headers,
58+
:response_headers => response.headers.to_h,
5959
:response_body => response.body),
6060
response.status_message
6161
end
@@ -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'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.3-SNAPSHOT
1+
2.4.16-SNAPSHOT

samples/client/petstore/ruby/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,11 @@ Class | Method | HTTP request | Description
119119
- [Petstore::ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
120120
- [Petstore::ArrayTest](docs/ArrayTest.md)
121121
- [Petstore::Capitalization](docs/Capitalization.md)
122+
- [Petstore::Cat](docs/Cat.md)
122123
- [Petstore::Category](docs/Category.md)
123124
- [Petstore::ClassModel](docs/ClassModel.md)
124125
- [Petstore::Client](docs/Client.md)
126+
- [Petstore::Dog](docs/Dog.md)
125127
- [Petstore::EnumArrays](docs/EnumArrays.md)
126128
- [Petstore::EnumClass](docs/EnumClass.md)
127129
- [Petstore::EnumTest](docs/EnumTest.md)
@@ -145,8 +147,6 @@ Class | Method | HTTP request | Description
145147
- [Petstore::SpecialModelName](docs/SpecialModelName.md)
146148
- [Petstore::Tag](docs/Tag.md)
147149
- [Petstore::User](docs/User.md)
148-
- [Petstore::Cat](docs/Cat.md)
149-
- [Petstore::Dog](docs/Dog.md)
150150

151151

152152
## Documentation for Authorization

samples/client/petstore/ruby/lib/petstore.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
OpenAPI spec version: 1.0.0
77
88
Generated by: https://github.com/swagger-api/swagger-codegen.git
9-
Swagger Codegen version: 2.4.3-SNAPSHOT
9+
Swagger Codegen version: 2.4.16-SNAPSHOT
1010
1111
=end
1212

@@ -25,9 +25,11 @@
2525
require 'petstore/models/array_of_number_only'
2626
require 'petstore/models/array_test'
2727
require 'petstore/models/capitalization'
28+
require 'petstore/models/cat'
2829
require 'petstore/models/category'
2930
require 'petstore/models/class_model'
3031
require 'petstore/models/client'
32+
require 'petstore/models/dog'
3133
require 'petstore/models/enum_arrays'
3234
require 'petstore/models/enum_class'
3335
require 'petstore/models/enum_test'
@@ -51,8 +53,6 @@
5153
require 'petstore/models/special_model_name'
5254
require 'petstore/models/tag'
5355
require 'petstore/models/user'
54-
require 'petstore/models/cat'
55-
require 'petstore/models/dog'
5656

5757
# APIs
5858
require 'petstore/api/another_fake_api'

samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
OpenAPI spec version: 1.0.0
77
88
Generated by: https://github.com/swagger-api/swagger-codegen.git
9-
Swagger Codegen version: 2.4.3-SNAPSHOT
9+
Swagger Codegen version: 2.4.16-SNAPSHOT
1010
1111
=end
1212

samples/client/petstore/ruby/lib/petstore/api/fake_api.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
OpenAPI spec version: 1.0.0
77
88
Generated by: https://github.com/swagger-api/swagger-codegen.git
9-
Swagger Codegen version: 2.4.3-SNAPSHOT
9+
Swagger Codegen version: 2.4.16-SNAPSHOT
1010
1111
=end
1212

samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
OpenAPI spec version: 1.0.0
77
88
Generated by: https://github.com/swagger-api/swagger-codegen.git
9-
Swagger Codegen version: 2.4.3-SNAPSHOT
9+
Swagger Codegen version: 2.4.16-SNAPSHOT
1010
1111
=end
1212

samples/client/petstore/ruby/lib/petstore/api/pet_api.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
OpenAPI spec version: 1.0.0
77
88
Generated by: https://github.com/swagger-api/swagger-codegen.git
9-
Swagger Codegen version: 2.4.3-SNAPSHOT
9+
Swagger Codegen version: 2.4.16-SNAPSHOT
1010
1111
=end
1212

0 commit comments

Comments
 (0)