Let rubocop be happy

Author: numbata

Gemfile

@@ -16,11 +16,11 @@ 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]
-  gem 'dry-schema'
-  gem "super_diff", require: false
+  gem 'super_diff', require: false
 
   grape_version = ENV.fetch('GRAPE_VERSION', '2.2.0')
   if grape_version == 'HEAD' || Gem::Version.new(grape_version) >= Gem::Version.new('2.0.0')

lib/grape-swagger/doc_methods/build_model_definition.rb

@@ -4,9 +4,9 @@ module GrapeSwagger
   module DocMethods
     class BuildModelDefinition
       class << self
-        OBJECT_ATTRIBUTE_KEYS = [
-            :$ref, :type,
-          ].freeze
+        OBJECT_ATTRIBUTE_KEYS = %i[
+          $ref type
+        ].freeze
 
         def build(_model, properties, required, other_def_properties = {})
           definition = { type: 'object', properties: properties }.merge(other_def_properties)

lib/grape-swagger/doc_methods/move_params.rb

@@ -163,9 +163,9 @@ def object_type
         end
 
         def prepare_nested_names(property, params)
-          params.each { |x|
+          params.each do |x|
             x[:name] = x[:name].to_s.sub(property.to_s, '').sub('[', '').sub(']', '')
-          }
+          end
         end
 
         def unify!(params)

lib/grape-swagger/endpoint.rb

@@ -10,10 +10,10 @@
 module Grape
   class Endpoint # rubocop:disable Metrics/ClassLength
     REQUEST_PARAM_PARSERS = [
-        GrapeSwagger::Endpoint::HeaderParamsParser,
-        GrapeSwagger::Endpoint::PathParamsParser,
-        GrapeSwagger::Endpoint::ContractParser,
-        GrapeSwagger::Endpoint::ParamsParser,
+      GrapeSwagger::Endpoint::HeaderParamsParser,
+      GrapeSwagger::Endpoint::PathParamsParser,
+      GrapeSwagger::Endpoint::ContractParser,
+      GrapeSwagger::Endpoint::ParamsParser
     ].freeze
 
     def content_types_for(target_class)
@@ -22,9 +22,7 @@ def content_types_for(target_class)
       if content_types.empty?
         formats       = [target_class.format, target_class.default_format].compact.uniq
         formats       = GrapeSwagger::FORMATTER_DEFAULTS.keys if formats.empty?
-        content_types = GrapeSwagger::CONTENT_TYPE_DEFAULTS.select do |content_type, _mime_type|
-          formats.include? content_type
-        end.values
+        content_types = GrapeSwagger::CONTENT_TYPE_DEFAULTS.slice(*formats).values
       end
 
       content_types.uniq

lib/grape-swagger/endpoint/contract_parser.rb

@@ -31,7 +31,7 @@ def parse
       def contract_defined?
         endpoint_settings = @endpoint&.route&.app&.inheritable_setting&.namespace_stackable
         binding.pry
-        return false unless endpoint_settings
+        false unless endpoint_settings
       end
     end
   end

lib/grape-swagger/endpoint/header_params_parser.rb

@@ -19,16 +19,16 @@ def parse
         route.headers.each_with_object({}) do |(name, definition), accum|
           params = {
             documentation: {
-              desc: definition["description"] || definition[:description],
+              desc: definition['description'] || definition[:description],
               in: 'header'
-            },
+            }
           }
           params[:type] = definition[:type].titleize if definition[:type]
 
           accum[name] = definition
-            .symbolize_keys
-            .except(:description, "description")
-            .merge(params)
+                        .symbolize_keys
+                        .except(:description, 'description')
+                        .merge(params)
         end
       end
     end

lib/grape-swagger/endpoint/params_parser.rb

@@ -49,7 +49,7 @@ def param_type_is_array?(param_type)
       end
 
       def public_params
-        params.select { |key, param| public_parameter?(param) }
+        params.select { |_key, param| public_parameter?(param) }
       end
 
       def public_parameter?(param_options)

lib/grape-swagger/endpoint/path_params_parser.rb

@@ -18,7 +18,7 @@ def initialize(route, _params, _settings, _endpoint)
       def parse
         stackable_values = route.app&.inheritable_setting&.namespace_stackable
 
-        get_params = get_path_params(stackable_values)
+        get_path_params(stackable_values)
         path_params = build_path_params(stackable_values)
 
         fulfill_params(path_params)
@@ -41,7 +41,7 @@ def build_path_params(stackable_values)
       def fetch_inherited_params(stackable_values)
         return {} unless stackable_values.new_values
 
-        namespaces = stackable_values.new_values.dig(:namespace) || []
+        namespaces = stackable_values.new_values[:namespace] || []
 
         namespaces.each_with_object({}) do |namespace, params|
           space = namespace.space.to_s.gsub(':', '')
@@ -50,18 +50,17 @@ def fetch_inherited_params(stackable_values)
       end
 
       def fulfill_params(path_params)
-        param_keys = route.params.keys
+        route.params.keys
         # Merge path params options into route params
         route.params.each_with_object({}) do |(param, definition), accum|
           value = (path_params[param] || {}).merge(
-            definition.is_a?(Hash) ? definition : {},
+            definition.is_a?(Hash) ? definition : {}
           )
 
           accum[param.to_sym] = value.empty? ? DEFAULT_PARAM_TYPE : value
         end
       end
 
-
       # Iterates over namespaces recursively
       # to build a hash of path params with options, including type
       def get_path_params(stackable_values)

spec/spec_helper.rb

@@ -11,8 +11,7 @@
 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_relative 'support/model_parsers/custom_parsed_type_parser'
 
 require 'grape-entity'
 require 'grape-swagger-entity'

spec/support/model_parsers/custom_parsed_type_parser.rb

@@ -12,15 +12,15 @@ def initialize(model, endpoint)
 
   def call
     {
-      type: "object",
+      type: 'object',
       properties: {
         custom: {
           type: 'boolean',
           description: "it's a custom type",
-          default: true,
+          default: true
         }
       },
-      required: [],
+      required: []
     }
   end
 end