Merge remote-tracking branch 'upstream/pull/2296'

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 72913d43e9d6532dbe25e8cf3f44fcd51061a5a5..809cde374d470abfb57c755a369189dc1b73d34a 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,90 +1,70 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
 # This configuration was generated by
 # `rubocop --auto-gen-config`

-# on 2016-10-20 21:45:27 +0100 using RuboCop version 0.44.1.
+# on 2019-06-05 09:04:25 +0100 using RuboCop version 0.71.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
 # versions of RuboCop, may require this file to be generated again.
 
 # 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: 34
-Lint/AmbiguousOperator:
-  Exclude:
-    - 'test/controllers/amf_controller_test.rb'
-    - 'test/controllers/changeset_controller_test.rb'
-    - 'test/lib/bounding_box_test.rb'
-    - 'test/lib/country_test.rb'
-
-# Offense count: 117
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-
-# Offense count: 30
+# Offense count: 33

 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:

+    - 'app/controllers/api/traces_controller.rb'
+    - 'app/controllers/api/user_preferences_controller.rb'

     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'

-    - 'app/controllers/trace_controller.rb'
-    - 'app/controllers/user_controller.rb'
-    - 'app/controllers/user_preference_controller.rb'
+    - 'app/controllers/traces_controller.rb'
+    - 'app/controllers/users_controller.rb'

     - 'app/helpers/application_helper.rb'
     - 'app/helpers/application_helper.rb'

-    - 'app/helpers/browse_helper.rb'
+    - 'app/helpers/browse_tags_helper.rb'
+    - 'app/mailers/notifier.rb'

     - 'app/models/client_application.rb'
     - 'app/models/client_application.rb'

-    - 'app/models/notifier.rb'

     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'
 

-# Offense count: 5
+# Offense count: 4
+# Configuration parameters: AllowComments.

 Lint/HandleExceptions:
   Exclude:
 Lint/HandleExceptions:
   Exclude:

-    - 'app/controllers/amf_controller.rb'
-    - 'app/controllers/user_controller.rb'
-    - 'config/initializers/session.rb'
+    - 'app/controllers/api/amf_controller.rb'
+    - 'app/controllers/users_controller.rb'

 
 

-# Offense count: 2
-Lint/ShadowingOuterLocalVariable:
-  Exclude:
-    - 'app/views/changeset/list.atom.builder'
-
-# Offense count: 630
+# Offense count: 703

 Metrics/AbcSize:
 Metrics/AbcSize:

-  Max: 280
+  Max: 279

 
 

-# Offense count: 35
-# Configuration parameters: CountComments.
+# Offense count: 40
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine

 Metrics/BlockLength:
 Metrics/BlockLength:

-  Max: 295
+  Max: 71

 
 

-# Offense count: 12
+# Offense count: 15
+# Configuration parameters: CountBlocks.

 Metrics/BlockNesting:
   Max: 5
 
 Metrics/BlockNesting:
   Max: 5
 

-# Offense count: 62
+# Offense count: 68

 # Configuration parameters: CountComments.
 Metrics/ClassLength:
 # Configuration parameters: CountComments.
 Metrics/ClassLength:

-  Max: 1766
+  Max: 645

 
 

-# Offense count: 69
+# Offense count: 73

 Metrics/CyclomaticComplexity:
 Metrics/CyclomaticComplexity:

-  Max: 20
+  Max: 22

 
 

-# Offense count: 2826
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 1072
-
-# Offense count: 612
-# Configuration parameters: CountComments.
+# Offense count: 714
+# Configuration parameters: CountComments, ExcludedMethods.

 Metrics/MethodLength:
   Max: 179
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
 Metrics/MethodLength:
   Max: 179
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:

-  Max: 147
+  Max: 107

 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.


@@ -93,15 +73,43 @@ Metrics/ParameterLists:
 
 # Offense count: 71
 Metrics/PerceivedComplexity:
 
 # Offense count: 71
 Metrics/PerceivedComplexity:

-  Max: 23
+  Max: 25

 
 

-# Offense count: 2
-# Configuration parameters: Include.
-# Include: app/**/*.rb, config/**/*.rb, lib/**/*.rb
-Rails/Exit:
+# Offense count: 6
+Naming/AccessorMethodName:
+  Exclude:
+    - 'app/controllers/application_controller.rb'
+    - 'app/helpers/title_helper.rb'
+    - 'app/models/old_way.rb'
+    - 'lib/osm.rb'
+    - 'lib/potlatch.rb'
+
+# Offense count: 8
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicateName:

   Exclude:
   Exclude:

-    - 'lib/**/*.rake'
-    - 'lib/daemons/gpx_import.rb'
+    - 'spec/**/*'
+    - 'app/models/changeset.rb'
+    - 'app/models/old_node.rb'
+    - 'app/models/old_relation.rb'
+    - 'app/models/old_way.rb'
+    - 'app/models/user.rb'
+    - 'lib/classic_pagination/pagination.rb'
+
+# Offense count: 6
+# Configuration parameters: Database, Include.
+# SupportedDatabases: mysql, postgresql
+# Include: db/migrate/*.rb
+Rails/BulkChangeTable:
+  Exclude:
+    - 'db/migrate/20111116184519_update_oauth.rb'
+    - 'db/migrate/20120208122334_merge_acl_address_and_mask.rb'
+    - 'db/migrate/20120208194454_add_domain_to_acl.rb'
+    - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'

 
 # Offense count: 2
 # Configuration parameters: Include.
 
 # Offense count: 2
 # Configuration parameters: Include.


@@ -111,6 +119,15 @@ Rails/HasAndBelongsToMany:
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 

+# Offense count: 11
+# Configuration parameters: Include.
+# Include: app/helpers/**/*.rb
+Rails/HelperInstanceVariable:
+  Exclude:
+    - 'app/helpers/application_helper.rb'
+    - 'app/helpers/title_helper.rb'
+    - 'app/helpers/trace_helper.rb'
+

 # Offense count: 5
 # Configuration parameters: Include.
 # Include: db/migrate/*.rb
 # Offense count: 5
 # Configuration parameters: Include.
 # Include: db/migrate/*.rb


@@ -122,95 +139,58 @@ Rails/NotNullColumn:
     - 'db/migrate/025_add_end_time_to_changesets.rb'
     - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
 
     - 'db/migrate/025_add_end_time_to_changesets.rb'
     - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
 

-# Offense count: 17
+# Offense count: 18

 Rails/OutputSafety:
   Exclude:
 Rails/OutputSafety:
   Exclude:

-    - 'app/controllers/user_controller.rb'
+    - 'app/controllers/users_controller.rb'

     - 'app/helpers/application_helper.rb'
     - 'app/helpers/application_helper.rb'

-    - 'app/helpers/changeset_helper.rb'
+    - 'app/helpers/changesets_helper.rb'

     - 'app/helpers/geocoder_helper.rb'
     - 'app/helpers/note_helper.rb'
     - 'app/helpers/open_graph_helper.rb'
     - 'app/helpers/user_blocks_helper.rb'
     - 'app/helpers/geocoder_helper.rb'
     - 'app/helpers/note_helper.rb'
     - 'app/helpers/open_graph_helper.rb'
     - 'app/helpers/user_blocks_helper.rb'

-    - 'app/helpers/user_roles_helper.rb'

     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 

-# Offense count: 74
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Offense count: 94
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.

 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Enabled: false
 
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Enabled: false
 

-# Offense count: 5
-Style/AccessorMethodName:
-  Exclude:
-    - 'app/controllers/application_controller.rb'
-    - 'app/helpers/title_helper.rb'
-    - 'app/models/old_way.rb'
-    - 'lib/osm.rb'
-    - 'lib/potlatch.rb'
-

 # Offense count: 1
 # Offense count: 1

+# Configuration parameters: AllowedChars.

 Style/AsciiComments:
   Exclude:
     - 'test/models/message_test.rb'
 
 Style/AsciiComments:
   Exclude:
     - 'test/models/message_test.rb'
 

-# Offense count: 220
+# Offense count: 255

 Style/Documentation:
   Enabled: false
 
 Style/Documentation:
   Enabled: false
 

-# Offense count: 1
+# Offense count: 503

 # Cop supports --auto-correct.
 # Cop supports --auto-correct.

-# Configuration parameters: MaxLineLength.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'app/controllers/way_controller.rb'
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, never
+Style/FrozenStringLiteralComment:
+  Enabled: false

 
 

-# Offense count: 60
+# Offense count: 2

 # Cop supports --auto-correct.
 # Cop supports --auto-correct.

-Style/LineEndConcatenation:
+Style/IfUnlessModifier:

   Exclude:
   Exclude:

-    - 'db/migrate/008_remove_segments.rb'
-    - 'db/migrate/020_populate_node_tags_and_remove.rb'
-    - 'db/migrate/023_add_changesets.rb'
-    - 'lib/bounding_box.rb'
-    - 'lib/diff_reader.rb'
-    - 'lib/osm.rb'
-    - 'test/controllers/changeset_controller_test.rb'
-    - 'test/controllers/node_controller_test.rb'
-    - 'test/controllers/relation_controller_test.rb'
-    - 'test/controllers/way_controller_test.rb'
+    - 'app/controllers/api/ways_controller.rb'

 
 

-# Offense count: 71
+# Offense count: 74

 # Cop supports --auto-correct.
 # Cop supports --auto-correct.

+# Configuration parameters: Strict.

 Style/NumericLiterals:
   MinDigits: 11
 
 Style/NumericLiterals:
   MinDigits: 11
 

-# Offense count: 8
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
-# NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
-Style/PredicateName:
-  Exclude:
-    - 'spec/**/*'
-    - 'app/models/changeset.rb'
-    - 'app/models/old_node.rb'
-    - 'app/models/old_relation.rb'
-    - 'app/models/old_way.rb'
-    - 'app/models/user.rb'
-    - 'lib/classic_pagination/pagination.rb'
-
-# Offense count: 97
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: compact, exploded
-Style/RaiseArgs:
-  Enabled: false
-
-# Offense count: 2
+# Offense count: 3320

 # Cop supports --auto-correct.
 # Cop supports --auto-correct.

-Style/RescueModifier:
-  Exclude:
-    - 'app/helpers/browse_helper.rb'
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 307