From c1e7da5ec12b5c9f904d5bd38147ab5a6d631317 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Mon, 9 Apr 2018 11:01:01 +0800
Subject: [PATCH] update ruby readme template

---
 .../codegen/languages/RubyClientCodegen.java  | 36 -------------------
 .../src/main/resources/ruby/README.mustache   | 18 ++++++----
 samples/client/petstore/ruby/README.md        |  2 --
 3 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java
index 936e417c146..5814ab828ef 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java
@@ -294,42 +294,6 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
         }
     */
 
-    @Override
-    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
-        Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
-        List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
-        for (CodegenOperation op : operationList) {
-            // Set vendor-extension to be used in template:
-            //     x-codegen-hasMoreRequired
-            //     x-codegen-hasMoreOptional
-            //     x-codegen-hasRequiredParams
-            CodegenParameter lastRequired = null;
-            CodegenParameter lastOptional = null;
-            for (CodegenParameter p : op.allParams) {
-                if (p.required) {
-                    lastRequired = p;
-                } else {
-                    lastOptional = p;
-                }
-            }
-
-            for (CodegenParameter p : op.allParams) {
-                if (p == lastRequired) {
-                    p.vendorExtensions.put("x-codegen-hasMoreRequired", false);
-                } else if (p == lastOptional) {
-                    p.vendorExtensions.put("x-codegen-hasMoreOptional", false);
-                } else {
-                    p.vendorExtensions.put("x-codegen-hasMoreRequired", true);
-                    p.vendorExtensions.put("x-codegen-hasMoreOptional", true);
-                }
-            }
-            op.vendorExtensions.put("x-codegen-hasRequiredParams", lastRequired != null);
-
-        }
-
-        return objs;
-    }
-
     @Override
     public CodegenType getTag() {
         return CodegenType.CLIENT;
diff --git a/modules/openapi-generator/src/main/resources/ruby/README.mustache b/modules/openapi-generator/src/main/resources/ruby/README.mustache
index abf26eeceda..906035c7899 100644
--- a/modules/openapi-generator/src/main/resources/ruby/README.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby/README.mustache
@@ -76,13 +76,19 @@ require '{{{gemName}}}'
 {{/authMethods}}end
 {{/hasAuthMethods}}
 
-api_instance = {{{moduleName}}}::{{{classname}}}.new{{#hasParams}}
-{{#vendorExtensions.x-codegen-hasRequiredParams}}{{#allParams}}{{#required}}
+api_instance = {{{moduleName}}}::{{{classname}}}.new
+{{#requiredParams}}
 {{{paramName}}} = {{{example}}} # {{{dataType}}} | {{{description}}}
-{{/required}}{{/allParams}}{{/vendorExtensions.x-codegen-hasRequiredParams}}{{#hasOptionalParams}}
-opts = { {{#allParams}}{{^required}}
-  {{{paramName}}}: {{{example}}}{{#vendorExtensions.x-codegen-hasMoreOptional}},{{/vendorExtensions.x-codegen-hasMoreOptional}} # {{{dataType}}} | {{{description}}}{{/required}}{{/allParams}}
-}{{/hasOptionalParams}}{{/hasParams}}
+{{/requiredParams}}
+{{#optionalParams}}
+{{#-first}}
+opts = {
+{{/-first}}
+  {{{paramName}}}: {{{example}}}{{^-last}},{{/-last}} # {{{dataType}}} | {{{description}}}
+{{#-last}}
+}
+{{/-last}}
+{{/optionalParams}}
 
 begin
 {{#summary}}  #{{{.}}}
diff --git a/samples/client/petstore/ruby/README.md b/samples/client/petstore/ruby/README.md
index cc84c7ab179..aa21adb855b 100644
--- a/samples/client/petstore/ruby/README.md
+++ b/samples/client/petstore/ruby/README.md
@@ -55,10 +55,8 @@ Please follow the [installation](#installation) procedure and then run the follo
 require 'petstore'
 
 api_instance = Petstore::AnotherFakeApi.new
-
 client = Petstore::Client.new # Client | client model
 
-
 begin
   #To test special tags
   result = api_instance.test_special_tags(client)