From adfc64e480e65c5e5fbb78a4ab125eaddee75de1 Mon Sep 17 00:00:00 2001 From: Esteban Pastorino Date: Tue, 1 Sep 2020 19:08:05 +0100 Subject: [PATCH 1/4] Update templates to use Addressable::URI --- .../src/main/resources/ruby/api_client.mustache | 4 ++-- .../src/main/resources/ruby/configuration.mustache | 4 ++-- .../swagger-codegen/src/main/resources/ruby/gemspec.mustache | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache b/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache index 840d2f2850a..e04e1521052 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache @@ -7,7 +7,7 @@ require 'json' require 'logger' require 'tempfile' require 'typhoeus' -require 'uri' +require 'addressable/uri' module {{moduleName}} class ApiClient @@ -260,7 +260,7 @@ module {{moduleName}} def build_request_url(path) # Add leading and trailing slashes to path path = "/#{path}".gsub(/\/+/, '/') - URI.encode(@config.base_url + path) + Addressable::URI.encode(@config.base_url + path) end # Builds the HTTP request body diff --git a/modules/swagger-codegen/src/main/resources/ruby/configuration.mustache b/modules/swagger-codegen/src/main/resources/ruby/configuration.mustache index 7c7e1d82dc5..e1dd752acff 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/configuration.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/configuration.mustache @@ -2,7 +2,7 @@ {{> api_info}} =end -require 'uri' +require 'addressable/uri' module {{moduleName}} class Configuration @@ -167,7 +167,7 @@ module {{moduleName}} def base_url url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '') - URI.encode(url) + Addressable::URI.encode(url) end # Gets API key (with prefix if set). diff --git a/modules/swagger-codegen/src/main/resources/ruby/gemspec.mustache b/modules/swagger-codegen/src/main/resources/ruby/gemspec.mustache index b17260ca527..3da9d99277a 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/gemspec.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/gemspec.mustache @@ -26,6 +26,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency 'typhoeus', '~> 1.0', '>= 1.0.1' s.add_runtime_dependency 'json', '~> 2.1', '>= 2.1.0' + s.add_runtime_dependency 'addressable', '~> 2.3', '>= 2.3.0' s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0' s.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.1' From 5236247dce2ac814a71a031763aa78959d42b424 Mon Sep 17 00:00:00 2001 From: Esteban Pastorino Date: Tue, 1 Sep 2020 19:25:57 +0100 Subject: [PATCH 2/4] Regenerate ruby client with new changes --- samples/client/petstore/ruby/.swagger-codegen/VERSION | 2 +- samples/client/petstore/ruby/README.md | 4 ++-- samples/client/petstore/ruby/lib/petstore.rb | 6 +++--- .../petstore/ruby/lib/petstore/api/another_fake_api.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api/fake_api.rb | 2 +- .../ruby/lib/petstore/api/fake_classname_tags123_api.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api/pet_api.rb | 2 +- .../client/petstore/ruby/lib/petstore/api/store_api.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api/user_api.rb | 2 +- samples/client/petstore/ruby/lib/petstore/api_client.rb | 8 +++++--- samples/client/petstore/ruby/lib/petstore/api_error.rb | 2 +- .../client/petstore/ruby/lib/petstore/configuration.rb | 6 +++--- .../lib/petstore/models/additional_properties_class.rb | 3 ++- .../client/petstore/ruby/lib/petstore/models/animal.rb | 3 ++- .../petstore/ruby/lib/petstore/models/animal_farm.rb | 3 ++- .../petstore/ruby/lib/petstore/models/api_response.rb | 3 ++- .../lib/petstore/models/array_of_array_of_number_only.rb | 3 ++- .../ruby/lib/petstore/models/array_of_number_only.rb | 3 ++- .../petstore/ruby/lib/petstore/models/array_test.rb | 3 ++- .../petstore/ruby/lib/petstore/models/capitalization.rb | 3 ++- samples/client/petstore/ruby/lib/petstore/models/cat.rb | 3 ++- .../client/petstore/ruby/lib/petstore/models/category.rb | 3 ++- .../petstore/ruby/lib/petstore/models/class_model.rb | 3 ++- .../client/petstore/ruby/lib/petstore/models/client.rb | 3 ++- samples/client/petstore/ruby/lib/petstore/models/dog.rb | 3 ++- .../petstore/ruby/lib/petstore/models/enum_arrays.rb | 3 ++- .../petstore/ruby/lib/petstore/models/enum_class.rb | 2 +- .../client/petstore/ruby/lib/petstore/models/enum_test.rb | 3 ++- .../petstore/ruby/lib/petstore/models/format_test.rb | 3 ++- .../ruby/lib/petstore/models/has_only_read_only.rb | 3 ++- samples/client/petstore/ruby/lib/petstore/models/list.rb | 3 ++- .../client/petstore/ruby/lib/petstore/models/map_test.rb | 3 ++- .../mixed_properties_and_additional_properties_class.rb | 3 ++- .../ruby/lib/petstore/models/model_200_response.rb | 3 ++- .../petstore/ruby/lib/petstore/models/model_return.rb | 3 ++- samples/client/petstore/ruby/lib/petstore/models/name.rb | 3 ++- .../petstore/ruby/lib/petstore/models/number_only.rb | 3 ++- samples/client/petstore/ruby/lib/petstore/models/order.rb | 3 ++- .../petstore/ruby/lib/petstore/models/outer_boolean.rb | 3 ++- .../petstore/ruby/lib/petstore/models/outer_composite.rb | 3 ++- .../petstore/ruby/lib/petstore/models/outer_enum.rb | 2 +- .../petstore/ruby/lib/petstore/models/outer_number.rb | 3 ++- .../petstore/ruby/lib/petstore/models/outer_string.rb | 3 ++- samples/client/petstore/ruby/lib/petstore/models/pet.rb | 3 ++- .../petstore/ruby/lib/petstore/models/read_only_first.rb | 3 ++- .../ruby/lib/petstore/models/special_model_name.rb | 3 ++- samples/client/petstore/ruby/lib/petstore/models/tag.rb | 3 ++- samples/client/petstore/ruby/lib/petstore/models/user.rb | 3 ++- samples/client/petstore/ruby/lib/petstore/version.rb | 2 +- samples/client/petstore/ruby/petstore.gemspec | 3 ++- 50 files changed, 94 insertions(+), 57 deletions(-) diff --git a/samples/client/petstore/ruby/.swagger-codegen/VERSION b/samples/client/petstore/ruby/.swagger-codegen/VERSION index 017674fb59d..0443c4ad098 100644 --- a/samples/client/petstore/ruby/.swagger-codegen/VERSION +++ b/samples/client/petstore/ruby/.swagger-codegen/VERSION @@ -1 +1 @@ -2.4.3-SNAPSHOT \ No newline at end of file +2.4.16-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/ruby/README.md b/samples/client/petstore/ruby/README.md index 03a5f0b1624..e6216d676d1 100644 --- a/samples/client/petstore/ruby/README.md +++ b/samples/client/petstore/ruby/README.md @@ -119,9 +119,11 @@ Class | Method | HTTP request | Description - [Petstore::ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md) - [Petstore::ArrayTest](docs/ArrayTest.md) - [Petstore::Capitalization](docs/Capitalization.md) + - [Petstore::Cat](docs/Cat.md) - [Petstore::Category](docs/Category.md) - [Petstore::ClassModel](docs/ClassModel.md) - [Petstore::Client](docs/Client.md) + - [Petstore::Dog](docs/Dog.md) - [Petstore::EnumArrays](docs/EnumArrays.md) - [Petstore::EnumClass](docs/EnumClass.md) - [Petstore::EnumTest](docs/EnumTest.md) @@ -145,8 +147,6 @@ Class | Method | HTTP request | Description - [Petstore::SpecialModelName](docs/SpecialModelName.md) - [Petstore::Tag](docs/Tag.md) - [Petstore::User](docs/User.md) - - [Petstore::Cat](docs/Cat.md) - - [Petstore::Dog](docs/Dog.md) ## Documentation for Authorization diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb index c737083bc72..f9178c3093d 100644 --- a/samples/client/petstore/ruby/lib/petstore.rb +++ b/samples/client/petstore/ruby/lib/petstore.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -25,9 +25,11 @@ require 'petstore/models/array_of_number_only' require 'petstore/models/array_test' require 'petstore/models/capitalization' +require 'petstore/models/cat' require 'petstore/models/category' require 'petstore/models/class_model' require 'petstore/models/client' +require 'petstore/models/dog' require 'petstore/models/enum_arrays' require 'petstore/models/enum_class' require 'petstore/models/enum_test' @@ -51,8 +53,6 @@ require 'petstore/models/special_model_name' require 'petstore/models/tag' require 'petstore/models/user' -require 'petstore/models/cat' -require 'petstore/models/dog' # APIs require 'petstore/api/another_fake_api' diff --git a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb index 3b5276e9929..1820a55565d 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb index 3d83f572be7..d62894794fe 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb index 97198936bbb..a66299b4818 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb index df71a87cd3d..ed93deaca0a 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb index 5d1da3a5ca3..6e5e90534c9 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb index cead48440d3..e98e72edf2b 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb index 9bab5647b5d..95042b307dd 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -15,7 +15,7 @@ require 'logger' require 'tempfile' require 'typhoeus' -require 'uri' +require 'addressable/uri' module Petstore class ApiClient @@ -112,6 +112,8 @@ def build_request(http_method, path, opts = {}) :verbose => @config.debugging } + req_opts.merge!(multipart: true) if header_params['Content-Type'].start_with? "multipart/" + # set custom cert, if provided req_opts[:cainfo] = @config.ssl_ca_cert if @config.ssl_ca_cert @@ -264,7 +266,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) + Addressable::URI.encode(@config.base_url + path) end # Builds the HTTP request body diff --git a/samples/client/petstore/ruby/lib/petstore/api_error.rb b/samples/client/petstore/ruby/lib/petstore/api_error.rb index 90e697ea6ae..bfb23ed2401 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_error.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_error.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/configuration.rb b/samples/client/petstore/ruby/lib/petstore/configuration.rb index a3897a20dd2..6a238a3a556 100644 --- a/samples/client/petstore/ruby/lib/petstore/configuration.rb +++ b/samples/client/petstore/ruby/lib/petstore/configuration.rb @@ -6,11 +6,11 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end -require 'uri' +require 'addressable/uri' module Petstore class Configuration @@ -175,7 +175,7 @@ def base_path=(base_path) def base_url url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '') - URI.encode(url) + Addressable::URI.encode(url) end # Gets API key (with prefix if set). diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb index 7e29d6bfdbb..c461d0ecf04 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -192,5 +192,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal.rb b/samples/client/petstore/ruby/lib/petstore/models/animal.rb index 40074ec3e77..4166472bd44 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/animal.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/animal.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -195,5 +195,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb b/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb index 80b0387c37b..55a4a0c7715 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -170,5 +170,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb index 52af683d272..1b862a54068 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -197,5 +197,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb index 16fd26cf37a..aa098102e57 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -181,5 +181,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb index 7c0182f6fc3..74c7b9ee577 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -181,5 +181,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb index 3b572420722..3c1956544e0 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -203,5 +203,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb index fb902d20e51..0c6fdcd27fc 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -225,5 +225,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat.rb b/samples/client/petstore/ruby/lib/petstore/models/cat.rb index b82408cc410..3da29590f6d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/cat.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/cat.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -204,5 +204,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/category.rb b/samples/client/petstore/ruby/lib/petstore/models/category.rb index 04cc098d3ba..185b0db2294 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/category.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/category.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -188,5 +188,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb index c579c0d322a..da9ea871323 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -180,5 +180,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/client.rb b/samples/client/petstore/ruby/lib/petstore/models/client.rb index 14fa6f428a6..f77087a4e77 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/client.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/client.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -179,5 +179,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/client/petstore/ruby/lib/petstore/models/dog.rb index c93946dae02..8f792d2f19c 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/dog.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/dog.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -204,5 +204,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb index f519fdd9234..ab1b9261009 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -224,5 +224,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb index 4932da0527c..f88c4b57beb 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb index a00c73438a0..b88ed2c5bc2 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -290,5 +290,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb index 32d17900df5..cc945bcab14 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -493,5 +493,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb index f81929dd9fa..57a5dcb1143 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -188,5 +188,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/list.rb b/samples/client/petstore/ruby/lib/petstore/models/list.rb index 89413112ef2..c7d9ea4d875 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/list.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/list.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -179,5 +179,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb index bd27afa0fb8..e985e71ec1d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -214,5 +214,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb index 45dfeb80151..a1938120ae9 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -199,5 +199,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/model_200_response.rb b/samples/client/petstore/ruby/lib/petstore/models/model_200_response.rb index 05858ae16bc..2d907646865 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/model_200_response.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/model_200_response.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -189,5 +189,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb index 6fbd4cdacb3..d9dbbdf9a60 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -180,5 +180,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/name.rb b/samples/client/petstore/ruby/lib/petstore/models/name.rb index 66a96d57e03..17116afdcf2 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/name.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/name.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -212,5 +212,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb index 3891524cdff..f80578c1834 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -179,5 +179,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/order.rb b/samples/client/petstore/ruby/lib/petstore/models/order.rb index 0919638bf0c..200419a00a6 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/order.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/order.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -261,5 +261,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_boolean.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_boolean.rb index 53000980b41..3f51cf3c79e 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_boolean.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_boolean.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -170,5 +170,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb index dc00a3e9708..fcb9167cbb5 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -197,5 +197,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb index 0bdb3f37255..0314b3f7c48 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_number.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_number.rb index df78bafc3e0..2dd66c83a4a 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_number.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_number.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -170,5 +170,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_string.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_string.rb index 507151d1a2a..35779fe39b9 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_string.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_string.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -170,5 +170,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/client/petstore/ruby/lib/petstore/models/pet.rb index 290f259521f..84f763dff4e 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/pet.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/pet.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -273,5 +273,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb index 9a5a643b379..ec3db1c62fd 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -188,5 +188,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb index 17e532bf434..8dfe91f923c 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -179,5 +179,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/client/petstore/ruby/lib/petstore/models/tag.rb index 7b65ddbd516..fbada771e25 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/tag.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/tag.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -188,5 +188,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/models/user.rb b/samples/client/petstore/ruby/lib/petstore/models/user.rb index fda5c0eb1c6..1d3bb555e7f 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/user.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/user.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -243,5 +243,6 @@ def _to_hash(value) value end end + end end diff --git a/samples/client/petstore/ruby/lib/petstore/version.rb b/samples/client/petstore/ruby/lib/petstore/version.rb index a7643760122..2f5f87c9635 100644 --- a/samples/client/petstore/ruby/lib/petstore/version.rb +++ b/samples/client/petstore/ruby/lib/petstore/version.rb @@ -6,7 +6,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end diff --git a/samples/client/petstore/ruby/petstore.gemspec b/samples/client/petstore/ruby/petstore.gemspec index 5da6377a35c..79539b5d59b 100644 --- a/samples/client/petstore/ruby/petstore.gemspec +++ b/samples/client/petstore/ruby/petstore.gemspec @@ -8,7 +8,7 @@ OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io Generated by: https://github.com/swagger-api/swagger-codegen.git -Swagger Codegen version: 2.4.3-SNAPSHOT +Swagger Codegen version: 2.4.16-SNAPSHOT =end @@ -29,6 +29,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency 'typhoeus', '~> 1.0', '>= 1.0.1' s.add_runtime_dependency 'json', '~> 2.1', '>= 2.1.0' + s.add_runtime_dependency 'addressable', '~> 2.3', '>= 2.3.0' s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0' s.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.1' From 82a6d7af75008435a069c6d82bce527cf67f6ce6 Mon Sep 17 00:00:00 2001 From: Esteban Pastorino Date: Wed, 2 Sep 2020 00:17:10 +0100 Subject: [PATCH 3/4] Use to_h for error headers --- .../swagger-codegen/src/main/resources/ruby/api_client.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache b/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache index e04e1521052..d2b08a3933d 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache @@ -55,7 +55,7 @@ module {{moduleName}} :message => response.return_message) else fail ApiError.new(:code => response.code, - :response_headers => response.headers, + :response_headers => response.headers.to_h, :response_body => response.body), response.status_message end From 803a5f081005e7aa7d29f2e71cdaed745951aa9d Mon Sep 17 00:00:00 2001 From: Esteban Pastorino Date: Wed, 2 Sep 2020 00:17:51 +0100 Subject: [PATCH 4/4] Update generated code --- samples/client/petstore/ruby/lib/petstore/api_client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb index 95042b307dd..84f6e8eeaaf 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb @@ -63,7 +63,7 @@ def call_api(http_method, path, opts = {}) :message => response.return_message) else fail ApiError.new(:code => response.code, - :response_headers => response.headers, + :response_headers => response.headers.to_h, :response_body => response.body), response.status_message end