Merge pull request ruby-grape#611 from dm1try/fix_grouped_arrays

dblock · dblock · commit e36e7d57de78 · 2014-03-31T15:15:18.000-04:00
initialize parent param in default validator only if it's not present
diff --git a/lib/grape/validations/default.rb b/lib/grape/validations/default.rb
@@ -16,7 +16,7 @@ def validate!(params)
         attrs.each do |resource_params, attr_name|
           if resource_params[attr_name].nil?
             validate_param!(attr_name, resource_params)
-            params[parent_element] = resource_params if parent_element
+            params[parent_element] = resource_params if parent_element && params[parent_element].nil?
           end
         end
       end
diff --git a/spec/grape/validations/default_spec.rb b/spec/grape/validations/default_spec.rb
@@ -54,6 +54,16 @@ class API < Grape::API
         get '/group' do
           { foo_bar: params[:foo][:bar] }
         end
+
+        params do
+          optional :array, type: Array do
+            requires :name
+            optional :with_default, default: 'default'
+          end
+        end
+        get '/array' do
+          { array: params[:array] }
+        end
       end
     end
   end
@@ -104,4 +114,10 @@ def app
     last_response.body.should == { foo_bar: 'foo-bar' }.to_json
   end
 
+  it 'sets default values for grouped arrays' do
+    get('/array?array[][name]=name&array[][name]=name2&array[][with_default]=bar2')
+    last_response.status.should == 200
+    last_response.body.should == { array: [{ name: "name", with_default: "default" }, { name: "name2", with_default: "bar2" }] }.to_json
+  end
+
 end
