Fix offences and added test (#425)

* Fixed some offenses
* Added test.

Author: ryanfox1985

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-12-14 23:38:08 +0100 using RuboCop version 0.46.0.
+# on 2016-12-15 16:54:50 +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,14 +36,6 @@ Lint/AssignmentInCondition:
     - 'lib/annotate/annotate_models.rb'
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: AlignWith, SupportedStyles.
-# SupportedStyles: either, start_of_block, start_of_line
-Lint/BlockAlignment:
-  Exclude:
-    - 'spec/annotate/annotate_models_spec.rb'
-
 # Offense count: 6
 # Cop supports --auto-correct.
 Lint/DeprecatedClassMethods:
@@ -60,24 +52,15 @@ Lint/DuplicateMethods:
   Exclude:
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AlignWith, SupportedStyles, AutoCorrect.
-# SupportedStyles: keyword, variable, start_of_line
-Lint/EndAlignment:
-  Exclude:
-    - 'lib/annotate.rb'
-
 # Offense count: 1
 Lint/HandleExceptions:
   Exclude:
     - 'bin/annotate'
 
-# Offense count: 9
+# Offense count: 8
 Lint/IneffectiveAccessModifier:
   Exclude:
     - 'lib/annotate/annotate_routes.rb'
-    - 'spec/integration/common_validation.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -87,12 +70,10 @@ Lint/InheritException:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 8
+# Offense count: 5
 Lint/RescueException:
   Exclude:
     - 'Rakefile'
-    - 'bin/annotate'
-    - 'lib/annotate.rb'
     - 'lib/annotate/annotate_models.rb'
 
 # Offense count: 1
@@ -107,12 +88,11 @@ Lint/UnusedBlockArgument:
   Exclude:
     - 'bin/annotate'
 
-# Offense count: 2
+# Offense count: 1
 # Configuration parameters: ContextCreatingMethods.
 Lint/UselessAccessModifier:
   Exclude:
     - 'lib/annotate/annotate_routes.rb'
-    - 'spec/integration/common_validation.rb'
 
 # Offense count: 16
 Metrics/AbcSize:
@@ -131,7 +111,7 @@ Metrics/BlockNesting:
 Metrics/CyclomaticComplexity:
   Max: 36
 
-# Offense count: 347
+# Offense count: 334
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
@@ -153,9 +133,7 @@ Style/AccessorMethodName:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: with_first_parameter, with_fixed_indentation
-Style/AlignParameters:
+Style/AlignArray:
   Exclude:
     - 'spec/annotate/annotate_models_spec.rb'
 
@@ -167,7 +145,7 @@ Style/BarePercentLiterals:
   Exclude:
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
 
-# Offense count: 8
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining
@@ -177,15 +155,13 @@ Style/BarePercentLiterals:
 Style/BlockDelimiters:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
-    - 'spec/annotate/annotate_models_spec.rb'
 
-# Offense count: 4
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: braces, no_braces, context_dependent
 Style/BracesAroundHashParameters:
   Exclude:
-    - 'bin/annotate'
     - 'spec/integration/rails_4.1.1/lib/tasks/auto_annotate_models.rake'
     - 'spec/integration/rails_4.2.0/lib/tasks/auto_annotate_models.rake'
     - 'spec/integration/standalone/config/init.rb'
@@ -229,12 +205,6 @@ Style/ClassVars:
   Exclude:
     - 'lib/tasks/migrate.rake'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/ClosingParenthesisIndentation:
-  Exclude:
-    - 'spec/annotate/annotate_models_spec.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: Keywords.
@@ -264,14 +234,13 @@ Style/Documentation:
     - 'lib/generators/annotate/install_generator.rb'
     - 'lib/tasks/migrate.rake'
 
-# Offense count: 11
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: leading, trailing
 Style/DotPosition:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
-    - 'spec/integration/common_validation.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -286,14 +255,12 @@ Style/EmptyLinesAroundAccessModifier:
   Exclude:
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
 
-# Offense count: 8
+# Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: empty_lines, no_empty_lines
 Style/EmptyLinesAroundBlockBody:
   Exclude:
-    - 'bin/annotate'
-    - 'spec/annotate/annotate_models_spec.rb'
     - 'spec/integration/rails_2.3_with_bundler/db/schema.rb'
     - 'spec/integration/rails_4.1.1/db/schema.rb'
     - 'spec/integration/rails_4.2.0/db/schema.rb'
@@ -340,7 +307,7 @@ Style/GuardClause:
     - 'lib/tasks/migrate.rake'
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
 
-# Offense count: 76
+# Offense count: 58
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
@@ -354,15 +321,14 @@ Style/IfUnlessModifier:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 32
+# Offense count: 6
 # 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'
-    - 'spec/annotate/annotate_models_spec.rb'
 
 # Offense count: 6
 # Cop supports --auto-correct.
@@ -371,13 +337,12 @@ Style/IndentArray:
 Style/IndentHash:
   EnforcedStyle: consistent
 
-# Offense count: 7
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: normal, rails
 Style/IndentationConsistency:
   Exclude:
-    - 'spec/annotate/annotate_models_spec.rb'
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
 
 # Offense count: 4
@@ -390,7 +355,7 @@ 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: 3
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
@@ -410,14 +375,6 @@ Style/MultilineBlockChain:
     - 'lib/annotate/annotate_models.rb'
     - 'spec/spec_helper.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: symmetrical, new_line, same_line
-Style/MultilineMethodCallBraceLayout:
-  Exclude:
-    - 'spec/annotate/annotate_models_spec.rb'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
@@ -443,12 +400,11 @@ Style/MutableConstant:
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
     - 'spec/integration/rails_2.3_with_bundler/config/environment.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 Style/NegatedIf:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
-    - 'spec/integration/integration_spec.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -485,20 +441,12 @@ Style/ParallelAssignment:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowSafeAssignment.
-Style/ParenthesesAroundCondition:
-  Exclude:
-    - 'bin/annotate'
-
-# Offense count: 7
+# Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Exclude:
     - 'annotate.gemspec'
-    - 'spec/integration/common_validation.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -526,16 +474,13 @@ Style/RedundantParentheses:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 6
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
     - 'lib/annotate/annotate_routes.rb'
-    - 'spec/annotate/annotate_models_spec.rb'
-    - 'spec/integration/common_validation.rb'
-    - 'spec/integration/rails_3.2.8.rb'
 
 # Offense count: 3
 # Cop supports --auto-correct.
@@ -561,16 +506,15 @@ Style/RescueModifier:
     - 'lib/annotate/annotate_models.rb'
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
 
-# Offense count: 3
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: AllowAsExpressionSeparator.
 Style/Semicolon:
   Exclude:
     - 'bin/annotate'
-    - 'spec/annotate/annotate_models_spec.rb'
     - 'spec/integration/rails_2.3_with_bundler/config/initializers/unified_initializer.rb'
 
-# Offense count: 19
+# Offense count: 13
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: space, no_space
@@ -580,12 +524,10 @@ Style/SpaceAroundEqualsInParameterDefault:
     - 'lib/annotate/annotate_routes.rb'
     - 'spec/integration/common_validation.rb'
 
-# Offense count: 16
+# Offense count: 9
 # Cop supports --auto-correct.
 Style/SpaceAroundKeyword:
   Exclude:
-    - 'spec/integration/common_validation.rb'
-    - 'spec/integration/integration_spec.rb'
     - 'spec/integration/rails_2.3_with_bundler/Gemfile'
     - 'spec/integration/rails_3.2.2/Gemfile'
     - 'spec/integration/rails_3.2.8/Gemfile'
@@ -596,16 +538,14 @@ Style/SpaceAroundKeyword:
     - 'spec/integration/rails_4.2.0/Gemfile'
     - 'spec/integration/standalone/Gemfile'
 
-# Offense count: 13
+# Offense count: 11
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment.
 Style/SpaceAroundOperators:
   Exclude:
-    - 'bin/annotate'
     - 'lib/annotate/annotate_models.rb'
     - 'lib/tasks/annotate_models.rake'
     - 'lib/tasks/annotate_routes.rake'
-    - 'spec/integration/integration_spec.rb'
 
 # Offense count: 6
 # Cop supports --auto-correct.
@@ -635,13 +575,12 @@ Style/SpaceInsideBrackets:
   Exclude:
     - 'spec/integration/rails_2.3_with_bundler/config/environment.rb'
 
-# Offense count: 6
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
 # SupportedStyles: space, no_space, compact
 Style/SpaceInsideHashLiteralBraces:
   Exclude:
-    - 'bin/annotate'
     - 'lib/tasks/annotate_models.rake'
 
 # Offense count: 4
@@ -658,15 +597,7 @@ Style/SpaceInsideStringInterpolation:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: use_perl_names, use_english_names
-Style/SpecialGlobalVars:
-  Exclude:
-    - 'bin/annotate'
-
-# Offense count: 266
+# Offense count: 252
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
@@ -707,7 +638,7 @@ Style/TrailingBlankLines:
     - 'spec/integration/rails_4.2.0/app/models/task_observer.rb'
     - 'spec/integration/rails_4.2.0/config/initializers/cookies_serializer.rb'
 
-# Offense count: 11
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
 # SupportedStyles: comma, consistent_comma, no_comma
@@ -730,10 +661,9 @@ Style/UnneededInterpolation:
     - 'bin/annotate'
     - 'lib/annotate/annotate_routes.rb'
 
-# Offense count: 9
+# Offense count: 8
 # Cop supports --auto-correct.
 Style/UnneededPercentQ:
   Exclude:
     - 'annotate.gemspec'
-    - 'spec/integration/common_validation.rb'
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'