loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Fix ruby model generation with objects and additionalProperties (#6816)

Browse Source 
* Fix model generation with objects and additionalProperties

* Generate Ruby Petstore

* Generate Ruby Security Petstore
This commit is contained in:
Stephan E 2017-10-26 13:59:38 +02:00 committed by wing328
parent 4f3c86aa14
commit f78d958ec0
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,11 +56,16 @@
{{#vars}}
if attributes.has_key?(:'{{{baseName}}}')
{{#isContainer}}
{{#isListContainer}}
if (value = attributes[:'{{{baseName}}}']).is_a?(Array)
self.{{{name}}} = value
end
{{/isContainer}}
{{/isListContainer}}
{{#isMapContainer}}
if (value = attributes[:'{{{baseName}}}']).is_a?(Hash)
self.{{{name}}} = value
end
{{/isMapContainer}}
{{^isContainer}}
self.{{{name}}} = attributes[:'{{{baseName}}}']
{{/isContainer}}

4
samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
View File

@ -45,13 +45,13 @@ module Petstore
attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
if attributes.has_key?(:'map_property')
if (value = attributes[:'map_property']).is_a?(Array)
if (value = attributes[:'map_property']).is_a?(Hash)
self.map_property = value
end
end
if attributes.has_key?(:'map_of_map_property')
if (value = attributes[:'map_of_map_property']).is_a?(Array)
if (value = attributes[:'map_of_map_property']).is_a?(Hash)
self.map_of_map_property = value
end
end

4
samples/client/petstore/ruby/lib/petstore/models/map_test.rb
View File

@ -66,13 +66,13 @@ module Petstore
attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
if attributes.has_key?(:'map_map_of_string')
if (value = attributes[:'map_map_of_string']).is_a?(Array)
if (value = attributes[:'map_map_of_string']).is_a?(Hash)
self.map_map_of_string = value
end
end
if attributes.has_key?(:'map_of_enum_string')
if (value = attributes[:'map_of_enum_string']).is_a?(Array)
if (value = attributes[:'map_of_enum_string']).is_a?(Hash)
self.map_of_enum_string = value
end
end

2
samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
View File

@ -57,7 +57,7 @@ module Petstore
end
if attributes.has_key?(:'map')
if (value = attributes[:'map']).is_a?(Array)
if (value = attributes[:'map']).is_a?(Hash)
self.map = value
end
end