Ruby client [2.X] Added inheritance/polymorphism (allOf) to ruby client

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

@@ -3,6 +3,7 @@
 import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.CodegenModel;
 import io.swagger.codegen.CodegenOperation;
 import io.swagger.codegen.CodegenParameter;
 import io.swagger.codegen.CodegenProperty;
@@ -61,6 +62,7 @@ public RubyClientCodegen() {
         // at the moment
         importMapping.clear();
 
+        this.supportsInheritance = true;
         modelPackage = "models";
         apiPackage = "api";
         outputFolder = "generated-code" + File.separator + "ruby";
@@ -258,6 +260,11 @@ public void processOpts() {
         //writeOptional(outputFolder, new SupportingFile("base_object_spec.mustache", specFolder, "base_object_spec.rb"));
     }
 
+    @Override
+    public String toModelImport(String name) {
+        return this.toModelFilename(name);
+    }
+
     @Override
     public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map<String, Model> definitions, Swagger swagger) {
         CodegenOperation op = super.fromOperation(path, httpMethod, operation, definitions, swagger);
@@ -605,6 +612,13 @@ public String toEnumName(CodegenProperty property) {
         }
     }
 
+    @Override
+    protected void addImport(CodegenModel m, String type) {
+        if (m.parent != null && m.parent.equals(type)) {
+            super.addImport(m, type);
+        }
+    }
+
     @Override
     public Map<String, Object> postProcessModels(Map<String, Object> objs) {
         // process enum in models

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

@@ -3,6 +3,9 @@
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
+      {{#parent}}
+      super(attributes)
+      {{/parent}}
       self.class.swagger_types.each_pair do |key, type|
         if type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
@@ -75,7 +78,7 @@
     # Returns the object in the form of hash
     # @return [Hash] Returns the object in the form of hash
     def to_hash
-      hash = {}
+      hash = {{^parent}}{}{{/parent}}{{#parent}}super{{/parent}}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         next if value.nil?

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

@@ -3,6 +3,8 @@
 =end
 
 require 'date'
+{{#imports}}require_relative '{{import}}'
+{{/imports}}
 
 module {{moduleName}}
 {{#models}}

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

@@ -1,7 +1,7 @@
   {{#description}}
   # {{{description}}}
   {{/description}}
-  class {{classname}}
+  class {{classname}}{{#parent}} < {{parent}}{{/parent}}
   {{#vars}}
     {{#description}}
     # {{{description}}}
@@ -36,18 +36,18 @@
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        {{#vars}}
+        {{#allVars}}
         :'{{{name}}}' => :'{{{baseName}}}'{{#hasMore}},{{/hasMore}}
-        {{/vars}}
+        {{/allVars}}
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        {{#vars}}
+        {{#allVars}}
         :'{{{name}}}' => :'{{{datatype}}}'{{#hasMore}},{{/hasMore}}
-        {{/vars}}
+        {{/allVars}}
       }
     end
 
@@ -58,6 +58,11 @@
 
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      {{#parent}}
+
+      # call parent's initialize
+      super(attributes)
+      {{/parent}}
       {{#vars}}
 
       if attributes.has_key?(:'{{{baseName}}}')
@@ -85,7 +90,7 @@
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
-      invalid_properties = Array.new
+      invalid_properties = {{^parent}}Array.new{{/parent}}{{#parent}}super{{/parent}}
       {{#vars}}
       {{#required}}
       if @{{{name}}}.nil?
@@ -260,7 +265,7 @@
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class{{#vars}} &&
-          {{name}} == o.{{name}}{{/vars}}
+          {{name}} == o.{{name}}{{/vars}}{{#parent}} && super(o){{/parent}}
     end
 
     # @see the `==` method
@@ -276,4 +281,4 @@
     end
 
 {{> base_object}}
-  end
+  end