Merge pull request #1225 from playpasshq/hotfix/given-with-nested-params

Fix Given with nested params

Author: dblock

CHANGELOG.md

@@ -2,6 +2,7 @@
 =============
 
 * [#1216](https://github.com/ruby-grape/grape/pull/1142): Fix JSON error response when calling `error!` with non-Strings - [@jrforrest](https://github.com/jrforrest).
+* [#1225](https://github.com/ruby-grape/grape/pull/1225): Fix `given` with nested params not returning correct declared params - [@JanStevens](https://github.com/JanStevens).
 * Your contribution here.
 
 0.14.0 (12/07/2015)

lib/grape/validations/params_scope.rb

@@ -90,7 +90,11 @@ def required?
       # Adds a parameter declaration to our list of validations.
       # @param attrs [Array] (see Grape::DSL::Parameters#requires)
       def push_declared_params(attrs)
-        @declared_params.concat attrs
+        if lateral?
+          @parent.push_declared_params(attrs)
+        else
+          @declared_params.concat attrs
+        end
       end
 
       private
@@ -145,7 +149,14 @@ def new_scope(attrs, optional = false, &block)
         end
 
         opts = attrs[1] || { type: Array }
-        self.class.new(api: @api, element: attrs.first, parent: self, optional: optional, type: opts[:type], &block)
+
+        self.class.new(
+          api:      @api,
+          element:  attrs.first,
+          parent:   self,
+          optional: optional,
+          type:     opts[:type],
+          &block)
       end
 
       # Returns a new parameter scope, not nested under any current-level param

spec/grape/validations/params_scope_spec.rb

@@ -93,6 +93,7 @@ def app
     module ParamsScopeSpec
       class CustomType
         attr_reader :value
+
         def self.parse(value)
           fail if value == 'invalid'
           new(value)
@@ -327,5 +328,37 @@ def initialize(value)
       expect(last_response.status).to eq(400)
       expect(last_response.body).to eq('bar[b] is missing')
     end
+
+    it 'includes the nested parameter within #declared(params)' do
+      subject.params do
+        requires :bar, type: Hash do
+          optional :a
+          given :a do
+            requires :b
+          end
+        end
+      end
+      subject.get('/nested') { declared(params).to_json }
+
+      get '/nested', bar: { a: true, b: 'yes' }
+      expect(JSON.parse(last_response.body)).to eq('bar' => { 'a' => 'true', 'b' => 'yes' })
+    end
+
+    it 'includes level 2 nested parameters outside the given within #declared(params)' do
+      subject.params do
+        requires :bar, type: Hash do
+          optional :a
+          given :a do
+            requires :c, type: Hash do
+              requires :b
+            end
+          end
+        end
+      end
+      subject.get('/nested') { declared(params).to_json }
+
+      get '/nested', bar: { a: true, c: { b: 'yes' } }
+      expect(JSON.parse(last_response.body)).to eq('bar' => { 'a' => 'true', 'c' => { 'b' => 'yes' } })
+    end
   end
 end