Merge pull request #1772 from xhh/ruby-inline-base-object

[Ruby] Remove base_object from Ruby model

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java

@@ -127,7 +127,6 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("configuration.mustache", gemFolder, "configuration.rb"));
         supportingFiles.add(new SupportingFile("version.mustache", gemFolder, "version.rb"));
         String modelFolder = gemFolder + File.separator + modelPackage.replace("/", File.separator);
-        supportingFiles.add(new SupportingFile("base_object.mustache", modelFolder, "base_object.rb"));
     }
 
     @Override

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

@@ -1,9 +1,3 @@
-require 'date'
-
-module {{moduleName}}
-  # base class containing fundamental method such as to_hash, build_from_hash and more
-  class BaseObject
-
     # build the object from hash
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
@@ -94,6 +88,3 @@ module {{moduleName}}
         value
       end
     end
-
-  end
-end

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

@@ -5,7 +5,6 @@ require '{{gemName}}/version'
 require '{{gemName}}/configuration'
 
 # Models
-require '{{gemName}}/{{modelPackage}}/base_object'
 {{#models}}
 require '{{importPath}}'
 {{/models}}

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

@@ -1,6 +1,8 @@
+require 'date'
+
 module {{moduleName}}{{#models}}{{#model}}{{#description}}
   # {{{description}}}{{/description}}
-  class {{classname}} < BaseObject{{#vars}}{{#description}}
+  class {{classname}}{{#vars}}{{#description}}
     # {{{description}}}{{/description}}
     attr_accessor :{{{name}}}
 {{/vars}}
@@ -64,6 +66,8 @@ module {{moduleName}}{{#models}}{{#model}}{{#description}}
     def hash
       [{{#vars}}{{name}}{{#hasMore}}, {{/hasMore}}{{/vars}}].hash
     end
+
+{{> base_object}}
   end
 {{/model}}
 {{/models}}