From 064fc6fd2ffe5c2af3d73c7bfff8349fcf74065f Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Sat, 27 Mar 2021 10:39:37 +0800
Subject: [PATCH] postpone require models with parent

---
 .../src/main/resources/ruby-client/gem.mustache      | 12 +++++++++++-
 samples/client/petstore/ruby-faraday/lib/petstore.rb |  4 ++--
 samples/client/petstore/ruby/lib/petstore.rb         |  4 ++--
 .../ruby-client/lib/petstore.rb                      |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/ruby-client/gem.mustache b/modules/openapi-generator/src/main/resources/ruby-client/gem.mustache
index c9ae0ebf96ea..70027d1f6102 100644
--- a/modules/openapi-generator/src/main/resources/ruby-client/gem.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby-client/gem.mustache
@@ -11,7 +11,17 @@ require '{{gemName}}/configuration'
 # Models
 {{#models}}
 {{#model}}
-require '{{gemName}}/{{modelPackage}}/{{classFilename}}'{{/model}}
+{{^parent}}
+require '{{gemName}}/{{modelPackage}}/{{classFilename}}'
+{{/parent}}
+{{/model}}
+{{/models}}
+{{#models}}
+{{#model}}
+{{#parent}}
+require '{{gemName}}/{{modelPackage}}/{{classFilename}}'
+{{/parent}}
+{{/model}}
 {{/models}}
 
 # APIs
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore.rb b/samples/client/petstore/ruby-faraday/lib/petstore.rb
index 53c34a479c92..f9a198e1b3ae 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore.rb
@@ -24,12 +24,10 @@
 require 'petstore/models/array_of_number_only'
 require 'petstore/models/array_test'
 require 'petstore/models/capitalization'
-require 'petstore/models/cat'
 require 'petstore/models/cat_all_of'
 require 'petstore/models/category'
 require 'petstore/models/class_model'
 require 'petstore/models/client'
-require 'petstore/models/dog'
 require 'petstore/models/dog_all_of'
 require 'petstore/models/enum_arrays'
 require 'petstore/models/enum_class'
@@ -61,6 +59,8 @@
 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.rb b/samples/client/petstore/ruby/lib/petstore.rb
index 53c34a479c92..f9a198e1b3ae 100644
--- a/samples/client/petstore/ruby/lib/petstore.rb
+++ b/samples/client/petstore/ruby/lib/petstore.rb
@@ -24,12 +24,10 @@
 require 'petstore/models/array_of_number_only'
 require 'petstore/models/array_test'
 require 'petstore/models/capitalization'
-require 'petstore/models/cat'
 require 'petstore/models/cat_all_of'
 require 'petstore/models/category'
 require 'petstore/models/class_model'
 require 'petstore/models/client'
-require 'petstore/models/dog'
 require 'petstore/models/dog_all_of'
 require 'petstore/models/enum_arrays'
 require 'petstore/models/enum_class'
@@ -61,6 +59,8 @@
 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/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb
index 3762ec7f7ab8..0aacaaae2d69 100644
--- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb
+++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb
@@ -17,8 +17,8 @@
 require 'petstore/configuration'
 
 # Models
-require 'petstore/models/array_alias'
 require 'petstore/models/map_alias'
+require 'petstore/models/array_alias'
 
 # APIs
 require 'petstore/api/usage_api'