From 460ed0c844d6d2dbb23f44f994461c4585d8ab45 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 25 Oct 2022 19:19:57 +0100 Subject: [PATCH] Fix new rubocop warnings --- .rubocop_todo.yml | 51 +++++++++---------- Gemfile | 2 +- Gemfile.lock | 4 +- app/controllers/api/relations_controller.rb | 6 +-- .../api/old_nodes_controller_test.rb | 2 +- 5 files changed, 30 insertions(+), 35 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 240e46c31..5303fb051 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2022-02-23 19:11:04 UTC using RuboCop version 1.25.1. +# on 2022-10-25 17:25:58 UTC using RuboCop version 1.37.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 @@ -14,14 +14,14 @@ require: - rubocop-rails - rubocop-rake -# Offense count: 550 -# Cop supports --auto-correct. -# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. +# Offense count: 555 +# This cop supports safe autocorrection (--autocorrect). +# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns. # URISchemes: http, https Layout/LineLength: - Max: 270 + Max: 248 -# Offense count: 34 +# Offense count: 29 # Configuration parameters: AllowSafeAssignment. Lint/AssignmentInCondition: Exclude: @@ -41,14 +41,14 @@ Lint/AssignmentInCondition: - 'lib/osm.rb' - 'script/deliver-message' -# Offense count: 665 -# Configuration parameters: IgnoredMethods, CountRepeatedAttributes. +# Offense count: 676 +# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes. Metrics/AbcSize: Max: 189 -# Offense count: 73 -# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods. -# IgnoredMethods: refine +# Offense count: 72 +# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods. +# AllowedMethods: refine Metrics/BlockLength: Max: 71 @@ -63,12 +63,12 @@ Metrics/ClassLength: Max: 316 # Offense count: 58 -# Configuration parameters: IgnoredMethods. +# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods. Metrics/CyclomaticComplexity: Max: 25 -# Offense count: 742 -# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods. +# Offense count: 751 +# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods. Metrics/MethodLength: Max: 179 @@ -77,21 +77,16 @@ Metrics/MethodLength: Metrics/ParameterLists: Max: 6 -# Offense count: 59 -# Configuration parameters: IgnoredMethods. +# Offense count: 57 +# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods. Metrics/PerceivedComplexity: Max: 26 -# Offense count: 550 +# Offense count: 559 Minitest/MultipleAssertions: Max: 52 # Offense count: 1 -Naming/AccessorMethodName: - Exclude: - - 'app/helpers/title_helper.rb' - -# Offense count: 8 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros. # NamePrefix: is_, has_, have_ # ForbiddenPrefixes: is_, has_, have_ @@ -141,7 +136,7 @@ Rails/InverseOf: # Offense count: 2 # Configuration parameters: Include. -# Include: app/controllers/**/*.rb +# Include: app/controllers/**/*.rb, app/mailers/**/*.rb Rails/LexicallyScopedActionFilter: Exclude: - 'app/controllers/oauth2_applications_controller.rb' @@ -168,7 +163,7 @@ Rails/OutputSafety: - 'test/helpers/application_helper_test.rb' # Offense count: 6 -# Cop supports --auto-correct. +# This cop supports safe autocorrection (--autocorrect). Rake/Desc: Exclude: - 'lib/tasks/auto_annotate_models.rake' @@ -176,15 +171,15 @@ Rake/Desc: - 'lib/tasks/subscribe_diary_authors.rake' - 'lib/tasks/subscribe_old_changesets.rake' -# Offense count: 617 -# Cop supports --auto-correct. +# Offense count: 625 +# This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: EnforcedStyle. # SupportedStyles: always, always_true, never Style/FrozenStringLiteralComment: Enabled: false # Offense count: 72 -# Cop supports --auto-correct. -# Configuration parameters: Strict, AllowedNumbers. +# This cop supports safe autocorrection (--autocorrect). +# Configuration parameters: Strict, AllowedNumbers, AllowedPatterns. Style/NumericLiterals: MinDigits: 15 diff --git a/Gemfile b/Gemfile index 020cc9166..cdbd48d04 100644 --- a/Gemfile +++ b/Gemfile @@ -152,7 +152,7 @@ group :test do gem "rubocop" gem "rubocop-minitest" gem "rubocop-performance" - gem "rubocop-rails" + gem "rubocop-rails", "= 2.16.1" gem "rubocop-rake" gem "selenium-webdriver" gem "simplecov", :require => false diff --git a/Gemfile.lock b/Gemfile.lock index f7666c9a9..fabead7cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -433,7 +433,7 @@ GEM rubocop-performance (1.15.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.17.1) + rubocop-rails (2.16.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -585,7 +585,7 @@ DEPENDENCIES rubocop rubocop-minitest rubocop-performance - rubocop-rails + rubocop-rails (= 2.16.1) rubocop-rake sanitize sassc-rails diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb index 5dd5632ba..69b145268 100644 --- a/app/controllers/api/relations_controller.rb +++ b/app/controllers/api/relations_controller.rb @@ -76,9 +76,9 @@ module Api # first find the ids of nodes, ways and relations referenced by this # relation - note that we exclude this relation just in case. - node_ids = relation.members.select { |m| m[0] == "Node" }.map { |m| m[1] } - way_ids = relation.members.select { |m| m[0] == "Way" }.map { |m| m[1] } - relation_ids = relation.members.select { |m| m[0] == "Relation" && m[1] != relation.id }.map { |m| m[1] } + node_ids = relation.members.select { |m| m[0] == "Node" }.pluck(1) + way_ids = relation.members.select { |m| m[0] == "Way" }.pluck(1) + relation_ids = relation.members.select { |m| m[0] == "Relation" && m[1] != relation.id }.pluck(1) # next load the relations and the ways. diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb index 95a20923e..a87f30258 100644 --- a/test/controllers/api/old_nodes_controller_test.rb +++ b/test/controllers/api/old_nodes_controller_test.rb @@ -436,7 +436,7 @@ module Api ("a".."z").to_a, ("A".."Z").to_a, ("0".."9").to_a].flatten - (1..16).map { |_i| letters[rand(letters.length)] }.join + (1..16).map { letters[rand(letters.length)] }.join end ## -- 2.43.2