X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..37a4fc6dd14dfedc0c44a8d7bf6453df0db9e1b5:/.rubocop_todo.yml?ds=sidebyside

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 75f088e1a..287fcd9f9 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,284 +1,204 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-02-16 19:20:52 +0000 using RuboCop version 0.29.1.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-08-18 20:27:49 +0100 using RuboCop version 0.33.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: 13
+# Offense count: 34
 Lint/AmbiguousOperator:
-  Enabled: false
+  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: 110
+# Offense count: 115
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
 
 # Offense count: 29
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: AlignWith, SupportedStyles.
-Lint/DefEndAlignment:
-  Enabled: false
+  Exclude:
+    - '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/helpers/application_helper.rb'
+    - 'app/helpers/browse_helper.rb'
+    - 'app/models/client_application.rb'
+    - 'app/models/notifier.rb'
+    - 'lib/nominatim.rb'
+    - 'lib/osm.rb'
+    - 'script/deliver-message'
 
-# Offense count: 2
-Lint/DuplicateMethods:
-  Enabled: false
+# Offense count: 3
+Lint/FormatParameterMismatch:
+  Exclude:
+    - 'app/controllers/swf_controller.rb'
 
 # Offense count: 5
-# Configuration parameters: AlignWith, SupportedStyles.
-Lint/EndAlignment:
-  Enabled: false
-
-# Offense count: 8
 Lint/HandleExceptions:
-  Enabled: false
-
-# Offense count: 1
-Lint/LiteralInCondition:
-  Enabled: false
+  Exclude:
+    - 'app/controllers/amf_controller.rb'
+    - 'app/controllers/user_controller.rb'
+    - 'config/initializers/session.rb'
 
 # Offense count: 8
 Lint/ParenthesesAsGroupedExpression:
-  Enabled: false
+  Exclude:
+    - 'test/controllers/amf_controller_test.rb'
+    - 'test/lib/bounding_box_test.rb'
+    - 'test/models/user_preference_test.rb'
 
-# Offense count: 18
-Lint/RescueException:
-  Enabled: false
-
-# Offense count: 3
-Lint/ShadowingOuterLocalVariable:
-  Enabled: false
-
-# Offense count: 2
-Lint/UselessAccessModifier:
-  Enabled: false
-
-# Offense count: 48
-Lint/UselessAssignment:
-  Enabled: false
-
-# Offense count: 2
-Lint/Void:
-  Enabled: false
-
-# Offense count: 546
+# Offense count: 671
 Metrics/AbcSize:
-  Max: 194
+  Max: 277
 
 # Offense count: 12
 Metrics/BlockNesting:
   Max: 5
 
-# Offense count: 60
+# Offense count: 62
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 1515
+  Max: 1653
 
-# Offense count: 68
+# Offense count: 67
 Metrics/CyclomaticComplexity:
-  Max: 21
+  Max: 20
 
-# Offense count: 2112
+# Offense count: 2535
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
-  Max: 520
+  Max: 962
 
-# Offense count: 520
+# Offense count: 628
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 179
 
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 126
+
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 9
 
-# Offense count: 70
+# Offense count: 69
 Metrics/PerceivedComplexity:
-  Max: 24
-
-# Offense count: 5
-Style/AccessorMethodName:
-  Enabled: false
-
-# Offense count: 1
-Style/AsciiComments:
-  Enabled: false
-
-# Offense count: 21
-# Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep.
-Style/CaseIndentation:
-  Enabled: false
-
-# Offense count: 3
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-# Offense count: 9
-Style/ClassVars:
-  Enabled: false
-
-# Offense count: 12
-# Configuration parameters: Keywords.
-Style/CommentAnnotation:
-  Enabled: false
-
-# Offense count: 9
-Style/ConstantName:
-  Enabled: false
-
-# Offense count: 306
-Style/Documentation:
-  Enabled: false
+  Max: 23
 
 # Offense count: 2
-Style/EachWithObject:
-  Enabled: false
-
-# Offense count: 3
-Style/EmptyElse:
-  Enabled: false
-
-# Offense count: 3
-# Configuration parameters: Exclude.
-Style/FileName:
-  Enabled: false
+# Configuration parameters: Include.
+Rails/HasAndBelongsToMany:
+  Exclude:
+    - 'app/models/changeset.rb'
+    - 'app/models/user.rb'
 
-# Offense count: 3
+# Offense count: 66
 # Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/For:
+Rails/TimeZone:
   Enabled: false
 
-# Offense count: 8
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/FormatString:
-  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
-# Configuration parameters: AllowedVariables.
-Style/GlobalVars:
+Style/AsciiComments:
+  Exclude:
+    - 'test/models/message_test.rb'
+
+# Offense count: 310
+Style/Documentation:
   Enabled: false
 
-# Offense count: 41
+# Offense count: 38
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
-  Enabled: false
-
-# Offense count: 5687
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/HashSyntax:
-  Enabled: false
-
-# Offense count: 41
-# Configuration parameters: MaxLineLength.
-Style/IfUnlessModifier:
-  Enabled: false
+  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:
-  Enabled: false
-
-# Offense count: 12
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/MethodName:
-  Enabled: false
-
-# Offense count: 3
-Style/MultilineTernaryOperator:
-  Enabled: false
-
-# Offense count: 1
-Style/NestedTernaryOperator:
-  Enabled: false
-
-# Offense count: 11
-# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
-Style/Next:
-  Enabled: false
-
-# Offense count: 53
+  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'
+
+# Offense count: 69
 # Cop supports --auto-correct.
 Style/NumericLiterals:
   MinDigits: 11
 
 # Offense count: 42
-Style/OneLineConditional:
-  Enabled: false
-
-# Offense count: 2
-Style/OpMethod:
-  Enabled: false
-
-# Offense count: 44
 # Cop supports --auto-correct.
 Style/PerlBackrefs:
-  Enabled: false
+  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'
 
 # Offense count: 8
 # Configuration parameters: NamePrefix, NamePrefixBlacklist.
 Style/PredicateName:
-  Enabled: false
-
-# Offense count: 95
+  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: 97
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/RaiseArgs:
   Enabled: false
 
-# Offense count: 11
-Style/RegexpLiteral:
-  MaxSlashes: 5
-
 # Offense count: 2
 Style/RescueModifier:
-  Enabled: false
-
-# Offense count: 25
-# Configuration parameters: AllowAsExpressionSeparator.
-Style/Semicolon:
-  Enabled: false
-
-# Offense count: 4
-# Configuration parameters: Methods.
-Style/SingleLineBlockParams:
-  Enabled: false
-
-# Offense count: 6639
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
-  Enabled: false
+  Exclude:
+    - 'app/helpers/browse_helper.rb'
 
 # Offense count: 8
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/StringLiteralsInInterpolation:
   Enabled: false
-
-# Offense count: 1
-Style/StructInheritance:
-  Enabled: false
-
-# Offense count: 3
-# Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, Whitelist.
-Style/TrivialAccessors:
-  Enabled: false
-
-# Offense count: 10
-Style/UnlessElse:
-  Enabled: false
-
-# Offense count: 2
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/VariableName:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: MaxLineLength.
-Style/WhileUntilModifier:
-  Enabled: false