Merge pull request #10445 from kitop/support-ruby-2.7

[RUBY] Replace deprecated `URI.encode` to support ruby 2.7 without warnings
swagger-api · Sep 2, 2020 · 1ffcd68 · 1ffcd68
2 parents f1385d2 + 803a5f0
commit 1ffcd68
Show file tree

Hide file tree

Showing 53 changed files with 101 additions and 63 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
@@ -7,7 +7,7 @@ require 'json'
 require 'logger'
 require 'tempfile'
 require 'typhoeus'
-require 'uri'
+require 'addressable/uri'
 
 module {{moduleName}}
   class ApiClient
@@ -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
@@ -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
@@ -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
@@ -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'

diff --git a/samples/client/petstore/ruby/.swagger-codegen/VERSION b/samples/client/petstore/ruby/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.3-SNAPSHOT
+2.4.16-SNAPSHOT
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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