diff --git a/samples/client/petstore/ruby/README.md b/samples/client/petstore/ruby/README.md
index aa21adb855b..6078ca43dde 100644
--- a/samples/client/petstore/ruby/README.md
+++ b/samples/client/petstore/ruby/README.md
@@ -111,7 +111,6 @@ Class | Method | HTTP request | Description
 
  - [Petstore::AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
  - [Petstore::Animal](docs/Animal.md)
- - [Petstore::AnimalFarm](docs/AnimalFarm.md)
  - [Petstore::ApiResponse](docs/ApiResponse.md)
  - [Petstore::ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [Petstore::ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
@@ -135,11 +134,8 @@ Class | Method | HTTP request | Description
  - [Petstore::Name](docs/Name.md)
  - [Petstore::NumberOnly](docs/NumberOnly.md)
  - [Petstore::Order](docs/Order.md)
- - [Petstore::OuterBoolean](docs/OuterBoolean.md)
  - [Petstore::OuterComposite](docs/OuterComposite.md)
  - [Petstore::OuterEnum](docs/OuterEnum.md)
- - [Petstore::OuterNumber](docs/OuterNumber.md)
- - [Petstore::OuterString](docs/OuterString.md)
  - [Petstore::Pet](docs/Pet.md)
  - [Petstore::ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [Petstore::SpecialModelName](docs/SpecialModelName.md)
diff --git a/samples/client/petstore/ruby/docs/AnimalFarm.md b/samples/client/petstore/ruby/docs/AnimalFarm.md
deleted file mode 100644
index 30d704dc7d1..00000000000
--- a/samples/client/petstore/ruby/docs/AnimalFarm.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Petstore::AnimalFarm
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-
diff --git a/samples/client/petstore/ruby/docs/Body4.md b/samples/client/petstore/ruby/docs/Body4.md
deleted file mode 100644
index 618b2f3de3a..00000000000
--- a/samples/client/petstore/ruby/docs/Body4.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Petstore::Body4
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**param** | **String** | field1 | 
-**param2** | **String** | field2 | 
-
-
diff --git a/samples/client/petstore/ruby/docs/FakeApi.md b/samples/client/petstore/ruby/docs/FakeApi.md
index f56974b1278..9bc24f0ab75 100644
--- a/samples/client/petstore/ruby/docs/FakeApi.md
+++ b/samples/client/petstore/ruby/docs/FakeApi.md
@@ -17,7 +17,7 @@ Method | HTTP request | Description
 
 
 # **fake_outer_boolean_serialize**
-> OuterBoolean fake_outer_boolean_serialize(opts)
+> BOOLEAN fake_outer_boolean_serialize(opts)
 
 
 
@@ -49,7 +49,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**OuterBoolean**](OuterBoolean.md)
+**BOOLEAN**
 
 ### Authorization
 
@@ -109,7 +109,7 @@ No authorization required
 
 
 # **fake_outer_number_serialize**
-> OuterNumber fake_outer_number_serialize(opts)
+> Float fake_outer_number_serialize(opts)
 
 
 
@@ -141,7 +141,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**OuterNumber**](OuterNumber.md)
+**Float**
 
 ### Authorization
 
@@ -155,7 +155,7 @@ No authorization required
 
 
 # **fake_outer_string_serialize**
-> OuterString fake_outer_string_serialize(opts)
+> String fake_outer_string_serialize(opts)
 
 
 
@@ -187,7 +187,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**OuterString**](OuterString.md)
+**String**
 
 ### Authorization
 
diff --git a/samples/client/petstore/ruby/docs/OuterBoolean.md b/samples/client/petstore/ruby/docs/OuterBoolean.md
deleted file mode 100644
index 99ef646b200..00000000000
--- a/samples/client/petstore/ruby/docs/OuterBoolean.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Petstore::OuterBoolean
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-
diff --git a/samples/client/petstore/ruby/docs/OuterComposite.md b/samples/client/petstore/ruby/docs/OuterComposite.md
index 61b46c8c931..e1548870a7b 100644
--- a/samples/client/petstore/ruby/docs/OuterComposite.md
+++ b/samples/client/petstore/ruby/docs/OuterComposite.md
@@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**my_number** | [**OuterNumber**](OuterNumber.md) |  | [optional] 
-**my_string** | [**OuterString**](OuterString.md) |  | [optional] 
-**my_boolean** | [**OuterBoolean**](OuterBoolean.md) |  | [optional] 
+**my_number** | **Float** |  | [optional] 
+**my_string** | **String** |  | [optional] 
+**my_boolean** | **BOOLEAN** |  | [optional] 
 
 
diff --git a/samples/client/petstore/ruby/docs/OuterNumber.md b/samples/client/petstore/ruby/docs/OuterNumber.md
deleted file mode 100644
index a9da0d32d80..00000000000
--- a/samples/client/petstore/ruby/docs/OuterNumber.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Petstore::OuterNumber
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-
diff --git a/samples/client/petstore/ruby/docs/OuterString.md b/samples/client/petstore/ruby/docs/OuterString.md
deleted file mode 100644
index 33942e53b1f..00000000000
--- a/samples/client/petstore/ruby/docs/OuterString.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Petstore::OuterString
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-
diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb
index bd835789fb7..51d61cd1792 100644
--- a/samples/client/petstore/ruby/lib/petstore.rb
+++ b/samples/client/petstore/ruby/lib/petstore.rb
@@ -19,7 +19,6 @@ require 'petstore/configuration'
 # Models
 require 'petstore/models/additional_properties_class'
 require 'petstore/models/animal'
-require 'petstore/models/animal_farm'
 require 'petstore/models/api_response'
 require 'petstore/models/array_of_array_of_number_only'
 require 'petstore/models/array_of_number_only'
@@ -43,11 +42,8 @@ require 'petstore/models/model_return'
 require 'petstore/models/name'
 require 'petstore/models/number_only'
 require 'petstore/models/order'
-require 'petstore/models/outer_boolean'
 require 'petstore/models/outer_composite'
 require 'petstore/models/outer_enum'
-require 'petstore/models/outer_number'
-require 'petstore/models/outer_string'
 require 'petstore/models/pet'
 require 'petstore/models/read_only_first'
 require 'petstore/models/special_model_name'
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 1e6c3e6a3b9..9a81cec992d 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
@@ -22,7 +22,7 @@ module Petstore
     # Test serialization of outer boolean types
     # @param [Hash] opts the optional parameters
     # @option opts [BOOLEAN] :boolean_post_body Input boolean as post body
-    # @return [OuterBoolean]
+    # @return [BOOLEAN]
     def fake_outer_boolean_serialize(opts = {})
       data, _status_code, _headers = fake_outer_boolean_serialize_with_http_info(opts)
       data
@@ -31,7 +31,7 @@ module Petstore
     # Test serialization of outer boolean types
     # @param [Hash] opts the optional parameters
     # @option opts [BOOLEAN] :boolean_post_body Input boolean as post body
-    # @return [Array<(OuterBoolean, Fixnum, Hash)>] OuterBoolean data, response status code and response headers
+    # @return [Array<(BOOLEAN, Fixnum, Hash)>] BOOLEAN data, response status code and response headers
     def fake_outer_boolean_serialize_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: FakeApi.fake_outer_boolean_serialize ...'
@@ -59,7 +59,7 @@ module Petstore
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'OuterBoolean')
+        :return_type => 'BOOLEAN')
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: FakeApi#fake_outer_boolean_serialize\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -114,7 +114,7 @@ module Petstore
     # Test serialization of outer number types
     # @param [Hash] opts the optional parameters
     # @option opts [Float] :body Input number as post body
-    # @return [OuterNumber]
+    # @return [Float]
     def fake_outer_number_serialize(opts = {})
       data, _status_code, _headers = fake_outer_number_serialize_with_http_info(opts)
       data
@@ -123,7 +123,7 @@ module Petstore
     # Test serialization of outer number types
     # @param [Hash] opts the optional parameters
     # @option opts [Float] :body Input number as post body
-    # @return [Array<(OuterNumber, Fixnum, Hash)>] OuterNumber data, response status code and response headers
+    # @return [Array<(Float, Fixnum, Hash)>] Float data, response status code and response headers
     def fake_outer_number_serialize_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: FakeApi.fake_outer_number_serialize ...'
@@ -151,7 +151,7 @@ module Petstore
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'OuterNumber')
+        :return_type => 'Float')
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: FakeApi#fake_outer_number_serialize\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -160,7 +160,7 @@ module Petstore
     # Test serialization of outer string types
     # @param [Hash] opts the optional parameters
     # @option opts [String] :body Input string as post body
-    # @return [OuterString]
+    # @return [String]
     def fake_outer_string_serialize(opts = {})
       data, _status_code, _headers = fake_outer_string_serialize_with_http_info(opts)
       data
@@ -169,7 +169,7 @@ module Petstore
     # Test serialization of outer string types
     # @param [Hash] opts the optional parameters
     # @option opts [String] :body Input string as post body
-    # @return [Array<(OuterString, Fixnum, Hash)>] OuterString data, response status code and response headers
+    # @return [Array<(String, Fixnum, Hash)>] String data, response status code and response headers
     def fake_outer_string_serialize_with_http_info(opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: FakeApi.fake_outer_string_serialize ...'
@@ -197,7 +197,7 @@ module Petstore
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'OuterString')
+        :return_type => 'String')
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: FakeApi#fake_outer_string_serialize\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -499,14 +499,14 @@ module Petstore
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: FakeApi.test_enum_parameters ...'
       end
-      if @api_client.config.client_side_validation && opts[:'enum_header_string_array'] && !['>', '$'].include?(opts[:'enum_header_string_array'])
-        fail ArgumentError, 'invalid value for "enum_header_string_array", must be one of >, $'
+      if @api_client.config.client_side_validation && opts[:'enum_header_string_array'] && !opts[:'enum_header_string_array'].all? { |item| ['>', '$'].include?(item) }
+        fail ArgumentError, 'invalid value for "enum_header_string_array", must include one of >, $'
       end
       if @api_client.config.client_side_validation && opts[:'enum_header_string'] && !['_abc', '-efg', '(xyz)'].include?(opts[:'enum_header_string'])
         fail ArgumentError, 'invalid value for "enum_header_string", must be one of _abc, -efg, (xyz)'
       end
-      if @api_client.config.client_side_validation && opts[:'enum_query_string_array'] && !['>', '$'].include?(opts[:'enum_query_string_array'])
-        fail ArgumentError, 'invalid value for "enum_query_string_array", must be one of >, $'
+      if @api_client.config.client_side_validation && opts[:'enum_query_string_array'] && !opts[:'enum_query_string_array'].all? { |item| ['>', '$'].include?(item) }
+        fail ArgumentError, 'invalid value for "enum_query_string_array", must include one of >, $'
       end
       if @api_client.config.client_side_validation && opts[:'enum_query_string'] && !['_abc', '-efg', '(xyz)'].include?(opts[:'enum_query_string'])
         fail ArgumentError, 'invalid value for "enum_query_string", must be one of _abc, -efg, (xyz)'
@@ -528,7 +528,7 @@ module Petstore
 
       # query parameters
       query_params = {}
-      query_params[:'enum_query_string_array'] = opts[:'enum_query_string_array'] if !opts[:'enum_query_string_array'].nil?
+      query_params[:'enum_query_string_array'] = @api_client.build_collection_param(opts[:'enum_query_string_array'], :csv) if !opts[:'enum_query_string_array'].nil?
       query_params[:'enum_query_string'] = opts[:'enum_query_string'] if !opts[:'enum_query_string'].nil?
       query_params[:'enum_query_integer'] = opts[:'enum_query_integer'] if !opts[:'enum_query_integer'].nil?
       query_params[:'enum_query_double'] = opts[:'enum_query_double'] if !opts[:'enum_query_double'].nil?
@@ -537,7 +537,7 @@ module Petstore
       header_params = {}
       # HTTP header 'Content-Type'
       header_params['Content-Type'] = @api_client.select_header_content_type(['application/x-www-form-urlencoded'])
-      header_params[:'enum_header_string_array'] = opts[:'enum_header_string_array'] if !opts[:'enum_header_string_array'].nil?
+      header_params[:'enum_header_string_array'] = @api_client.build_collection_param(opts[:'enum_header_string_array'], :csv) if !opts[:'enum_header_string_array'].nil?
       header_params[:'enum_header_string'] = opts[:'enum_header_string'] if !opts[:'enum_header_string'].nil?
 
       # form parameters
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 204235e1550..f7cb89a7a68 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
@@ -146,7 +146,7 @@ module Petstore
 
       # query parameters
       query_params = {}
-      query_params[:'status'] = status
+      query_params[:'status'] = @api_client.build_collection_param(status, :csv)
 
       # header parameters
       header_params = {}
@@ -199,7 +199,7 @@ module Petstore
 
       # query parameters
       query_params = {}
-      query_params[:'tags'] = tags
+      query_params[:'tags'] = @api_client.build_collection_param(tags, :csv)
 
       # header parameters
       header_params = {}
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 01f7697b04f..8cc58b42c22 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb
@@ -32,9 +32,9 @@ module Petstore
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'my_number' => :'OuterNumber',
-        :'my_string' => :'OuterString',
-        :'my_boolean' => :'OuterBoolean'
+        :'my_number' => :'Float',
+        :'my_string' => :'String',
+        :'my_boolean' => :'BOOLEAN'
       }
     end
 
diff --git a/samples/client/petstore/ruby/spec/models/body4_spec.rb b/samples/client/petstore/ruby/spec/models/body4_spec.rb
deleted file mode 100644
index 6279cc32efb..00000000000
--- a/samples/client/petstore/ruby/spec/models/body4_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-=begin
-#Swagger Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-Contact: apiteam@swagger.io
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.0-SNAPSHOT
-
-=end
-
-require 'spec_helper'
-require 'json'
-require 'date'
-
-# Unit tests for Petstore::Body4
-# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
-# Please update as you see appropriate
-describe 'Body4' do
-  before do
-    # run before each test
-    @instance = Petstore::Body4.new
-  end
-
-  after do
-    # run after each test
-  end
-
-  describe 'test an instance of Body4' do
-    it 'should create an instance of Body4' do
-      expect(@instance).to be_instance_of(Petstore::Body4)
-    end
-  end
-  describe 'test attribute "param"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-  describe 'test attribute "param2"' do
-    it 'should work' do
-      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-    end
-  end
-
-end
diff --git a/samples/client/petstore/ruby/spec/models/outer_boolean_spec.rb b/samples/client/petstore/ruby/spec/models/outer_boolean_spec.rb
deleted file mode 100644
index 174091474d0..00000000000
--- a/samples/client/petstore/ruby/spec/models/outer_boolean_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-=begin
-#Swagger Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-Contact: apiteam@swagger.io
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.0-SNAPSHOT
-
-=end
-
-require 'spec_helper'
-require 'json'
-require 'date'
-
-# Unit tests for Petstore::OuterBoolean
-# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
-# Please update as you see appropriate
-describe 'OuterBoolean' do
-  before do
-    # run before each test
-    @instance = Petstore::OuterBoolean.new
-  end
-
-  after do
-    # run after each test
-  end
-
-  describe 'test an instance of OuterBoolean' do
-    it 'should create an instance of OuterBoolean' do
-      expect(@instance).to be_instance_of(Petstore::OuterBoolean)
-    end
-  end
-end
diff --git a/samples/client/petstore/ruby/spec/models/outer_number_spec.rb b/samples/client/petstore/ruby/spec/models/outer_number_spec.rb
deleted file mode 100644
index 381860d9081..00000000000
--- a/samples/client/petstore/ruby/spec/models/outer_number_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-=begin
-#Swagger Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-Contact: apiteam@swagger.io
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.0-SNAPSHOT
-
-=end
-
-require 'spec_helper'
-require 'json'
-require 'date'
-
-# Unit tests for Petstore::OuterNumber
-# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
-# Please update as you see appropriate
-describe 'OuterNumber' do
-  before do
-    # run before each test
-    @instance = Petstore::OuterNumber.new
-  end
-
-  after do
-    # run after each test
-  end
-
-  describe 'test an instance of OuterNumber' do
-    it 'should create an instance of OuterNumber' do
-      expect(@instance).to be_instance_of(Petstore::OuterNumber)
-    end
-  end
-end
diff --git a/samples/client/petstore/ruby/spec/models/outer_string_spec.rb b/samples/client/petstore/ruby/spec/models/outer_string_spec.rb
deleted file mode 100644
index e3dacb015c0..00000000000
--- a/samples/client/petstore/ruby/spec/models/outer_string_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-=begin
-#Swagger Petstore
-
-#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-Contact: apiteam@swagger.io
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.0-SNAPSHOT
-
-=end
-
-require 'spec_helper'
-require 'json'
-require 'date'
-
-# Unit tests for Petstore::OuterString
-# Automatically generated by swagger-codegen (github.com/swagger-api/swagger-codegen)
-# Please update as you see appropriate
-describe 'OuterString' do
-  before do
-    # run before each test
-    @instance = Petstore::OuterString.new
-  end
-
-  after do
-    # run after each test
-  end
-
-  describe 'test an instance of OuterString' do
-    it 'should create an instance of OuterString' do
-      expect(@instance).to be_instance_of(Petstore::OuterString)
-    end
-  end
-end