Replace StrictHashConfiguration by simpler Grape::Util::ApiDescription

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * [#2572](https://github.com/ruby-grape/grape/pull/2572): Drop support ruby 2.7 and active_support 6.1 - [@ericproulx](https://github.com/ericproulx).
 * [#2573](https://github.com/ruby-grape/grape/pull/2573): Clean up deprecated code - [@ericproulx](https://github.com/ericproulx).
+* [#2575](https://github.com/ruby-grape/grape/pull/2575): Refactor Api description class - [@ericproulx](https://github.com/ericproulx).
 * Your contribution here.
 
 #### Fixes

lib/grape/dsl/desc.rb

@@ -3,26 +3,7 @@
 module Grape
   module DSL
     module Desc
-      ROUTE_ATTRIBUTES = %i[
-        body_name
-        consumes
-        default
-        deprecated
-        description
-        detail
-        entity
-        headers
-        hidden
-        http_codes
-        is_array
-        named
-        nickname
-        params
-        produces
-        security
-        summary
-        tags
-      ].freeze
+      extend Grape::DSL::Settings
 
       # Add a description to the next namespace or function.
       # @param description [String] descriptive string for this endpoint
@@ -68,54 +49,16 @@ module Desc
       #       # ...
       #     end
       #
-      def desc(description, options = nil, &config_block)
-        opts =
+      def desc(description, options = {}, &config_block)
+        settings =
           if config_block
-            desc_container(endpoint_configuration).then do |config_class|
-              config_class.configure do
-                description(description)
-              end
-
-              config_class.configure(&config_block)
-              config_class.settings
-            end
+            endpoint_config = defined?(configuration) ? configuration : nil
+            Grape::Util::ApiDescription.new(description, endpoint_config, &config_block).settings
           else
-            options&.merge(description: description) || { description: description }
-          end
-
-        namespace_setting :description, opts
-        route_setting :description, opts
-      end
-
-      # Returns an object which configures itself via an instance-context DSL.
-      def desc_container(endpoint_configuration)
-        Module.new do
-          include Grape::Util::StrictHashConfiguration.module(*ROUTE_ATTRIBUTES)
-          config_context.define_singleton_method(:configuration) do
-            endpoint_configuration
-          end
-
-          def config_context.success(*args)
-            entity(*args)
+            options.merge(description: description)
           end
-
-          def config_context.failure(*args)
-            http_codes(*args)
-          end
-        end
-      end
-
-      private
-
-      def endpoint_configuration
-        return {} unless defined?(configuration)
-
-        if configuration.respond_to?(:evaluate)
-          configuration.evaluate
-          # Within `given` or `mounted blocks` the configuration is already evaluated
-        elsif configuration.is_a?(Hash)
-          configuration
-        end
+        namespace_setting :description, settings
+        route_setting :description, settings
       end
     end
   end

lib/grape/util/api_description.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Grape
+  module Util
+    class ApiDescription
+      def initialize(description, endpoint_configuration, &block)
+        @endpoint_configuration = endpoint_configuration
+        @attributes = { description: description }
+        instance_eval(&block)
+      end
+
+      %i[
+        body_name
+        consumes
+        default
+        deprecated
+        detail
+        entity
+        headers
+        hidden
+        http_codes
+        is_array
+        named
+        nickname
+        params
+        produces
+        security
+        summary
+        tags
+      ].each do |attribute|
+        define_method attribute do |value|
+          @attributes[attribute] = value
+        end
+      end
+
+      alias success entity
+      alias failure http_codes
+
+      def configuration
+        @configuration ||= eval_endpoint_config(@endpoint_configuration)
+      end
+
+      def settings
+        @attributes
+      end
+
+      private
+
+      def eval_endpoint_config(configuration)
+        return configuration if configuration.is_a?(Hash)
+
+        configuration.evaluate
+      end
+    end
+  end
+end