rubocop 0.32.1 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce6b65d33cc2aafc8810c0ff7dd711bfd4f1ce3d
-  data.tar.gz: 619b13298973e7c421fa8cc804a9a8c8671c508d
+  metadata.gz: 948d87ff6bb72ea91804494d73ebebad2c839195
+  data.tar.gz: 37dae007c0ba3c9dec6f0e7d98fe9e8446762889
 SHA512:
-  metadata.gz: 00cd718d6abd4ab32394abbb2c0768d27ffcaeecf368ff406c5dac3b73d687dc5ad7610464bba315477620e22d8e6eec0a48f6518e1bb7d43331ef75c38e06c2
-  data.tar.gz: f4ec724f81671c10cfc980b2cd99ad39c59f40d41ea3ce8f6267020f01a3f2918b35725a46c0ac84b778e3590d4026a5cfd9fa773c03b69fdaaa297d8dabe86d
+  metadata.gz: 063bfc76a95e6bc6e585f75c4a7a23c40459317f0c78549ae98444aa4a8b5280353f9fada35ad7e267f52a95c1b705385c7a8d189e550916ef99dd391d21dbf0
+  data.tar.gz: b8537a85f221b320271a8d021c8bb49d09a85a3a6c4af0714c2e1a20de9b9f1be9229a1574ee5bb8689e09a0e9b72a0b6f3e3af21dadfe204648147013431fb4

data/CHANGELOG.md

@@ -2,6 +2,53 @@
 
 ## master (unreleased)
 
+## 0.33.0 (05/08/2015)
+
+### New features
+
+* [#2081](https://github.com/bbatsov/rubocop/pull/2081): New cop `Style/Send` checks for the use of `send` and instead encourages changing it to `BasicObject#__send__` or `Object#public_send` (disabled by default). ([@syndbg][])
+* [#2057](https://github.com/bbatsov/rubocop/pull/2057): New cop `Lint/FormatParameterMismatch` checks for a mismatch between the number of fields expected in format/sprintf/% and what was pased to it. ([@edmz][])
+* [#2010](https://github.com/bbatsov/rubocop/pull/2010): Add `space` style for SpaceInsideStringInterpolation. ([@gotrevor][])
+* [#2007](https://github.com/bbatsov/rubocop/pull/2007): Allow any modifier before `def`, not only visibility modifiers. ([@fphilipe][])
+* [#1980](https://github.com/bbatsov/rubocop/pull/1980): `--auto-gen-config` now outputs an excluded files list for failed cops (up to a maxiumum of 15 files). ([@bmorrall][])
+* [#2004](https://github.com/bbatsov/rubocop/pull/2004): Introduced `--exclude-limit COUNT` to configure how many files `--auto-gen-config` will exclude. ([@awwaiid][], [@jonas054][])
+* [#1918](https://github.com/bbatsov/rubocop/issues/1918): New configuration parameter `AllCops:DisabledByDefault` when set to `true` makes only cops found in user configuration enabled, which makes cop selection *opt-in*. ([@jonas054][])
+* New cop `Performance/StringReplacement` checks for usages of `gsub` that can be replaced with `tr` or `delete`. ([@rrosenblum][])
+* [#2001](https://github.com/bbatsov/rubocop/issues/2001): New cop `Style/InitialIndentation` checks for indentation of the first non-blank non-comment line in a file. ([@jonas054][])
+* [#2060](https://github.com/bbatsov/rubocop/issues/2060): New cop `Style/RescueEnsureAlignment` checks for bad alignment of `rescue` and `ensure` keywords. ([@lumeet][])
+* New cop `Style/OptionalArguments` checks for optional arguments that do not appear at the end of an argument list. ([@rrosenblum][])
+* New cop `Lint/CircularArgumentReference` checks for "circular argument references" in keyword arguments, which Ruby 2.2 warns against. ([@maxjacobson][], [@sliuu][])
+* [#2030](https://github.com/bbatsov/rubocop/issues/2030): New cop `Lint/OptionHash` checks for option hashes and encourages changing them to keyword arguments (disabled by default). ([@maxjacobson][])
+
+### Changes
+
+* [#2052](https://github.com/bbatsov/rubocop/pull/2052): `Style/RescueModifier` uses token stream to identify offenses. ([@urbanautomaton][])
+* Rename `Rails/Date` and `Rails/TimeZone` style names to "strict" and "flexible" and make "flexible" to be default. ([@palkan][])
+* [#2035](https://github.com/bbatsov/rubocop/issues/2035): `Style/ExtraSpacing` is now enabled by default and has a configuration parameter `AllowForAlignment` that is `true` by default, making it allow extra spacing if it's used for alignment purposes. ([@jonas054][])
+
+### Bugs fixed
+
+* [#2014](https://github.com/bbatsov/rubocop/pull/2014): Fix `Style/TrivialAccessors` to support AllowPredicates: false. ([@gotrevor][])
+* [#1988](https://github.com/bbatsov/rubocop/issues/1988): Fix bug in `Style/ParallelAssignment` when assigning from `Module::CONSTANT`. ([@rrosenblum][])
+* [#1995](https://github.com/bbatsov/rubocop/pull/1995): Improve message for `Rails/TimeZone`. ([@palkan][])
+* [#1977](https://github.com/bbatsov/rubocop/issues/1977): Fix bugs in `Rails/Date` and `Rails/TimeZone` when using namespaced Time/Date. ([@palkan][])
+* [#1973](https://github.com/bbatsov/rubocop/issues/1973): Do not register an offense in `Performance/Detect` when `select` is called on `Enumerable::Lazy`. ([@palkan][])
+* [#2015](https://github.com/bbatsov/rubocop/issues/2015): Fix bug occurring for auto-correction of a misaligned `end` in a file with only one method. ([@jonas054][])
+* Allow string interpolation segments inside single quoted string literals when double quotes are preferred. ([@segiddins][])
+* [#2026](https://github.com/bbatsov/rubocop/issues/2026): Allow `Time.current` when style is "acceptable".([@palkan][])
+* [#2029](https://github.com/bbatsov/rubocop/issues/2029): Fix bug where `Style/RedundantReturn` auto-corrects returning implicit hashes to invalid syntax. ([@rrosenblum][])
+* [#2021](https://github.com/bbatsov/rubocop/issues/2021): Fix bug in `Style/BlockDelimiters` when a `semantic` expression is used in an array or a range. ([@lumeet][])
+* [#1992](https://github.com/bbatsov/rubocop/issues/1992): Allow parentheses in assignment to a variable with the same name as the method's in `Style/MethodCallParentheses`. ([@lumeet][])
+* [#2045](https://github.com/bbatsov/rubocop/issues/2045): Fix crash in `Style/IndentationWidth` when using `private_class_method def self.foo` syntax. ([@unmanbearpig][])
+* [#2006](https://github.com/bbatsov/rubocop/issues/2006): Fix crash in `Style/FirstParameterIndentation` in case of nested offenses. ([@unmanbearpig][])
+* [#2059](https://github.com/bbatsov/rubocop/issues/2059): Don't check for trivial accessors in modules. ([@bbatsov][])
+* Add proper punctuation to the end of offense messages, where it is missing. ([@lumeet][])
+* [#2071](https://github.com/bbatsov/rubocop/pull/2071): Keep line breaks in place on WordArray autocorrect.([@unmanbearpig][])
+* [#2075](https://github.com/bbatsov/rubocop/pull/2075): Properly correct `Style/PercentLiteralDelimiters` with escape characters in them. ([@rrosenblum][])
+* [#2023](https://github.com/bbatsov/rubocop/issues/2023): Avoid auto-correction corruption in `IndentationWidth`. ([@jonas054][])
+* [#2080](https://github.com/bbatsov/rubocop/issues/2080): Properly parse code in `Performance/Count` when calling `select..count` in a class that extends an enumerable. ([@rrosenblum][])
+* [#2093](https://github.com/bbatsov/rubocop/issues/2093): Fix bug in `Style/OneLineConditional` which should not raise an offense with an 'if/then/end' statement. ([@sliuu][])
+
 ## 0.32.1 (24/06/2015)
 
 ### New features
@@ -1467,3 +1514,14 @@
 [@matugm]: https://github.com/matugm
 [@m1foley]: https://github.com/m1foley
 [@tejasbubane]: https://github.com/tejasbubane
+[@bmorrall]: https://github.com/bmorrall
+[@fphilipe]: https://github.com/fphilipe
+[@gotrevor]: https://github.com/gotrevor
+[@awwaiid]: https://github.com/awwaiid
+[@segiddins]: https://github.com/segiddins
+[@urbanautomaton]: https://github.com/urbanautomaton.com
+[@unmanbearpig]: https://github.com/unmanbearpig
+[@maxjacobson]: https://github.com/maxjacobson
+[@sliuu]: https://github.com/sliuu
+[@edmz]: https://github.com/edmz
+[@syndbg]: https://github.com/syndbg

data/README.md

@@ -173,6 +173,7 @@ Command flag              | Description
 `--only`                  | Run only the specified cop(s) and/or cops in the specified departments.
 `--except`                | Run all cops enabled by configuration except the specified cop(s) and/or departments.
 `--auto-gen-config`       | Generate a configuration file acting as a TODO list.
+`--exclude-limit`         | Limit how many individual files `--auto-gen-config` can list in `Exclude` parameters, default is 15.
 `--show-cops`             | Shows available cops and their configuration.
 `--fail-level`            | Minimum [severity](#severity) for exit with error code. Full severity name or upper case initial can be given. Normally, auto-corrected offenses are ignored. Use `A` or `autocorrect` if you'd like them to trigger failure.
 
@@ -368,6 +369,15 @@ Metrics/LineLength:
   Enabled: false
 ```
 
+Most cops are enabled by default. Some cops, configured in [config/disabled.yml](https://github.com/bbatsov/rubocop/blob/master/config/disabled.yml), are disabled by default. The cop enabling process can be altered by setting `DisabledByDefault` to `true`.
+
+```yaml
+AllCops:
+  DisabledByDefault: true
+```
+
+All cops are then disabled by default, and only cops appearing in user configuration files are enabled. `Enabled: true` does not have to be set for cops in user configuration. They will be enabled anyway.
+
 #### Severity
 
 Each cop has a default severity level based on which department it belongs
@@ -400,10 +410,18 @@ Style/PerlBackrefs:
 If you have a code base with an overwhelming amount of offenses, it can
 be a good idea to use `rubocop --auto-gen-config` and add an
 `inherit_from: .rubocop_todo.yml` in your `.rubocop.yml`. The generated
-file `.rubocop_todo.yml` contains configuration to disable all cops that
-currently detect an offense in the code. Then you can start removing the
-entries in the generated file one by one as you work through all the
-offenses in the code.
+file `.rubocop_todo.yml` contains configuration to disable cops that
+currently detect an offense in the code by excluding the offending
+files, or disabling the cop altogether once a file count limit has been
+reached.
+
+By adding the option `--exclude-limit COUNT`, e.g., `rubocop
+--auto-gen-config --exclude-limit 5`, you can change how many files are
+excluded before the cop is entirely disabled. The default COUNT is 15.
+
+Then you can start removing the entries in the generated
+`.rubocop_todo.yml` file one by one as you work through all the offenses
+in the code.
 
 ## Disabling Cops within Source Code
 

data/config/default.yml

@@ -42,6 +42,13 @@ AllCops:
   # default. Change behavior by overriding StyleGuideCopsOnly, or by giving
   # the --only-guide-cops option.
   StyleGuideCopsOnly: false
+  # All cops except the ones in disabled.yml are enabled by default. Change
+  # this behavior by overriding DisabledByDefault. When DisabledByDefault is
+  # true, all cops in the default configuration are disabled, and and only cops
+  # in user configuration are enabled. This makes cops opt-in instead of
+  # opt-out. Note that when DisabledByDefault is true, cops in user
+  # configuration will be enabled even if they don't set the Enabled parameter.
+  DisabledByDefault: false
 
 # Indent private/protected/public as deep as method definitions
 Style/AccessModifierIndentation:
@@ -376,6 +383,12 @@ Style/Encoding:
     - always
   AutoCorrectEncodingComment: '# encoding: utf-8'
 
+Style/ExtraSpacing:
+  # When true, allows most uses of extra spacing if the intent is to align
+  # things with the previous or next line, not counting empty lines or comment
+  # lines.
+  AllowForAlignment: true
+
 Style/FileName:
   # File names listed in AllCops:Include are excluded by default. Add extra
   # excludes here.
@@ -643,6 +656,12 @@ Style/SpaceInsideHashLiteralBraces:
     - space
     - no_space
 
+Style/SpaceInsideStringInterpolation:
+  EnforcedStyle: no_space
+  SupportedStyles:
+    - space
+    - no_space
+
 Style/SymbolProc:
   # A list of method names to be ignored by the check.
   # The names should be fairly unique, otherwise you'll end up ignoring lots of code.
@@ -805,15 +824,15 @@ Rails/ActionFilter:
     - app/controllers/**/*.rb
 
 Rails/Date:
-  # The value `always` disallows usage of `Date.today`, `Date.current`,
+  # The value `strict` disallows usage of `Date.today`, `Date.current`,
   # `Date#to_time` etc.
-  # The value `acceptable` allows usage of `Date.current`, `Date.yesterday`, etc
+  # The value `flexible` allows usage of `Date.current`, `Date.yesterday`, etc
   # (but not `Date.today`) which are overriden by ActiveSupport to handle current
   # time zone.
-  EnforcedStyle: always
+  EnforcedStyle: flexible
   SupportedStyles:
-    - always
-    - acceptable
+    - strict
+    - flexible
 
 Rails/DefaultScope:
   Include:
@@ -847,12 +866,12 @@ Rails/ScopeArgs:
     - app/models/**/*.rb
 
 Rails/TimeZone:
-  # The value `always` means that `Time` should be used with `zone`.
-  # The value `acceptable` allows usage of `in_time_zone` instead of `zone`.
-  EnforcedStyle: always
+  # The value `strict` means that `Time` should be used with `zone`.
+  # The value `flexible` allows usage of `in_time_zone` instead of `zone`.
+  EnforcedStyle: flexible
   SupportedStyles:
-    - always
-    - acceptable
+    - strict
+    - flexible
 
 Rails/Validation:
   Include:

data/config/disabled.yml

@@ -44,15 +44,19 @@ Style/MissingElse:
     - case
     - both
 
+Style/OptionHash:
+  Description: "Don't use option hashes when you can use keyword arguments."
+
+Style/Send:
+  Description: 'Prefer `Object#__send__` or `Object#public_send` to `send`, as `send` may overlap with existing methods.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#prefer-public-send'
+  Enabled: false
+
 Style/SymbolArray:
   Description: 'Use %i or %I for arrays of symbols.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-i'
   Enabled: false
 
-Style/ExtraSpacing:
-  Description: 'Do not use unnecessary spacing.'
-  Enabled: false
-
 Lint/LiteralInInterpolation:
   Description: 'Avoid interpolating literals in strings'
   AutoCorrect: false

data/config/enabled.yml

@@ -243,11 +243,20 @@ Style/EvenOdd:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#predicate-methods'
   Enabled: true
 
+Style/ExtraSpacing:
+  Description: 'Do not use unnecessary spacing.'
+  Enabled: true
+
 Style/FileName:
   Description: 'Use snake_case for source file names.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#snake-case-files'
   Enabled: true
 
+Style/InitialIndentation:
+  Description: >-
+    Checks the indentation of the first non-blank non-comment line in a file.
+  Enabled: true
+
 Style/FirstParameterIndentation:
   Description: 'Checks the indentation of the first parameter in a method call.'
   Enabled: true
@@ -447,6 +456,13 @@ Style/OpMethod:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#other-arg'
   Enabled: true
 
+Style/OptionalArguments:
+  Description: >-
+                 Checks for optional arguments that do not appear at the end
+                 of the argument list
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#optional-arguments'
+  Enabled: true
+
 Style/ParallelAssignment:
   Description: >-
                   Check for simple usages of parallel assignment.
@@ -518,6 +534,10 @@ Style/RegexpLiteral:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-r'
   Enabled: true
 
+Style/RescueEnsureAlignment:
+  Description: 'Align rescues and ensures correctly.'
+  Enabled: true
+
 Style/RescueModifier:
   Description: 'Avoid using rescue in its modifier form.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-rescue-modifiers'
@@ -844,6 +864,10 @@ Lint/BlockAlignment:
   Description: 'Align block ends correctly.'
   Enabled: true
 
+Lint/CircularArgumentReference:
+  Description: "Don't refer to the keyword argument in the default value."
+  Enabled: true
+
 Lint/ConditionPosition:
   Description: >-
                  Checks for condition placed in a confusing position relative to
@@ -900,6 +924,10 @@ Lint/Eval:
   Description: 'The use of eval represents a serious security risk.'
   Enabled: true
 
+Lint/FormatParameterMismatch:
+  Description: 'The number of parameters to format/sprint must match the fields.'
+  Enabled: true  
+
 Lint/HandleExceptions:
   Description: "Don't suppress exception."
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions'
@@ -975,7 +1003,10 @@ Lint/UnderscorePrefixedVariableName:
   Enabled: true
 
 Lint/UnneededDisable:
-  Description: 'Checks for rubocop:disable comments that can be removed.'
+  Description: >-
+                 Checks for rubocop:disable comments that can be removed.
+                 Note: this cop is not disabled when disabling all cops.
+                 It must be explicitly disabled.
   Enabled: true
 
 Lint/UnusedBlockArgument:
@@ -1065,6 +1096,14 @@ Performance/Size:
   Reference: 'https://github.com/JuanitoFatas/fast-ruby#arraycount-vs-arraysize-code'
   Enabled: true
 
+Performance/StringReplacement:
+  Description: >-
+                  Use `tr` instead of `gsub` when you are replacing the same
+                  number of characters. Use `delete` instead of `gsub` when
+                  you are deleting characters.
+  Reference: 'https://github.com/JuanitoFatas/fast-ruby#stringgsub-vs-stringtr-code'
+  Enabled: true
+
 ##################### Rails ##################################
 
 Rails/ActionFilter:

data/lib/rubocop.rb

@@ -72,6 +72,7 @@ require 'rubocop/cop/lint/ambiguous_operator'
 require 'rubocop/cop/lint/ambiguous_regexp_literal'
 require 'rubocop/cop/lint/assignment_in_condition'
 require 'rubocop/cop/lint/block_alignment'
+require 'rubocop/cop/lint/circular_argument_reference'
 require 'rubocop/cop/lint/condition_position'
 require 'rubocop/cop/lint/debugger'
 require 'rubocop/cop/lint/def_end_alignment'
@@ -85,6 +86,7 @@ require 'rubocop/cop/lint/end_alignment'
 require 'rubocop/cop/lint/end_in_method'
 require 'rubocop/cop/lint/ensure_return'
 require 'rubocop/cop/lint/eval'
+require 'rubocop/cop/lint/format_parameter_mismatch'
 require 'rubocop/cop/lint/handle_exceptions'
 require 'rubocop/cop/lint/invalid_character_literal'
 require 'rubocop/cop/lint/literal_in_condition'
@@ -127,6 +129,7 @@ require 'rubocop/cop/performance/flat_map'
 require 'rubocop/cop/performance/reverse_each'
 require 'rubocop/cop/performance/sample'
 require 'rubocop/cop/performance/size'
+require 'rubocop/cop/performance/string_replacement'
 
 require 'rubocop/cop/style/access_modifier_indentation'
 require 'rubocop/cop/style/accessor_method_name'
@@ -199,6 +202,7 @@ require 'rubocop/cop/style/indent_hash'
 require 'rubocop/cop/style/indentation_consistency'
 require 'rubocop/cop/style/indentation_width'
 require 'rubocop/cop/style/infinite_loop'
+require 'rubocop/cop/style/initial_indentation'
 require 'rubocop/cop/style/inline_comment'
 require 'rubocop/cop/style/lambda'
 require 'rubocop/cop/style/lambda_call'
@@ -224,6 +228,8 @@ require 'rubocop/cop/style/not'
 require 'rubocop/cop/style/numeric_literals'
 require 'rubocop/cop/style/one_line_conditional'
 require 'rubocop/cop/style/op_method'
+require 'rubocop/cop/style/optional_arguments'
+require 'rubocop/cop/style/option_hash'
 require 'rubocop/cop/style/parallel_assignment'
 require 'rubocop/cop/style/parentheses_around_condition'
 require 'rubocop/cop/style/percent_literal_delimiters'
@@ -237,9 +243,11 @@ require 'rubocop/cop/style/redundant_exception'
 require 'rubocop/cop/style/redundant_return'
 require 'rubocop/cop/style/redundant_self'
 require 'rubocop/cop/style/regexp_literal'
+require 'rubocop/cop/style/rescue_ensure_alignment'
 require 'rubocop/cop/style/rescue_modifier'
 require 'rubocop/cop/style/self_assignment'
 require 'rubocop/cop/style/semicolon'
+require 'rubocop/cop/style/send'
 require 'rubocop/cop/style/signal_exception'
 require 'rubocop/cop/style/single_line_block_params'
 require 'rubocop/cop/style/single_line_methods'

data/lib/rubocop/cli.rb

@@ -53,6 +53,7 @@ module RuboCop
 
       ConfigLoader.debug = @options[:debug]
       ConfigLoader.auto_gen_config = @options[:auto_gen_config]
+      ConfigLoader.exclude_limit = @options[:exclude_limit]
 
       @config_store.options_config = @options[:config] if @options[:config]
 

data/lib/rubocop/config_loader.rb

@@ -16,7 +16,7 @@ module RuboCop
     AUTO_GENERATED_FILE = '.rubocop_todo.yml'
 
     class << self
-      attr_accessor :debug, :auto_gen_config
+      attr_accessor :debug, :auto_gen_config, :exclude_limit
       attr_writer :root_level # The upwards search is stopped at this level.
 
       alias_method :debug?, :debug
@@ -100,12 +100,33 @@ module RuboCop
                                    end
       end
 
+      # Merges the given configuration with the default one. If
+      # AllCops:DisabledByDefault is true, it changes the Enabled params so
+      # that only cops from user configuration are enabled.
       def merge_with_default(config, config_file)
-        Config.new(merge(default_configuration, config), config_file)
+        configs =
+          if config.key?('AllCops') && config['AllCops']['DisabledByDefault']
+            disabled_default = transform(default_configuration) do |params|
+              params.merge('Enabled' => false) # Overwrite with false.
+            end
+            enabled_user_config = transform(config) do |params|
+              { 'Enabled' => true }.merge(params) # Set true if not set.
+            end
+            [disabled_default, enabled_user_config]
+          else
+            [default_configuration, config]
+          end
+        Config.new(merge(configs.first, configs.last), config_file)
       end
 
       private
 
+      # Returns a new hash where the parameters of the given config hash have
+      # been replaced by parmeters returned by the given block.
+      def transform(config)
+        Hash[config.map { |cop, params| [cop, yield(params)] }]
+      end
+
       def load_yaml_configuration(absolute_path)
         yaml_code = IO.read(absolute_path)
         # At one time, there was a problem with the psych YAML engine under

data/lib/rubocop/cop/lint/block_alignment.rb

@@ -14,7 +14,7 @@ module RuboCop
       class BlockAlignment < Cop
         include CheckAssignment
 
-        MSG = '`end` at %d, %d is not aligned with `%s` at %d, %d%s'
+        MSG = '`end` at %d, %d is not aligned with `%s` at %d, %d%s.'
 
         def on_block(node)
           return if ignored_node?(node)

data/lib/rubocop/cop/lint/circular_argument_reference.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+
+module RuboCop
+  module Cop
+    module Lint
+      # This cop checks for circular argument references in keyword arguments.
+      #
+      # This cop mirrors a warning produced by MRI since 2.2.
+      #
+      # @example
+      #   def bake(pie: pie)
+      #     pie.heat_up
+      #   end
+      class CircularArgumentReference < Cop
+        MSG = 'Circular argument reference - `%s`.'
+
+        def on_kwoptarg(node)
+          arg_name, arg_value = *node
+          case arg_value.type
+          when :send
+            # Ruby 2.0 will have type send every time, and "send nil" if it is
+            # calling itself with a specified "self" receiver
+            receiver, name = *arg_value
+            return unless name == arg_name && receiver.nil?
+          when :lvar
+            # Ruby 2.2.2 will have type lvar if it is calling its own method
+            # without a specified "self"
+            return unless arg_value.to_a == [arg_name]
+          else
+            return
+          end
+
+          add_offense(arg_value, :expression, format(MSG, arg_name))
+        end
+      end
+    end
+  end
+end