Merge pull request #2422 from dgutov/more_rubocop

More rubocop

.rubocop.yml

@@ -15,6 +15,10 @@ inherit_from: .rubocop_todo.yml
 Layout/LineLength:
   Max: 215
 
+Lint/EmptyBlock:
+  Exclude:
+    - spec/**/*_spec.rb
+
 Style/Documentation:
   Enabled: false
 
@@ -60,7 +64,7 @@ RSpec/ExampleLength:
   Max: 60
 
 RSpec/NestedGroups:
-  Max: 4
+  Max: 6
 
 RSpec/FilePath:
   SpecSuffixOnly: true
@@ -69,4 +73,13 @@ RSpec/SpecFilePathFormat:
   Enabled: false
 
 RSpec/MultipleExpectations:
-  Max: 4
+  Enabled: false
+
+RSpec/NamedSubject:
+  Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Max: 11
+
+RSpec/ContextWording:
+  Enabled: false

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 5000`
-# on 2024-03-25 01:40:39 UTC using RuboCop version 1.59.0.
+# on 2024-03-26 03:54:44 UTC using RuboCop version 1.59.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -21,68 +21,24 @@ Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'spec/grape/dsl/routing_spec.rb'
 
-# Offense count: 55
+# Offense count: 1
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: enums
 Lint/ConstantDefinitionInBlock:
   Exclude:
-    - 'spec/grape/api/defines_boolean_in_params_spec.rb'
-    - 'spec/grape/api/inherited_helpers_spec.rb'
-    - 'spec/grape/api/mount_and_helpers_order_spec.rb'
-    - 'spec/grape/api/mount_and_rescue_from_spec.rb'
-    - 'spec/grape/api/nested_helpers_spec.rb'
-    - 'spec/grape/api/patch_method_helpers_spec.rb'
-    - 'spec/grape/api_spec.rb'
-    - 'spec/grape/entity_spec.rb'
-    - 'spec/grape/loading_spec.rb'
-    - 'spec/grape/middleware/base_spec.rb'
-    - 'spec/grape/middleware/error_spec.rb'
-    - 'spec/grape/middleware/formatter_spec.rb'
-    - 'spec/grape/middleware/stack_spec.rb'
-    - 'spec/grape/validations/params_scope_spec.rb'
-    - 'spec/grape/validations/types_spec.rb'
-    - 'spec/grape/validations/validators/coerce_spec.rb'
     - 'spec/grape/validations/validators/except_values_spec.rb'
-    - 'spec/grape/validations/validators/presence_spec.rb'
-    - 'spec/grape/validations/validators/values_spec.rb'
 
 # Offense count: 3
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
 Lint/DuplicateBranch:
   Exclude:
     - 'spec/support/versioned_helpers.rb'
 
-# Offense count: 75
-# Configuration parameters: AllowComments, AllowEmptyLambdas.
-Lint/EmptyBlock:
-  Exclude:
-    - 'spec/grape/api/recognize_path_spec.rb'
-    - 'spec/grape/api/required_parameters_with_invalid_method_spec.rb'
-    - 'spec/grape/api_spec.rb'
-    - 'spec/grape/dsl/routing_spec.rb'
-    - 'spec/grape/dsl/settings_spec.rb'
-    - 'spec/grape/endpoint/declared_spec.rb'
-    - 'spec/grape/endpoint_spec.rb'
-    - 'spec/grape/loading_spec.rb'
-    - 'spec/grape/validations/params_scope_spec.rb'
-    - 'spec/grape/validations/validators/all_or_none_spec.rb'
-    - 'spec/grape/validations/validators/at_least_one_of_spec.rb'
-    - 'spec/grape/validations/validators/coerce_spec.rb'
-    - 'spec/grape/validations/validators/exactly_one_of_spec.rb'
-    - 'spec/grape/validations/validators/mutual_exclusion_spec.rb'
-    - 'spec/grape/validations/validators/regexp_spec.rb'
-    - 'spec/grape/validations/validators/same_as_spec.rb'
-    - 'spec/grape/validations_spec.rb'
-    - 'spec/support/endpoint_faker.rb'
-
-# Offense count: 5
+# Offense count: 1
 # Configuration parameters: AllowComments.
 Lint/EmptyClass:
   Exclude:
     - 'lib/grape/dsl/parameters.rb'
-    - 'spec/grape/api_spec.rb'
-    - 'spec/grape/entity_spec.rb'
-    - 'spec/grape/middleware/stack_spec.rb'
 
 # Offense count: 6
 # Configuration parameters: AllowedParentClasses.
@@ -130,69 +86,12 @@ Naming/VariableNumber:
     - 'spec/grape/exceptions/validation_errors_spec.rb'
     - 'spec/grape/validations_spec.rb'
 
-# Offense count: 4
+# Offense count: 2
 RSpec/AnyInstance:
   Exclude:
     - 'spec/grape/api_spec.rb'
     - 'spec/grape/middleware/base_spec.rb'
 
-# Offense count: 345
-# Configuration parameters: Prefixes, AllowedPatterns.
-# Prefixes: when, with, without
-RSpec/ContextWording:
-  Exclude:
-    - 'spec/grape/api/defines_boolean_in_params_spec.rb'
-    - 'spec/grape/api/documentation_spec.rb'
-    - 'spec/grape/api/inherited_helpers_spec.rb'
-    - 'spec/grape/api/instance_spec.rb'
-    - 'spec/grape/api/invalid_format_spec.rb'
-    - 'spec/grape/api/namespace_parameters_in_route_spec.rb'
-    - 'spec/grape/api/optional_parameters_in_route_spec.rb'
-    - 'spec/grape/api/patch_method_helpers_spec.rb'
-    - 'spec/grape/api/required_parameters_in_route_spec.rb'
-    - 'spec/grape/api/required_parameters_with_invalid_method_spec.rb'
-    - 'spec/grape/api/routes_with_requirements_spec.rb'
-    - 'spec/grape/api_remount_spec.rb'
-    - 'spec/grape/api_spec.rb'
-    - 'spec/grape/dsl/helpers_spec.rb'
-    - 'spec/grape/dsl/inside_route_spec.rb'
-    - 'spec/grape/endpoint_spec.rb'
-    - 'spec/grape/entity_spec.rb'
-    - 'spec/grape/exceptions/body_parse_errors_spec.rb'
-    - 'spec/grape/exceptions/invalid_accept_header_spec.rb'
-    - 'spec/grape/exceptions/validation_errors_spec.rb'
-    - 'spec/grape/extensions/param_builders/hashie/mash_spec.rb'
-    - 'spec/grape/middleware/auth/strategies_spec.rb'
-    - 'spec/grape/middleware/base_spec.rb'
-    - 'spec/grape/middleware/exception_spec.rb'
-    - 'spec/grape/middleware/formatter_spec.rb'
-    - 'spec/grape/middleware/globals_spec.rb'
-    - 'spec/grape/middleware/stack_spec.rb'
-    - 'spec/grape/middleware/versioner/accept_version_header_spec.rb'
-    - 'spec/grape/middleware/versioner/header_spec.rb'
-    - 'spec/grape/path_spec.rb'
-    - 'spec/grape/util/inheritable_values_spec.rb'
-    - 'spec/grape/util/reverse_stackable_values_spec.rb'
-    - 'spec/grape/util/stackable_values_spec.rb'
-    - 'spec/grape/validations/attributes_doc_spec.rb'
-    - 'spec/grape/validations/params_scope_spec.rb'
-    - 'spec/grape/validations/single_attribute_iterator_spec.rb'
-    - 'spec/grape/validations/types/array_coercer_spec.rb'
-    - 'spec/grape/validations/types/primitive_coercer_spec.rb'
-    - 'spec/grape/validations/types/set_coercer_spec.rb'
-    - 'spec/grape/validations/validators/all_or_none_spec.rb'
-    - 'spec/grape/validations/validators/allow_blank_spec.rb'
-    - 'spec/grape/validations/validators/at_least_one_of_spec.rb'
-    - 'spec/grape/validations/validators/coerce_spec.rb'
-    - 'spec/grape/validations/validators/default_spec.rb'
-    - 'spec/grape/validations/validators/exactly_one_of_spec.rb'
-    - 'spec/grape/validations/validators/mutual_exclusion_spec.rb'
-    - 'spec/grape/validations/validators/regexp_spec.rb'
-    - 'spec/grape/validations/validators/same_as_spec.rb'
-    - 'spec/grape/validations/validators/values_spec.rb'
-    - 'spec/grape/validations_spec.rb'
-    - 'spec/shared/versioning_examples.rb'
-
 # Offense count: 2
 # Configuration parameters: IgnoredMetadata.
 RSpec/DescribeClass:
@@ -236,41 +135,21 @@ RSpec/IndexedLet:
     - 'spec/grape/presenters/presenter_spec.rb'
     - 'spec/shared/versioning_examples.rb'
 
-# Offense count: 44
+# Offense count: 39
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
-    - 'spec/grape/api/mount_and_helpers_order_spec.rb'
     - 'spec/grape/api_spec.rb'
     - 'spec/grape/endpoint_spec.rb'
     - 'spec/grape/middleware/base_spec.rb'
     - 'spec/grape/middleware/versioner/accept_version_header_spec.rb'
     - 'spec/grape/middleware/versioner/header_spec.rb'
     - 'spec/grape/validations/validators/except_values_spec.rb'
 
-# Offense count: 97
+# Offense count: 6
 RSpec/LeakyConstantDeclaration:
   Exclude:
-    - 'spec/grape/api/defines_boolean_in_params_spec.rb'
-    - 'spec/grape/api/inherited_helpers_spec.rb'
-    - 'spec/grape/api/mount_and_helpers_order_spec.rb'
-    - 'spec/grape/api/mount_and_rescue_from_spec.rb'
-    - 'spec/grape/api/nested_helpers_spec.rb'
-    - 'spec/grape/api/patch_method_helpers_spec.rb'
-    - 'spec/grape/api_spec.rb'
-    - 'spec/grape/entity_spec.rb'
-    - 'spec/grape/loading_spec.rb'
-    - 'spec/grape/middleware/base_spec.rb'
-    - 'spec/grape/middleware/error_spec.rb'
-    - 'spec/grape/middleware/exception_spec.rb'
-    - 'spec/grape/middleware/formatter_spec.rb'
-    - 'spec/grape/middleware/stack_spec.rb'
-    - 'spec/grape/validations/params_scope_spec.rb'
-    - 'spec/grape/validations/types_spec.rb'
-    - 'spec/grape/validations/validators/coerce_spec.rb'
     - 'spec/grape/validations/validators/except_values_spec.rb'
-    - 'spec/grape/validations/validators/presence_spec.rb'
-    - 'spec/grape/validations/validators/values_spec.rb'
 
 # Offense count: 2
 RSpec/MessageChain:
@@ -288,107 +167,6 @@ RSpec/MissingExampleGroupArgument:
   Exclude:
     - 'spec/grape/middleware/exception_spec.rb'
 
-# Offense count: 57
-# Configuration parameters: Max.
-RSpec/MultipleExpectations:
-  Exclude:
-    - 'spec/grape/api/mount_and_rescue_from_spec.rb'
-    - 'spec/grape/api/parameters_modification_spec.rb'
-    - 'spec/grape/api_spec.rb'
-    - 'spec/grape/dsl/helpers_spec.rb'
-    - 'spec/grape/dsl/routing_spec.rb'
-    - 'spec/grape/dsl/settings_spec.rb'
-    - 'spec/grape/endpoint/declared_spec.rb'
-    - 'spec/grape/middleware/versioner/header_spec.rb'
-    - 'spec/grape/util/inheritable_setting_spec.rb'
-    - 'spec/grape/validations/params_scope_spec.rb'
-    - 'spec/grape/validations/validators/coerce_spec.rb'
-    - 'spec/grape/validations/validators/presence_spec.rb'
-    - 'spec/grape/validations_spec.rb'
-
-# Offense count: 38
-# Configuration parameters: AllowSubject, Max.
-RSpec/MultipleMemoizedHelpers:
-  Exclude:
-    - 'spec/grape/middleware/exception_spec.rb'
-    - 'spec/grape/request_spec.rb'
-    - 'spec/grape/validations/attributes_doc_spec.rb'
-
-# Offense count: 2180
-# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
-# SupportedStyles: always, named_only
-RSpec/NamedSubject:
-  Exclude:
-    - 'spec/grape/api/defines_boolean_in_params_spec.rb'
-    - 'spec/grape/api/documentation_spec.rb'
-    - 'spec/grape/api/invalid_format_spec.rb'
-    - 'spec/grape/api/namespace_parameters_in_route_spec.rb'
-    - 'spec/grape/api/optional_parameters_in_route_spec.rb'
-    - 'spec/grape/api/parameters_modification_spec.rb'
-    - 'spec/grape/api/recognize_path_spec.rb'
-    - 'spec/grape/api/required_parameters_in_route_spec.rb'
-    - 'spec/grape/api/required_parameters_with_invalid_method_spec.rb'
-    - 'spec/grape/api/routes_with_requirements_spec.rb'
-    - 'spec/grape/api_spec.rb'
-    - 'spec/grape/dsl/callbacks_spec.rb'
-    - 'spec/grape/dsl/desc_spec.rb'
-    - 'spec/grape/dsl/headers_spec.rb'
-    - 'spec/grape/dsl/helpers_spec.rb'
-    - 'spec/grape/dsl/inside_route_spec.rb'
-    - 'spec/grape/dsl/logger_spec.rb'
-    - 'spec/grape/dsl/middleware_spec.rb'
-    - 'spec/grape/dsl/parameters_spec.rb'
-    - 'spec/grape/dsl/request_response_spec.rb'
-    - 'spec/grape/dsl/routing_spec.rb'
-    - 'spec/grape/dsl/settings_spec.rb'
-    - 'spec/grape/dsl/validations_spec.rb'
-    - 'spec/grape/endpoint/declared_spec.rb'
-    - 'spec/grape/endpoint_spec.rb'
-    - 'spec/grape/entity_spec.rb'
-    - 'spec/grape/exceptions/base_spec.rb'
-    - 'spec/grape/exceptions/body_parse_errors_spec.rb'
-    - 'spec/grape/exceptions/invalid_accept_header_spec.rb'
-    - 'spec/grape/exceptions/validation_errors_spec.rb'
-    - 'spec/grape/extensions/param_builders/hash_spec.rb'
-    - 'spec/grape/extensions/param_builders/hash_with_indifferent_access_spec.rb'
-    - 'spec/grape/extensions/param_builders/hashie/mash_spec.rb'
-    - 'spec/grape/integration/rack_sendfile_spec.rb'
-    - 'spec/grape/middleware/auth/dsl_spec.rb'
-    - 'spec/grape/middleware/base_spec.rb'
-    - 'spec/grape/middleware/formatter_spec.rb'
-    - 'spec/grape/middleware/globals_spec.rb'
-    - 'spec/grape/middleware/stack_spec.rb'
-    - 'spec/grape/middleware/versioner/accept_version_header_spec.rb'
-    - 'spec/grape/middleware/versioner/header_spec.rb'
-    - 'spec/grape/middleware/versioner/param_spec.rb'
-    - 'spec/grape/middleware/versioner/path_spec.rb'
-    - 'spec/grape/parser_spec.rb'
-    - 'spec/grape/presenters/presenter_spec.rb'
-    - 'spec/grape/util/inheritable_setting_spec.rb'
-    - 'spec/grape/util/inheritable_values_spec.rb'
-    - 'spec/grape/util/reverse_stackable_values_spec.rb'
-    - 'spec/grape/util/stackable_values_spec.rb'
-    - 'spec/grape/util/strict_hash_configuration_spec.rb'
-    - 'spec/grape/validations/attributes_doc_spec.rb'
-    - 'spec/grape/validations/params_scope_spec.rb'
-    - 'spec/grape/validations/types/array_coercer_spec.rb'
-    - 'spec/grape/validations/types/primitive_coercer_spec.rb'
-    - 'spec/grape/validations/types/set_coercer_spec.rb'
-    - 'spec/grape/validations/validators/coerce_spec.rb'
-    - 'spec/grape/validations/validators/default_spec.rb'
-    - 'spec/grape/validations/validators/presence_spec.rb'
-    - 'spec/grape/validations_spec.rb'
-
-# Offense count: 28
-# Configuration parameters: Max, AllowedGroups.
-RSpec/NestedGroups:
-  Exclude:
-    - 'spec/grape/api_remount_spec.rb'
-    - 'spec/grape/api_spec.rb'
-    - 'spec/grape/dsl/inside_route_spec.rb'
-    - 'spec/grape/validations/validators/coerce_spec.rb'
-    - 'spec/grape/validations_spec.rb'
-
 # Offense count: 18
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_

spec/grape/api/defines_boolean_in_params_spec.rb

@@ -2,21 +2,17 @@
 
 describe Grape::API::Instance do
   describe 'boolean constant' do
-    module DefinesBooleanInstanceSpec
-      class API < Grape::API
+    let(:app) do
+      Class.new(Grape::API) do
         params do
-          requires :message, type: Boolean
+          requires :message, type: Grape::API::Boolean
         end
         post :echo do
           { class: params[:message].class.name, value: params[:message] }
         end
       end
     end
 
-    def app
-      DefinesBooleanInstanceSpec::API
-    end
-
     let(:expected_body) do
       { class: 'TrueClass', value: true }.to_s
     end
@@ -28,7 +24,7 @@ def app
     end
 
     context 'Params endpoint type' do
-      subject { DefinesBooleanInstanceSpec::API.new.router.map['POST'].first.options[:params]['message'][:type] }
+      subject { app.new.router.map['POST'].first.options[:params]['message'][:type] }
 
       it 'params type is a boolean' do
         expect(subject).to eq 'Grape::API::Boolean'