Fixed some offenses 7. (#428)

Author: ryanfox1985

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-12-15 16:54:50 +0100 using RuboCop version 0.46.0.
+# on 2016-12-16 13:08:29 +0100 using RuboCop version 0.46.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
@@ -36,6 +36,14 @@ Lint/AssignmentInCondition:
     - 'lib/annotate/annotate_models.rb'
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AlignWith, SupportedStyles.
+# SupportedStyles: either, start_of_block, start_of_line
+Lint/BlockAlignment:
+  Exclude:
+    - 'lib/annotate/annotate_models.rb'
+
 # Offense count: 6
 # Cop supports --auto-correct.
 Lint/DeprecatedClassMethods:
@@ -70,11 +78,10 @@ Lint/InheritException:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 5
+# Offense count: 2
 Lint/RescueException:
   Exclude:
     - 'Rakefile'
-    - 'lib/annotate/annotate_models.rb'
 
 # Offense count: 1
 Lint/ShadowingOuterLocalVariable:
@@ -111,13 +118,13 @@ Metrics/BlockNesting:
 Metrics/CyclomaticComplexity:
   Max: 36
 
-# Offense count: 334
+# Offense count: 339
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 543
 
-# Offense count: 24
+# Offense count: 23
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 70
@@ -131,7 +138,7 @@ Style/AccessorMethodName:
   Exclude:
     - 'lib/annotate.rb'
 
-# Offense count: 1
+# Offense count: 3
 # Cop supports --auto-correct.
 Style/AlignArray:
   Exclude:
@@ -145,17 +152,6 @@ Style/BarePercentLiterals:
   Exclude:
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# IgnoredMethods: lambda, proc, it
-Style/BlockDelimiters:
-  Exclude:
-    - 'lib/annotate/annotate_models.rb'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -171,21 +167,12 @@ Style/CaseEquality:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep, IndentationWidth.
-# SupportedStyles: case, end
-Style/CaseIndentation:
-  Exclude:
-    - 'lib/annotate/annotate_models.rb'
-
-# Offense count: 15
+# Offense count: 14
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
     - 'lib/annotate/active_record_patch.rb'
-    - 'spec/annotate/annotate_models_spec.rb'
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
     - 'spec/integration/rails_2.3_with_bundler/test/test_helper.rb'
     - 'spec/integration/rails_3.2.2/test/test_helper.rb'
@@ -207,20 +194,11 @@ Style/ClassVars:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: Keywords.
-# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW
-Style/CommentAnnotation:
-  Exclude:
-    - 'spec/annotate/annotate_models_spec.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly.
 # SupportedStyles: assign_to_condition, assign_inside_condition
 Style/ConditionalAssignment:
   Exclude:
     - 'bin/annotate'
-    - 'lib/annotate/annotate_models.rb'
 
 # Offense count: 7
 Style/Documentation:
@@ -234,14 +212,6 @@ Style/Documentation:
     - 'lib/generators/annotate/install_generator.rb'
     - 'lib/tasks/migrate.rake'
 
-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: leading, trailing
-Style/DotPosition:
-  Exclude:
-    - 'lib/annotate/annotate_models.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/EmptyLines:
@@ -265,7 +235,7 @@ Style/EmptyLinesAroundBlockBody:
     - 'spec/integration/rails_4.1.1/db/schema.rb'
     - 'spec/integration/rails_4.2.0/db/schema.rb'
 
-# Offense count: 25
+# Offense count: 23
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
 Style/ExtraSpacing:
@@ -307,27 +277,19 @@ Style/GuardClause:
     - 'lib/tasks/migrate.rake'
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
 
-# Offense count: 58
+# Offense count: 57
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
 Style/HashSyntax:
   Enabled: false
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: MaxLineLength.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/annotate/annotate_models.rb'
-
-# Offense count: 6
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_brackets
 Style/IndentArray:
   Exclude:
-    - 'lib/annotate/annotate_models.rb'
     - 'lib/annotate/annotate_routes.rb'
 
 # Offense count: 6
@@ -355,14 +317,6 @@ Style/IndentationWidth:
     - 'spec/integration/rails_4.2.0/app/models/sub1/sub2/sub3/event.rb'
     - 'spec/integration/rails_4.2.0/app/models/task.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
-Style/MethodDefParentheses:
-  Exclude:
-    - 'spec/annotate/annotate_models_spec.rb'
-
 # Offense count: 1
 Style/MethodMissing:
   Exclude:
@@ -375,51 +329,28 @@ Style/MultilineBlockChain:
     - 'lib/annotate/annotate_models.rb'
     - 'spec/spec_helper.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: aligned, indented, indented_relative_to_receiver
-Style/MultilineMethodCallIndentation:
-  Exclude:
-    - 'lib/annotate/annotate_models.rb'
-
-# Offense count: 7
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
 # SupportedStyles: aligned, indented
 Style/MultilineOperationIndentation:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 11
+# Offense count: 3
 # Cop supports --auto-correct.
 Style/MutableConstant:
   Exclude:
-    - 'lib/annotate/annotate_models.rb'
     - 'lib/annotate/annotate_routes.rb'
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
     - 'spec/integration/rails_2.3_with_bundler/config/environment.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/NegatedIf:
-  Exclude:
-    - 'lib/annotate/annotate_models.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/NestedParenthesizedCalls:
   Exclude:
     - 'bin/annotate'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
-# SupportedStyles: skip_modifier_ifs, always
-Style/Next:
-  Exclude:
-    - 'lib/annotate/annotate_models.rb'
-
 # Offense count: 9
 # Cop supports --auto-correct.
 Style/NumericLiterals:
@@ -435,12 +366,6 @@ Style/NumericPredicate:
     - 'lib/annotate.rb'
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/ParallelAssignment:
-  Exclude:
-    - 'lib/annotate/annotate_models.rb'
-
 # Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
@@ -462,7 +387,7 @@ Style/RaiseArgs:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 Style/RedundantBegin:
   Exclude:
@@ -474,19 +399,17 @@ Style/RedundantParentheses:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:
   Exclude:
-    - 'lib/annotate/annotate_models.rb'
     - 'lib/annotate/annotate_routes.rb'
 
-# Offense count: 3
+# Offense count: 2
 # Cop supports --auto-correct.
 Style/RedundantSelf:
   Exclude:
-    - 'lib/annotate/annotate_models.rb'
     - 'lib/tasks/migrate.rake'
 
 # Offense count: 12
@@ -514,13 +437,12 @@ Style/Semicolon:
     - 'bin/annotate'
     - 'spec/integration/rails_2.3_with_bundler/config/initializers/unified_initializer.rb'
 
-# Offense count: 13
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: space, no_space
 Style/SpaceAroundEqualsInParameterDefault:
   Exclude:
-    - 'lib/annotate/annotate_models.rb'
     - 'lib/annotate/annotate_routes.rb'
     - 'spec/integration/common_validation.rb'
 
@@ -538,7 +460,7 @@ Style/SpaceAroundKeyword:
     - 'spec/integration/rails_4.2.0/Gemfile'
     - 'spec/integration/standalone/Gemfile'
 
-# Offense count: 11
+# Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment.
 Style/SpaceAroundOperators:
@@ -547,7 +469,7 @@ Style/SpaceAroundOperators:
     - 'lib/tasks/annotate_models.rake'
     - 'lib/tasks/annotate_routes.rake'
 
-# Offense count: 6
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: space, no_space
@@ -561,7 +483,7 @@ Style/SpaceBeforeComment:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 9
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
@@ -597,7 +519,7 @@ Style/SpaceInsideStringInterpolation:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 252
+# Offense count: 222
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes