X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6f144e8b7dbedab09042f461bd55d357c8896612..905a7eadb622761b3c752a113ca878faa316a37a:/.rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 651691b84..809cde374 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,115 +1,82 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-08-18 20:27:49 +0100 using RuboCop version 0.33.0.
+# 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.
 
-# 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: 115
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-
-# Offense count: 29
+# Offense count: 33
 # 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/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/browse_helper.rb'
+    - 'app/helpers/browse_tags_helper.rb'
+    - 'app/mailers/notifier.rb'
     - 'app/models/client_application.rb'
-    - 'app/models/notifier.rb'
     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
-# Offense count: 3
-Lint/FormatParameterMismatch:
-  Exclude:
-    - 'app/controllers/swf_controller.rb'
-
-# Offense count: 5
+# Offense count: 4
+# Configuration parameters: AllowComments.
 Lint/HandleExceptions:
   Exclude:
-    - 'app/controllers/amf_controller.rb'
-    - 'app/controllers/user_controller.rb'
-    - 'config/initializers/session.rb'
-
-# Offense count: 8
-Lint/ParenthesesAsGroupedExpression:
-  Exclude:
-    - 'test/controllers/amf_controller_test.rb'
-    - 'test/lib/bounding_box_test.rb'
-    - 'test/models/user_preference_test.rb'
+    - 'app/controllers/api/amf_controller.rb'
+    - 'app/controllers/users_controller.rb'
 
-# Offense count: 671
+# Offense count: 703
 Metrics/AbcSize:
-  Max: 277
+  Max: 279
 
-# Offense count: 12
+# Offense count: 40
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 71
+
+# Offense count: 15
+# Configuration parameters: CountBlocks.
 Metrics/BlockNesting:
   Max: 5
 
-# Offense count: 62
+# Offense count: 68
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 1653
+  Max: 645
 
-# Offense count: 67
+# Offense count: 73
 Metrics/CyclomaticComplexity:
-  Max: 20
-
-# Offense count: 2535
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
-  Max: 962
+  Max: 22
 
-# Offense count: 628
-# Configuration parameters: CountComments.
+# Offense count: 714
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 179
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 131
+  Max: 107
 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 9
 
-# Offense count: 69
+# Offense count: 71
 Metrics/PerceivedComplexity:
-  Max: 23
+  Max: 25
 
-# Offense count: 2
-# Configuration parameters: Include.
-Rails/HasAndBelongsToMany:
-  Exclude:
-    - 'app/models/changeset.rb'
-    - 'app/models/user.rb'
-
-# Offense count: 66
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Rails/TimeZone:
-  Enabled: false
-
-# Offense count: 5
-Style/AccessorMethodName:
+# Offense count: 6
+Naming/AccessorMethodName:
   Exclude:
     - 'app/controllers/application_controller.rb'
     - 'app/helpers/title_helper.rb'
@@ -117,88 +84,113 @@ Style/AccessorMethodName:
     - 'lib/osm.rb'
     - 'lib/potlatch.rb'
 
-# Offense count: 1
-Style/AsciiComments:
+# 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:
-    - 'test/models/message_test.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: 310
-Style/Documentation:
-  Enabled: false
+# 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: 38
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
+# Offense count: 2
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/HasAndBelongsToMany:
   Exclude:
-    - 'app/controllers/application_controller.rb'
-    - 'app/controllers/diary_entry_controller.rb'
-    - 'app/controllers/message_controller.rb'
-    - 'app/controllers/notes_controller.rb'
-    - 'app/controllers/site_controller.rb'
-    - 'app/controllers/user_blocks_controller.rb'
-    - 'app/controllers/user_controller.rb'
-    - 'app/controllers/user_roles_controller.rb'
-    - 'app/helpers/application_helper.rb'
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
-    - 'lib/diff_reader.rb'
-    - 'lib/object_metadata.rb'
 
-# Offense count: 60
-# Cop supports --auto-correct.
-Style/LineEndConcatenation:
+# Offense count: 11
+# Configuration parameters: Include.
+# Include: app/helpers/**/*.rb
+Rails/HelperInstanceVariable:
   Exclude:
-    - 'db/migrate/008_remove_segments.rb'
+    - '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
+Rails/NotNullColumn:
+  Exclude:
+    - 'db/migrate/002_cleanup_osm_db.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'
+    - 'db/migrate/021_move_to_innodb.rb'
+    - 'db/migrate/025_add_end_time_to_changesets.rb'
+    - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
 
-# Offense count: 69
+# Offense count: 18
+Rails/OutputSafety:
+  Exclude:
+    - 'app/controllers/users_controller.rb'
+    - 'app/helpers/application_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'
+    - 'lib/rich_text.rb'
+    - 'test/helpers/application_helper_test.rb'
+
+# Offense count: 94
 # Cop supports --auto-correct.
-Style/NumericLiterals:
-  MinDigits: 11
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: strict, flexible
+Rails/TimeZone:
+  Enabled: false
 
-# Offense count: 42
-# Cop supports --auto-correct.
-Style/PerlBackrefs:
+# Offense count: 1
+# Configuration parameters: AllowedChars.
+Style/AsciiComments:
   Exclude:
-    - 'app/controllers/amf_controller.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'app/helpers/browse_helper.rb'
-    - 'config/initializers/paperclip.rb'
-    - 'lib/id.rb'
-    - 'lib/potlatch.rb'
-    - 'test/lib/i18n_test.rb'
+    - 'test/models/message_test.rb'
 
-# Offense count: 8
-# Configuration parameters: NamePrefix, NamePrefixBlacklist.
-Style/PredicateName:
-  Exclude:
-    - '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: 255
+Style/Documentation:
+  Enabled: false
 
-# Offense count: 97
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/RaiseArgs:
+# Offense count: 503
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, never
+Style/FrozenStringLiteralComment:
   Enabled: false
 
 # Offense count: 2
-Style/RescueModifier:
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
   Exclude:
-    - 'app/helpers/browse_helper.rb'
+    - 'app/controllers/api/ways_controller.rb'
 
-# Offense count: 8
+# Offense count: 74
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiteralsInInterpolation:
-  Enabled: false
+# Configuration parameters: Strict.
+Style/NumericLiterals:
+  MinDigits: 11
+
+# Offense count: 3320
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 307