Merge pull request #232 from u2/array_params

Fixed missing raw array params

Author: dblock

.rubocop_todo.yml

@@ -7,16 +7,16 @@
 
 # Offense count: 10
 Metrics/AbcSize:
-  Max: 357
+  Max: 358
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 494
+  Max: 498
 
 # Offense count: 6
 Metrics/CyclomaticComplexity:
-  Max: 105
+  Max: 106
 
 # Offense count: 297
 # Configuration parameters: AllowURI, URISchemes.
@@ -26,11 +26,11 @@ Metrics/LineLength:
 # Offense count: 20
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 377
+  Max: 379
 
 # Offense count: 5
 Metrics/PerceivedComplexity:
-  Max: 107
+  Max: 108
 
 # Offense count: 8
 Style/ClassVars:

CHANGELOG.md

@@ -1,8 +1,14 @@
 ### 0.10.2 (Next)
 
+#### Features
+
 * [#215](https://github.com/tim-vandecasteele/grape-swagger/pull/223): Support swagger `defaultValue` without the need to set a Grape `default` - [@jv-dan](https://github.com/jv-dan).
 * Your contribution here.
 
+#### Fixes
+
+* [#232](https://github.com/tim-vandecasteele/grape-swagger/pull/232): Fixed missing raw array params - [@u2](https://github.com/u2).
+
 ### 0.10.1 (March 11, 2015)
 
 * [#227](https://github.com/tim-vandecasteele/grape-swagger/issues/227): Fix: nested routes under prefix not documented - [@dblock](https://github.com/dblock).

lib/grape-swagger.rb

@@ -145,11 +145,13 @@ def parse_array_params(params)
         params.each_key do |k|
           if params[k].is_a?(Hash) && params[k][:type] == 'Array'
             array_param = k
+            modified_params[k] = params[k]
           else
             new_key = k
             unless array_param.nil?
               if k.to_s.start_with?(array_param.to_s + '[')
                 new_key = array_param.to_s + '[]' + k.to_s.split(array_param)[1]
+                modified_params.delete array_param
               end
             end
             modified_params[new_key] = params[k]

spec/array_params_spec.rb

@@ -14,21 +14,34 @@ def app
       post :splines do
       end
 
+      params do
+        optional :raw_array, type: Array
+      end
+      get :raw_array_splines do
+      end
+
       add_swagger_documentation
     end
   end
 
-  subject do
+  it 'gets array types' do
     get '/swagger_doc/splines'
     expect(last_response.status).to eq 200
     body = JSON.parse last_response.body
-    body['apis'].first['operations'].first['parameters']
-  end
-
-  it 'gets array types' do
-    expect(subject).to eq [
+    parameters = body['apis'].first['operations'].first['parameters']
+    expect(parameters).to eq [
       { 'paramType' => 'form', 'name' => 'a_array[][param_1]', 'description' => nil, 'type' => 'integer', 'required' => true, 'allowMultiple' => false, 'format' => 'int32' },
       { 'paramType' => 'form', 'name' => 'a_array[][param_2]', 'description' => nil, 'type' => 'string', 'required' => true, 'allowMultiple' => false }
     ]
   end
+
+  it 'get raw array type' do
+    get '/swagger_doc/raw_array_splines'
+    expect(last_response.status).to eq 200
+    body = JSON.parse last_response.body
+    parameters = body['apis'].first['operations'].first['parameters']
+    expect(parameters).to eq [
+      { 'paramType' => 'query', 'name' => 'raw_array', 'description' => nil, 'type' => 'Array', 'required' => false, 'allowMultiple' => false }
+    ]
+  end
 end