Cleanup a little

Author: numbata

Gemfile

@@ -16,7 +16,6 @@ gem ENV.fetch('MODEL_PARSER', nil) if ENV.key?('MODEL_PARSER')
 
 group :development, :test do
   gem 'bundler'
-  gem 'dry-schema'
   gem 'grape-entity'
   gem 'pry', platforms: [:mri]
   gem 'pry-byebug', platforms: [:mri]

lib/grape-swagger.rb

@@ -25,7 +25,7 @@ def model_parsers
     serializable_hash: Grape::Formatter::SerializableHash,
     json: Grape::Formatter::Json,
     jsonapi: Grape::Formatter::Json,
-    txt: Grape::Formatter::Txt,
+    txt: Grape::Formatter::Txt
   }.freeze
 
   # Copied from https://github.com/ruby-grape/grape/blob/v2.2.0/lib/grape/content_types.rb

lib/grape-swagger/doc_methods/build_model_definition.rb

@@ -4,10 +4,6 @@ module GrapeSwagger
   module DocMethods
     class BuildModelDefinition
       class << self
-        OBJECT_ATTRIBUTE_KEYS = %i[
-          $ref type
-        ].freeze
-
         def build(_model, properties, required, other_def_properties = {})
           definition = { type: 'object', properties: properties }.merge(other_def_properties)
 
@@ -17,10 +13,6 @@ def build(_model, properties, required, other_def_properties = {})
         end
 
         def parse_params_from_model(parsed_response, model, model_name)
-          # If the parsed response looks like a complete object (e.g., containing `$ref` or `type`),
-          # it uses the provided response as-is.
-          return parsed_response if complete_object?(parsed_response)
-
           if parsed_response.is_a?(Hash) && parsed_response.keys.first == :allOf
             refs_or_models = parsed_response[:allOf]
             parsed = parse_refs_and_models(refs_or_models, model)
@@ -62,26 +54,14 @@ def parse_properties(properties)
 
         def parse_refs_and_models(refs_or_models, model)
           refs_or_models.map do |ref_or_models|
-            if complete_object?(ref_or_models)
+            if ref_or_models.is_a?(Hash) && ref_or_models.keys.first == '$ref'
               ref_or_models
             else
               properties, required = ref_or_models
               GrapeSwagger::DocMethods::BuildModelDefinition.build(model, properties, required)
             end
           end
         end
-
-        private
-
-        # Checks if the parsed response is already a complete object.
-        #
-        # @param parsed_response [Hash] The parsed response to check.
-        # @return [Boolean] True if the response has object attributes.
-        def complete_object?(parsed_response)
-          return false unless parsed_response.is_a?(Hash)
-
-          parsed_response.keys.intersect?(OBJECT_ATTRIBUTE_KEYS)
-        end
       end
     end
   end

lib/grape-swagger/endpoint.rb

@@ -2,18 +2,16 @@
 
 require 'active_support'
 require 'active_support/core_ext/string/inflections'
-require 'grape-swagger/endpoint/params_parser'
-require 'grape-swagger/endpoint/path_params_parser'
-require 'grape-swagger/endpoint/contract_parser'
-require 'grape-swagger/endpoint/header_params_parser'
+require_relative 'request_param_parsers/headers'
+require_relative 'request_param_parsers/route'
+require_relative 'request_param_parsers/body'
 
 module Grape
   class Endpoint # rubocop:disable Metrics/ClassLength
     REQUEST_PARAM_PARSERS = [
-      GrapeSwagger::Endpoint::HeaderParamsParser,
-      GrapeSwagger::Endpoint::PathParamsParser,
-      GrapeSwagger::Endpoint::ContractParser,
-      GrapeSwagger::Endpoint::ParamsParser
+      GrapeSwagger::RequestParamParsers::Headers,
+      GrapeSwagger::RequestParamParsers::Route,
+      GrapeSwagger::RequestParamParsers::Body
     ].freeze
 
     def content_types_for(target_class)

lib/grape-swagger/endpoint/contract_parser.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module GrapeSwagger
-  module Endpoint
-    class ParamsParser
+  module RequestParamParsers
+    class Body
       attr_reader :route, :params, :settings, :endpoint
 
       def self.parse(route, params, settings, endpoint)
@@ -29,7 +29,6 @@ def parse
           memo[name] = options
         end
       end
-      alias parse_request_params parse
 
       private
 

lib/grape-swagger/endpoint/params_parser.rb renamed to lib/grape-swagger/request_param_parsers/body.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module GrapeSwagger
-  module Endpoint
-    class HeaderParamsParser
+  module RequestParamParsers
+    class Headers
       attr_reader :route
 
       def self.parse(route, params, settings, endpoint)

lib/grape-swagger/endpoint/header_params_parser.rb renamed to lib/grape-swagger/request_param_parsers/headers.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module GrapeSwagger
-  module Endpoint
-    class PathParamsParser
+  module RequestParamParsers
+    class Route
       DEFAULT_PARAM_TYPE = { required: true, type: 'Integer' }.freeze
 
       attr_reader :route
@@ -29,13 +29,12 @@ def parse
       def build_path_params(stackable_values)
         params = {}
 
-        loop do
-          break params unless stackable_values
-          break params unless stackable_values.is_a? Grape::Util::StackableValues
-
+        while stackable_values.is_a?(Grape::Util::StackableValues)
           params.merge!(fetch_inherited_params(stackable_values))
           stackable_values = stackable_values.inherited_values
         end
+
+        params
       end
 
       def fetch_inherited_params(stackable_values)

lib/grape-swagger/endpoint/path_params_parser.rb renamed to lib/grape-swagger/request_param_parsers/route.rb

@@ -47,9 +47,9 @@
   end
 
   describe 'parse_request_params' do
-    let(:subject) { GrapeSwagger::Endpoint::ParamsParser }
+    let(:subject) { GrapeSwagger::RequestParamParsers::Body }
     before do
-      subject.send(:parse, nil, params, {}, nil)
+      subject.parse(nil, params, {}, nil)
     end
 
     context 'when params do not contain an array' do

spec/lib/endpoint_spec.rb

@@ -2,15 +2,15 @@
 
 require 'spec_helper'
 
-describe GrapeSwagger::Endpoint::ParamsParser do
+describe GrapeSwagger::RequestParamParsers::Body do
   let(:settings) { {} }
   let(:params) { [] }
   let(:endpoint) { nil }
 
   let(:parser) { described_class.new(nil, params, settings, endpoint) }
 
   describe '#parse_request_params' do
-    subject(:parse_request_params) { parser.parse_request_params }
+    subject(:parse_request_params) { parser.parse }
 
     context 'when param is of array type' do
       let(:params) { [['param_1', { type: 'Array[String]' }]] }
@@ -39,7 +39,7 @@
         let(:settings) { { array_use_braces: true } }
 
         it 'does not add braces to the param key' do
-          expect(parser.parse_request_params.keys.first).to eq 'param_1'
+          expect(parser.parse.keys.first).to eq 'param_1'
         end
       end
     end

spec/lib/endpoint/params_parser_spec.rb renamed to spec/lib/request_param_parsers/body_spec.rb

@@ -11,14 +11,12 @@
 Dir[File.join(Dir.getwd, 'spec/support/*.rb')].each { |f| require f }
 require "grape-swagger/#{MODEL_PARSER}" if MODEL_PARSER != 'mock'
 require File.join(Dir.getwd, "spec/support/model_parsers/#{MODEL_PARSER}_parser.rb")
-require_relative 'support/model_parsers/custom_parsed_type_parser'
 
 require 'grape-entity'
 require 'grape-swagger-entity'
 
 Bundler.setup :default, :test
 
-require 'pry'
 require 'rack'
 require 'rack/test'
 require 'super_diff/rspec' if ENV.key?('SUPER_DIFF')

spec/spec_helper.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'dry-schema'
 
 describe 'setting of param type, such as `query`, `path`, `formData`, `body`, `header`' do
   include_context "#{MODEL_PARSER} swagger example"
@@ -68,18 +67,6 @@ class BodyParamTypeApi < Grape::API
           end
         end
 
-        namespace :with_dry_schema_params do
-          contract do
-            required(:orders).array(:hash) do
-              required(:name).filled(:string)
-              optional(:volume).maybe(:integer, lt?: 9)
-            end
-          end
-          post do
-            { 'declared_params' => declared(params) }
-          end
-        end
-
         add_swagger_documentation
       end
     end
@@ -91,7 +78,7 @@ def app
 
   describe 'no entity given' do
     subject do
-      get '/swagger_doc/'
+      get '/swagger_doc/wo_entities'
       JSON.parse(last_response.body)
     end
 
@@ -183,18 +170,6 @@ def app
     end
   end
 
-  describe 'with exceed type parser result' do
-    subject do
-      get '/swagger_doc/with_dry_schema_params'
-      JSON.parse(last_response.body)
-    end
-
-    specify do
-      puts JSON.pretty_generate(subject)
-      expect(subject['paths']['/with_dry_schema_params']).to eq({})
-    end
-  end
-
   describe 'complex entity given' do
     let(:request_parameters_definition) do
       [