Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rubocop #2003

Merged
merged 4 commits into from
Mar 2, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
require:
- rubocop-performance

AllCops:
TargetRubyVersion: 2.4
Include:
- Dangerfile
- gemfiles/*.gemfile

Exclude:
- vendor/**/*
- bin/**/*
Expand All @@ -19,8 +18,14 @@ Style/MultilineIfModifier:
Style/RaiseArgs:
Enabled: false

Lint/UnneededDisable:
Enabled: false
Style/HashEachMethods:
Enabled: true

Style/HashTransformKeys:
Enabled: true

Style/HashTransformValues:
Enabled: true

Metrics/BlockLength:
Exclude:
Expand Down
227 changes: 193 additions & 34 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,42 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2019-12-09 18:07:42 +0100 using RuboCop version 0.51.0.
# on 2020-03-01 23:02:40 +0100 using RuboCop version 0.80.1.
# 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
# versions of RuboCop, may require this file to be generated again.

# Offense count: 6
# Cop supports --auto-correct.
Layout/ClosingHeredocIndentation:
Exclude:
- 'spec/grape/api_spec.rb'
- 'spec/grape/entity_spec.rb'

# Offense count: 72
# Cop supports --auto-correct.
Layout/EmptyLineAfterGuardClause:
Enabled: false

# Offense count: 27
# Cop supports --auto-correct.
# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
# SupportedHashRocketStyles: key, separator, table
# SupportedColonStyles: key, separator, table
# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
Layout/HashAlignment:
Exclude:
- 'grape.gemspec'
- 'lib/grape/validations/params_scope.rb'
- 'lib/grape/validations/types/primitive_coercer.rb'
- 'spec/grape/api_spec.rb'
- 'spec/grape/entity_spec.rb'

# Offense count: 7
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
Layout/IndentHeredoc:
# Configuration parameters: EnforcedStyle.
# SupportedStyles: squiggly, active_support, powerpack, unindent
Layout/HeredocIndentation:
Exclude:
- 'lib/grape/router/route.rb'
- 'spec/grape/api_spec.rb'
Expand All @@ -21,23 +47,45 @@ Lint/AmbiguousBlockAssociation:
Exclude:
- 'spec/grape/dsl/routing_spec.rb'

# Offense count: 4
Lint/DisjunctiveAssignmentInConstructor:
Exclude:
- 'lib/grape/namespace.rb'
- 'lib/grape/path.rb'
- 'lib/grape/router.rb'
- 'lib/grape/router/pattern.rb'

# Offense count: 1
Lint/RescueWithoutErrorClass:
# Cop supports --auto-correct.
Lint/NonDeterministicRequireOrder:
Exclude:
- 'lib/grape/validations/validators/coerce.rb'
- 'spec/spec_helper.rb'

# Offense count: 1
# Cop supports --auto-correct.
Lint/RedundantCopDisableDirective:
Exclude:
- 'lib/grape/router/attribute_translator.rb'

# Offense count: 1
# Cop supports --auto-correct.
Lint/UnneededRequireStatement:
Lint/RedundantRequireStatement:
Exclude:
- 'lib/grape.rb'

# Offense count: 46
# Offense count: 2
# Cop supports --auto-correct.
Lint/ToJSON:
Exclude:
- 'spec/grape/middleware/formatter_spec.rb'

# Offense count: 48
Metrics/AbcSize:
Max: 44
Max: 43

# Offense count: 7
# Offense count: 6
# Configuration parameters: CountComments, ExcludedMethods.
# ExcludedMethods: refine
Metrics/BlockLength:
Max: 182

Expand All @@ -46,18 +94,12 @@ Metrics/BlockLength:
Metrics/ClassLength:
Max: 305

# Offense count: 30
# Offense count: 32
Metrics/CyclomaticComplexity:
Max: 14

# Offense count: 1300
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
# URISchemes: http, https
Metrics/LineLength:
Max: 215

# Offense count: 60
# Configuration parameters: CountComments.
# Offense count: 61
# Configuration parameters: CountComments, ExcludedMethods.
Metrics/MethodLength:
Max: 33

Expand All @@ -66,54 +108,171 @@ Metrics/MethodLength:
Metrics/ModuleLength:
Max: 220

# Offense count: 22
# Offense count: 25
Metrics/PerceivedComplexity:
Max: 14

# Offense count: 4
# Offense count: 1
# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
Naming/FileName:
Exclude:
- 'Appraisals'
- 'Gemfile'
- 'Guardfile'
- 'Rakefile'
- 'gemfiles/rack2-0.gemfile'

# Offense count: 3
# Configuration parameters: EnforcedStyleForLeadingUnderscores.
# SupportedStylesForLeadingUnderscores: disallowed, required, optional
Naming/MemoizedInstanceVariableName:
Exclude:
- 'lib/grape/api/instance.rb'
- 'lib/grape/middleware/base.rb'
- 'spec/grape/integration/rack_spec.rb'

# Offense count: 5
# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
# AllowedNames: io, id, to, by, on, in, at, ip, db, os, pp
Naming/MethodParameterName:
Exclude:
- 'lib/grape/endpoint.rb'
- 'lib/grape/middleware/error.rb'
- 'lib/grape/middleware/stack.rb'
- 'spec/grape/api_spec.rb'

# Offense count: 1
# Cop supports --auto-correct.
# Configuration parameters: PreferredName.
Naming/RescuedExceptionsVariableName:
Exclude:
- 'lib/grape/middleware/error.rb'

# Offense count: 3
# Cop supports --auto-correct.
Performance/InefficientHashSearch:
Exclude:
- 'spec/grape/validations/validators/values_spec.rb'

# Offense count: 1
# Cop supports --auto-correct.
Performance/RegexpMatch:
Exclude:
- 'lib/grape/middleware/versioner/path.rb'

# Offense count: 5
# Cop supports --auto-correct.
Style/EmptyLambdaParameter:
Exclude:
- 'spec/grape/dsl/callbacks_spec.rb'
- 'spec/grape/dsl/middleware_spec.rb'
- 'spec/grape/dsl/routing_spec.rb'
- 'spec/grape/middleware/auth/dsl_spec.rb'
- 'spec/grape/middleware/stack_spec.rb'

# Offense count: 3
# Cop supports --auto-correct.
Style/ExpandPathArguments:
Exclude:
- 'grape.gemspec'
- 'lib/grape.rb'
- 'spec/grape/validations/validators/coerce_spec.rb'

# Offense count: 2
# Configuration parameters: SupportedStyles.
# SupportedStyles: annotated, template
# Configuration parameters: .
# SupportedStyles: annotated, template, unannotated
Style/FormatStringToken:
EnforcedStyle: template

# Offense count: 1
# Cop supports --auto-correct.
# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
Style/HashTransformValues:
Exclude:
- 'lib/grape/api.rb'

# Offense count: 23
# Cop supports --auto-correct.
Style/IfUnlessModifier:
Exclude:
- 'lib/grape/api/instance.rb'
- 'lib/grape/dsl/desc.rb'
- 'lib/grape/dsl/request_response.rb'
- 'lib/grape/dsl/routing.rb'
- 'lib/grape/dsl/settings.rb'
- 'lib/grape/endpoint.rb'
- 'lib/grape/error_formatter/json.rb'
- 'lib/grape/error_formatter/xml.rb'
- 'lib/grape/middleware/error.rb'
- 'lib/grape/middleware/formatter.rb'
- 'lib/grape/middleware/versioner/accept_version_header.rb'
- 'lib/grape/validations/params_scope.rb'
- 'lib/grape/validations/validators/base.rb'
- 'lib/grape/validations/validators/default.rb'
- 'spec/support/versioned_helpers.rb'

# Offense count: 1
Style/MethodMissingSuper:
Exclude:
- 'lib/grape/router/attribute_translator.rb'

# Offense count: 5
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle.
# SupportedStyles: literals, strict
Style/MutableConstant:
Exclude:
- 'lib/grape/middleware/versioner/header.rb'
- 'lib/grape/router/route.rb'

# Offense count: 1
# Cop supports --auto-correct.
# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
# SupportedStyles: predicate, comparison
Style/NumericPredicate:
Exclude:
- 'spec/**/*'
- 'lib/grape/middleware/formatter.rb'

# Offense count: 12
# Offense count: 1
# Cop supports --auto-correct.
# Configuration parameters: ConvertCodeThatCanStartToReturnNil.
# Configuration parameters: EnforcedStyle.
# SupportedStyles: implicit, explicit
Style/RescueStandardError:
Exclude:
- 'lib/grape/validations/validators/coerce.rb'

# Offense count: 11
# Cop supports --auto-correct.
# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
# AllowedMethods: present?, blank?, presence, try, try!
Style/SafeNavigation:
Exclude:
- 'lib/grape/api/instance.rb'
- 'lib/grape/dsl/desc.rb'
- 'lib/grape/dsl/helpers.rb'
- 'lib/grape/dsl/inside_route.rb'
- 'lib/grape/dsl/routing.rb'
- 'lib/grape/dsl/request_response.rb'
- 'lib/grape/endpoint.rb'
- 'lib/grape/middleware/error.rb'
- 'lib/grape/middleware/versioner/accept_version_header.rb'
- 'lib/grape/middleware/versioner/header.rb'
- 'lib/grape/middleware/versioner/param.rb'
- 'lib/grape/middleware/versioner/path.rb'

# Offense count: 2
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyleForMultiline.
# SupportedStylesForMultiline: comma, consistent_comma, no_comma
Style/TrailingCommaInHashLiteral:
Exclude:
- 'lib/grape/middleware/error.rb'

# Offense count: 10
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, MinSize, WordRegex.
# SupportedStyles: percent, brackets
Style/WordArray:
Exclude:
- 'spec/grape/validations/validators/except_values_spec.rb'
- 'spec/grape/validations/validators/values_spec.rb'

# Offense count: 1314
# Cop supports --auto-correct.
# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
# URISchemes: http, https
Layout/LineLength:
Max: 215
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#### Features

* Your contribution here.
* [#2003](https://github.com/ruby-grape/grape/pull/2003): Updated rubocop - [@ericproulx](https://github.com/ericproulx).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upgraded RuboCop to ...

* [#2002](https://github.com/ruby-grape/grape/pull/2002): Objects allocation optimization (lazy_lookup) - [@ericproulx](https://github.com/ericproulx).

#### Fixes
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ group :development, :test do
gem 'bundler'
gem 'hashie'
gem 'rake'
gem 'rubocop', '0.51.0'
gem 'rubocop'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't commit Gemfile.lock, so you should specify a version here or future builds will break for no reason as newer versions get released.

gem 'rubocop-performance'
end

group :development do
Expand Down