Skip to content

Commit 50e968c

Browse files
author
Craig S. Cottingham
committed
Fix specs
1 parent 14e4afa commit 50e968c

6 files changed

+13
-16
lines changed

‎lib/grape-swagger.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,10 @@ def parse_params(params, path, method)
238238
when path.include?(":#{param}")
239239
'path'
240240
when %w[ POST PUT PATCH ].include?(method)
241-
if (dataType == "File") || (dataType != raw_data_type)
242-
'body'
243-
else
241+
if is_primitive?(dataType)
244242
'form'
243+
else
244+
'body'
245245
end
246246
else
247247
'query'
@@ -363,9 +363,9 @@ def parse_entity_models(models)
363363

364364
result[name] = {
365365
id: model.instance_variable_get(:@root) || name,
366-
properties: properties,
367-
required: required
366+
properties: properties
368367
}
368+
result[name].merge!(required: required) unless required.empty?
369369
end
370370

371371
result

‎spec/api_global_models_spec.rb

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ def app; ModelsGlobalApi; end
5656
"models"=>{
5757
"Some::Thing"=>{
5858
"id"=>"Some::Thing",
59-
"name"=>"Some::Thing",
6059
"properties"=>{
6160
"text"=>{"type"=>"string", "description"=>"Content of something."}
6261
}

‎spec/api_models_spec.rb

-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ def app; ModelsApi; end
7777
"models" => {
7878
"Something" => {
7979
"id" => "Something",
80-
"name" => "Something",
8180
"properties" => {
8281
"text" => {
8382
"type" => "string",
@@ -111,7 +110,6 @@ def app; ModelsApi; end
111110
"models" => {
112111
"Some::Thing" => {
113112
"id" => "Some::Thing",
114-
"name" => "Some::Thing",
115113
"properties" => {
116114
"text" => {
117115
"type" => "string",

‎spec/form_params_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def app; FormParamApi; end
5353
"summary" => "",
5454
"nickname" => "POST-items---format-",
5555
"method" => "POST",
56-
"parameters" => [ { "paramType" => "form", "name" => "name", "description" => "name of item", "type" => "String", "required" => true, "allowMultiple" => false } ],
56+
"parameters" => [ { "paramType" => "form", "name" => "name", "description" => "name of item", "type" => "string", "required" => true, "allowMultiple" => false } ],
5757
"type" => "void"
5858
}
5959
]
@@ -65,15 +65,15 @@ def app; FormParamApi; end
6565
"summary" => "",
6666
"nickname" => "PUT-items--id---format-",
6767
"method" => "PUT",
68-
"parameters" => [ { "paramType" => "path", "name" => "id", "description" => "id of item", "type" => "Integer", "required" => true, "allowMultiple" => false }, { "paramType" => "form", "name" => "name", "description" => "name of item", "type" => "String", "required" => true, "allowMultiple" => false } ],
68+
"parameters" => [ { "paramType" => "path", "name" => "id", "description" => "id of item", "type" => "integer", "required" => true, "allowMultiple" => false, "format" => "int32" }, { "paramType" => "form", "name" => "name", "description" => "name of item", "type" => "string", "required" => true, "allowMultiple" => false } ],
6969
"type" => "void"
7070
},
7171
{
7272
"notes" => "",
7373
"summary" => "",
7474
"nickname" => "PATCH-items--id---format-",
7575
"method" => "PATCH",
76-
"parameters" => [ { "paramType" => "path", "name" => "id", "description" => "id of item", "type" => "Integer", "required" => true, "allowMultiple" => false }, { "paramType" => "form", "name" => "name", "description" => "name of item", "type" => "String", "required" => true, "allowMultiple" => false } ],
76+
"parameters" => [ { "paramType" => "path", "name" => "id", "description" => "id of item", "type" => "integer", "required" => true, "allowMultiple" => false, "format" => "int32" }, { "paramType" => "form", "name" => "name", "description" => "name of item", "type" => "string", "required" => true, "allowMultiple" => false } ],
7777
"type" => "void"
7878
}
7979
]

‎spec/grape-swagger_helper_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class HelperTestAPI < Grape::API
2727
path = "/coolness"
2828
method = "GET"
2929
@api.parse_params(params, path, method).should == [
30-
{ paramType: "query", name: :name, description: "A name", type: "String", required: true, allowMultiple: false, defaultValue: 'default' },
31-
{ paramType: "query", name: :level, description: "", type: "String", required: false, allowMultiple: false }
30+
{ paramType: "query", name: :name, description: "A name", type: "string", required: true, allowMultiple: false, defaultValue: 'default' },
31+
{ paramType: "query", name: :level, description: "", type: "string", required: false, allowMultiple: false }
3232
]
3333
end
3434

@@ -40,8 +40,8 @@ class HelperTestAPI < Grape::API
4040
path = "/coolness"
4141
method = "POST"
4242
@api.parse_params(params, path, method).should == [
43-
{ paramType: "form", name: :name, description: "A name", type: "String", required: true, allowMultiple: false },
44-
{ paramType: "form", name: :level, description: "", type: "String", required: false, allowMultiple: false }
43+
{ paramType: "form", name: :name, description: "A name", type: "string", required: true, allowMultiple: false },
44+
{ paramType: "form", name: :level, description: "", type: "string", required: false, allowMultiple: false }
4545
]
4646
end
4747

‎spec/simple_mounted_api_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def app; SimpleApi end
160160
"summary" => "this takes an array of parameters",
161161
"nickname" => "POST-items---format-",
162162
"method" => "POST",
163-
"parameters" => [ { "paramType" => "form", "name" => "items[]", "description" => "array of items", "type" => "String", "required" => false, "allowMultiple" => false } ],
163+
"parameters" => [ { "paramType" => "form", "name" => "items[]", "description" => "array of items", "type" => "string", "required" => false, "allowMultiple" => false } ],
164164
"type" => "void"
165165
}]
166166
}]

0 commit comments

Comments
 (0)