lib//meta/utils/route_dsl_builders.rb in meta-api-0.0.9 vs lib//meta/utils/route_dsl_builders.rb in meta-api-0.1.0
- old
+ new
@@ -8,10 +8,10 @@
final_options = (options1 || {}).merge(options2 || {})
if options1[:parameters] && options2[:parameters]
final_options[:parameters] = options1[:parameters].merge(options2[:parameters])
end
if options1[:request_body].is_a?(Meta::JsonSchema::ObjectSchema) && options2[:request_body].is_a?(Meta::JsonSchema::ObjectSchema)
- final_options[:request_body] = options1[:request_body].merge_other_properties(options2[:request_body].properties)
+ final_options[:request_body] = options1[:request_body].properties.merge(options2[:request_body].properties)
end
if options1[:responses] && options2[:responses]
final_options[:responses] = options1[:responses].merge(options2[:responses])
end
final_options[:scope] = [options1[:scope] || [], options2[:scope] || []].flatten.uniq