@@ -165,15 +165,13 @@ def response_object(route)
165
165
response_model = @item
166
166
response_model = expose_params_from_model ( value [ :model ] ) if value [ :model ]
167
167
168
+ next unless !response_model . start_with? ( 'Swagger_doc' ) && ( ( @definitions [ response_model ] && value [ :code ] . to_s . start_with? ( '2' ) ) || value [ :model ] )
169
+
168
170
# TODO: proof that the definition exist, if model isn't specified
169
- if !response_model . start_with? ( 'Swagger_doc' ) &&
170
- ( ( !!@definitions [ response_model ] && value [ :code ] . to_s . start_with? ( '2' ) ) ||
171
- value [ :model ] )
172
- if route . route_is_array
173
- memo [ value [ :code ] ] [ :schema ] = { 'type' => 'array' , 'items' => { '$ref' => "#/definitions/#{ response_model } " } }
174
- else
175
- memo [ value [ :code ] ] [ :schema ] = { '$ref' => "#/definitions/#{ response_model } " }
176
- end
171
+ if route . route_is_array
172
+ memo [ value [ :code ] ] [ :schema ] = { 'type' => 'array' , 'items' => { '$ref' => "#/definitions/#{ response_model } " } }
173
+ else
174
+ memo [ value [ :code ] ] [ :schema ] = { '$ref' => "#/definitions/#{ response_model } " }
177
175
end
178
176
end
179
177
end
@@ -190,7 +188,7 @@ def default_staus_codes
190
188
191
189
def params_object ( route )
192
190
partition_params ( route ) . map do |param , value |
193
- parse_params ( param , value , route . route_path , route . route_method )
191
+ parse_params ( param , { required : false } . merge ( value ) , route . route_path , route . route_method )
194
192
end
195
193
end
196
194
@@ -252,7 +250,7 @@ def expose_params_from_model(model)
252
250
if GrapeEntity ::VERSION =~ /0\. 4\. \d /
253
251
parameters = model . exposures ? model . exposures : model . documentation
254
252
elsif GrapeEntity ::VERSION =~ /0\. 5\. \d /
255
- parameters = model . root_exposures . each_with_object ( { } ) do |value , memo |
253
+ parameters = model . root_exposures . each_with_object ( { } ) do |value , memo |
256
254
memo [ value . attribute ] = value . send ( :options )
257
255
end
258
256
end
@@ -289,7 +287,7 @@ def parse_params(param, value, path, method)
289
287
end
290
288
291
289
description = value . is_a? ( Hash ) ? value [ :desc ] || value [ :description ] : nil
292
- required = value . is_a? ( Hash ) ? !! value [ :required ] : false
290
+ required = value . is_a? ( Hash ) ? value [ :required ] : false
293
291
default_value = value . is_a? ( Hash ) ? value [ :default ] : nil
294
292
example = value . is_a? ( Hash ) ? value [ :example ] : nil
295
293
is_array = value . is_a? ( Hash ) ? ( value [ :is_array ] || false ) : false
0 commit comments