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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 71d949daee69c30e6f4217e86e4e267374ca4fa8..f012237b31aba8b6fff09b291fa9f98ce279c6b4 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
 # This configuration was generated by
 # `rubocop --auto-gen-config`

-# on 2015-08-18 20:27:49 +0100 using RuboCop version 0.33.0.
+# on 2018-06-19 09:02:55 +0100 using RuboCop version 0.57.2.

 # 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
 # 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,20 +14,20 @@ Lint/AmbiguousOperator:
     - 'test/lib/bounding_box_test.rb'
     - 'test/lib/country_test.rb'
 
     - 'test/lib/bounding_box_test.rb'
     - 'test/lib/country_test.rb'
 

-# Offense count: 115
+# Offense count: 96

 Lint/AmbiguousRegexpLiteral:
   Enabled: false
 
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
 

-# Offense count: 29
+# Offense count: 32

 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'

-    - 'app/controllers/trace_controller.rb'
+    - 'app/controllers/traces_controller.rb'

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

-    - 'app/controllers/user_preference_controller.rb'
+    - 'app/controllers/user_preferences_controller.rb'

     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_helper.rb'
     - 'app/models/client_application.rb'
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_helper.rb'
     - 'app/models/client_application.rb'


@@ -36,80 +36,61 @@ Lint/AssignmentInCondition:
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
     - 'lib/osm.rb'
     - 'script/deliver-message'
 

-# Offense count: 3
-Lint/FormatParameterMismatch:
-  Exclude:
-    - 'app/controllers/swf_controller.rb'
-
-# Offense count: 5
+# Offense count: 4

 Lint/HandleExceptions:
   Exclude:
     - 'app/controllers/amf_controller.rb'
     - 'app/controllers/user_controller.rb'
 Lint/HandleExceptions:
   Exclude:
     - 'app/controllers/amf_controller.rb'
     - 'app/controllers/user_controller.rb'

-    - 'config/initializers/session.rb'

 
 

-# Offense count: 8
-Lint/ParenthesesAsGroupedExpression:
+# Offense count: 2
+Lint/ShadowingOuterLocalVariable:

   Exclude:
   Exclude:

-    - 'test/controllers/amf_controller_test.rb'
-    - 'test/lib/bounding_box_test.rb'
-    - 'test/models/user_preference_test.rb'
+    - 'app/views/changeset/list.atom.builder'

 
 

-# Offense count: 671
+# Offense count: 690

 Metrics/AbcSize:
 Metrics/AbcSize:

-  Max: 277
+  Max: 280
+
+# Offense count: 41
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 261

 
 

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

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

-# Offense count: 62
+# Offense count: 63

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

-  Max: 1653
+  Max: 1795

 
 

-# Offense count: 67
+# Offense count: 72

 Metrics/CyclomaticComplexity:
   Max: 20
 
 Metrics/CyclomaticComplexity:
   Max: 20
 

-# Offense count: 2535
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
-  Max: 694
-
-# Offense count: 628
+# Offense count: 688

 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 179
 
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 179
 

-# Offense count: 1
+# Offense count: 2

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

-  Max: 126
+  Max: 135

 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 9
 
 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 9
 

-# Offense count: 69
+# Offense count: 71

 Metrics/PerceivedComplexity:
   Max: 23
 
 Metrics/PerceivedComplexity:
   Max: 23
 

-# 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'
   Exclude:
     - 'app/controllers/application_controller.rb'
     - 'app/helpers/title_helper.rb'


@@ -117,88 +98,104 @@ Style/AccessorMethodName:
     - 'lib/osm.rb'
     - 'lib/potlatch.rb'
 
     - '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:
   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/**/*.rb, config/**/*.rb, lib/**/*.rb
+Rails/Exit:
+  Exclude:
+    - 'lib/**/*.rake'
+    - 'lib/daemons/gpx_import.rb'
+
+# Offense count: 2
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/HasAndBelongsToMany:

   Exclude:
   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'
     - '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: 5
+# Configuration parameters: Include.
+# Include: db/migrate/*.rb
+Rails/NotNullColumn:

   Exclude:
   Exclude:

-    - 'db/migrate/008_remove_segments.rb'
+    - 'db/migrate/002_cleanup_osm_db.rb'

     - 'db/migrate/020_populate_node_tags_and_remove.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
-# Cop supports --auto-correct.
-Style/NumericLiterals:
-  MinDigits: 11
-
-# Offense count: 42
-# Cop supports --auto-correct.
-Style/PerlBackrefs:
+# Offense count: 20
+Rails/OutputSafety:

   Exclude:
   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'
+    - 'app/controllers/user_controller.rb'
+    - 'app/helpers/application_helper.rb'
+    - 'app/helpers/changeset_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'
+
+# Offense count: 86
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: strict, flexible
+Rails/TimeZone:
+  Enabled: false

 
 

-# Offense count: 8
-# Configuration parameters: NamePrefix, NamePrefixBlacklist.
-Style/PredicateName:
+# Offense count: 1
+# Configuration parameters: AllowedChars.
+Style/AsciiComments:

   Exclude:
   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'
+    - 'test/models/message_test.rb'

 
 

-# Offense count: 97
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/RaiseArgs:
+# Offense count: 229
+Style/Documentation:

   Enabled: false
 
 # Offense count: 2
   Enabled: false
 
 # Offense count: 2

-Style/RescueModifier:
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:

   Exclude:
   Exclude:

-    - 'app/helpers/browse_helper.rb'
+    - 'app/controllers/way_controller.rb'

 
 

-# Offense count: 8
+# Offense count: 70

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

-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiteralsInInterpolation:
-  Enabled: false
+# Configuration parameters: Strict.
+Style/NumericLiterals:
+  MinDigits: 11
+
+# Offense count: 3064
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 1073