Merge branch 'ircecho-patch-1'

Author: wing328

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

@@ -124,8 +124,10 @@
       return false if @{{{name}}}.nil?
       {{/required}}
       {{#isEnum}}
+      {{^isContainer}}
       {{{name}}}_validator = EnumAttributeValidator.new('{{{datatype}}}', [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}])
       return false unless {{{name}}}_validator.valid?(@{{{name}}})
+      {{/isContainer}}
       {{/isEnum}}
       {{#hasValidation}}
       {{#minLength}}
@@ -150,6 +152,7 @@
 
     {{#vars}}
     {{#isEnum}}
+    {{^isContainer}}
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] {{{name}}} Object to be assigned
     def {{{name}}}=({{{name}}})
@@ -160,6 +163,7 @@
       @{{{name}}} = {{{name}}}
     end
 
+    {{/isContainer}}
     {{/isEnum}}
     {{^isEnum}}
     {{#hasValidation}}

samples/client/petstore/ruby/README.md

@@ -8,7 +8,7 @@ This SDK is automatically generated by the [Swagger Codegen](https://github.com/
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-07-04T22:10:18.328+08:00
+- Build date: 2016-07-14T16:12:28.313+08:00
 - Build package: class io.swagger.codegen.languages.RubyClientCodegen
 
 ## Installation
@@ -57,30 +57,15 @@ require 'petstore'
 
 api_instance = Petstore::FakeApi.new
 
-number = 3.4 # Float | None
+body = Petstore::Client.new # Client | client model
 
-double = 1.2 # Float | None
-
-string = "string_example" # String | None
-
-byte = "B" # String | None
-
-opts = { 
-  integer: 56, # Integer | None
-  int32: 56, # Integer | None
-  int64: 789, # Integer | None
-  float: 3.4, # Float | None
-  binary: "B", # String | None
-  date: Date.parse("2013-10-20"), # Date | None
-  date_time: DateTime.parse("2013-10-20T19:20:30+01:00"), # DateTime | None
-  password: "password_example" # String | None
-}
 
 begin
-  #Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-  api_instance.test_endpoint_parameters(number, double, string, byte, opts)
+  #To test \"client\" model
+  result = api_instance.test_client_model(body)
+  p result
 rescue Petstore::ApiError => e
-  puts "Exception when calling FakeApi->test_endpoint_parameters: #{e}"
+  puts "Exception when calling FakeApi->test_client_model: #{e}"
 end
 
 ```
@@ -91,6 +76,7 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
+*Petstore::FakeApi* | [**test_client_model**](docs/FakeApi.md#test_client_model) | **PATCH** /fake | To test \"client\" model
 *Petstore::FakeApi* | [**test_endpoint_parameters**](docs/FakeApi.md#test_endpoint_parameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 *Petstore::FakeApi* | [**test_enum_query_parameters**](docs/FakeApi.md#test_enum_query_parameters) | **GET** /fake | To test enum query parameters
 *Petstore::PetApi* | [**add_pet**](docs/PetApi.md#add_pet) | **POST** /pet | Add a new pet to the store
@@ -126,6 +112,7 @@ Class | Method | HTTP request | Description
  - [Petstore::ArrayTest](docs/ArrayTest.md)
  - [Petstore::Cat](docs/Cat.md)
  - [Petstore::Category](docs/Category.md)
+ - [Petstore::Client](docs/Client.md)
  - [Petstore::Dog](docs/Dog.md)
  - [Petstore::EnumClass](docs/EnumClass.md)
  - [Petstore::EnumTest](docs/EnumTest.md)

samples/client/petstore/ruby/docs/Client.md

@@ -0,0 +1,8 @@
+# Petstore::Client
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**client** | **String** |  | [optional] 
+
+

samples/client/petstore/ruby/docs/FakeApi.md

@@ -4,10 +4,56 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
+[**test_client_model**](FakeApi.md#test_client_model) | **PATCH** /fake | To test \"client\" model
 [**test_endpoint_parameters**](FakeApi.md#test_endpoint_parameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 [**test_enum_query_parameters**](FakeApi.md#test_enum_query_parameters) | **GET** /fake | To test enum query parameters
 
 
+# **test_client_model**
+> Client test_client_model(body)
+
+To test \"client\" model
+
+### Example
+```ruby
+# load the gem
+require 'petstore'
+
+api_instance = Petstore::FakeApi.new
+
+body = Petstore::Client.new # Client | client model
+
+
+begin
+  #To test \"client\" model
+  result = api_instance.test_client_model(body)
+  p result
+rescue Petstore::ApiError => e
+  puts "Exception when calling FakeApi->test_client_model: #{e}"
+end
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Client**](Client.md)| client model | 
+
+### Return type
+
+[**Client**](Client.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+
+
 # **test_endpoint_parameters**
 > test_endpoint_parameters(number, double, string, byte, opts)
 

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

@@ -37,6 +37,7 @@
 require 'petstore/models/array_test'
 require 'petstore/models/cat'
 require 'petstore/models/category'
+require 'petstore/models/client'
 require 'petstore/models/dog'
 require 'petstore/models/enum_class'
 require 'petstore/models/enum_test'

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

@@ -31,6 +31,63 @@ def initialize(api_client = ApiClient.default)
       @api_client = api_client
     end
 
+    # To test \"client\" model
+    # 
+    # @param body client model
+    # @param [Hash] opts the optional parameters
+    # @return [Client]
+    def test_client_model(body, opts = {})
+      data, _status_code, _headers = test_client_model_with_http_info(body, opts)
+      return data
+    end
+
+    # To test \"client\" model
+    # 
+    # @param body client model
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(Client, Fixnum, Hash)>] Client data, response status code and response headers
+    def test_client_model_with_http_info(body, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "Calling API: FakeApi.test_client_model ..."
+      end
+      # verify the required parameter 'body' is set
+      fail ArgumentError, "Missing the required parameter 'body' when calling FakeApi.test_client_model" if body.nil?
+      # resource path
+      local_var_path = "/fake".sub('{format}','json')
+
+      # query parameters
+      query_params = {}
+
+      # header parameters
+      header_params = {}
+
+      # HTTP header 'Accept' (if needed)
+      local_header_accept = ['application/json']
+      local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
+
+      # HTTP header 'Content-Type'
+      local_header_content_type = ['application/json']
+      header_params['Content-Type'] = @api_client.select_header_content_type(local_header_content_type)
+
+      # form parameters
+      form_params = {}
+
+      # http body (model)
+      post_body = @api_client.object_to_http_body(body)
+      auth_names = []
+      data, status_code, headers = @api_client.call_api(:PATCH, local_var_path,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => 'Client')
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: FakeApi#test_client_model\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
     # Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
     # @param number None