Adds configuration to describe param

myxoh · myxoh · commit 69f23372755e · 2019-06-06T14:27:47.000+01:00
diff --git a/lib/grape/api.rb b/lib/grape/api.rb
@@ -121,7 +121,7 @@ def add_setup(method, *args, &block)
 
       def replay_step_on(instance, setup_step)
         return if skip_immediate_run?(instance, setup_step[:args])
-        instance.send(setup_step[:method], *evaluate_arguments(setup_step[:args], instance.configuration), &setup_step[:block])
+        instance.send(setup_step[:method], *evaluate_arguments(instance.configuration, *setup_step[:args]), &setup_step[:block])
       end
 
       # Skips steps that contain arguments to be lazily executed (on re-mount time)
@@ -130,10 +130,14 @@ def skip_immediate_run?(instance, args)
           args.any? { |argument| argument.respond_to?(:lazy?) && argument.lazy? }
       end
 
-      def evaluate_arguments(args, configuration)
+      def evaluate_arguments(configuration, *args)
         args.map do |argument|
           if argument.respond_to?(:lazy?) && argument.lazy?
             configuration.fetch(argument.access_keys).evaluate
+          elsif argument.is_a?(Hash)
+            argument.map { |key, value| [key, evaluate_arguments(configuration, value).first] }.to_h
+          elsif argument.is_a?(Array)
+            evaluate_arguments(configuration, *argument)
           else
             argument
           end
diff --git a/lib/grape/dsl/desc.rb b/lib/grape/dsl/desc.rb
@@ -49,7 +49,7 @@ module Desc
       #
       def desc(description, options = {}, &config_block)
         if block_given?
-          config_class = desc_container
+          config_class = desc_container(configuration.evaluate)
 
           config_class.configure do
             description description
@@ -84,7 +84,7 @@ def unset_description_field(field)
       end
 
       # Returns an object which configures itself via an instance-context DSL.
-      def desc_container
+      def desc_container(endpoint_configuration)
         Module.new do
           include Grape::Util::StrictHashConfiguration.module(
             :summary,
@@ -105,6 +105,9 @@ def desc_container
             :security,
             :tags
           )
+          config_context.define_singleton_method(:configuration) do
+            endpoint_configuration
+          end
 
           def config_context.success(*args)
             entity(*args)
diff --git a/spec/grape/api_remount_spec.rb b/spec/grape/api_remount_spec.rb
@@ -85,6 +85,52 @@ def app
           get '/new_location'
           expect(last_response.body).to eq 'success'
         end
+
+        context 'when the configuration is the value in a key-arg pair' do
+          subject(:a_remounted_api) do
+            Class.new(Grape::API) do
+              version 'v1', using: :param, parameter: configuration[:version_param]
+              get 'endpoint' do
+                'version 1'
+              end
+
+              version 'v2', using: :param, parameter: configuration[:version_param]
+              get 'endpoint' do
+                'version 2'
+              end
+            end
+          end
+
+          it 'takes the param from the configuration' do
+            root_api.mount a_remounted_api, with: { version_param: 'param_name' }
+
+            get '/endpoint?param_name=v1'
+            expect(last_response.body).to eq 'version 1'
+
+            get '/endpoint?param_name=v2'
+            expect(last_response.body).to eq 'version 2'
+
+            get '/endpoint?wrong_param_name=v2'
+            expect(last_response.body).to eq 'version 1'
+          end
+        end
+      end
+
+      context 'on the DescSCope' do
+        subject(:a_remounted_api) do
+          Class.new(Grape::API) do
+            desc 'The description of this' do
+              tags ['not_configurable_tag', configuration[:a_configurable_tag]]
+            end
+            get 'location' do
+              'success'
+            end
+          end
+        end
+
+        it 'mounts the endpoint with the appropiate tags' do
+          root_api.mount({ a_remounted_api => 'integer' }, with: { a_configurable_tag: 'a configured tag' })
+        end
       end
 
       context 'on the ParamScope' do
