rubocop-airbnb 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e5601cd8ff7b14b19b4bf38c802b4e1d687c322
-  data.tar.gz: fb2fca2fe9589451f8f7a1f35ba79372b0ee5b9a
+  metadata.gz: 9d17d320064046e37b313b570d8f4ab81f6b615b
+  data.tar.gz: 6dead3f9f8849866f8a57c4fc15bb5cb0f0d4176
 SHA512:
-  metadata.gz: 2862c58fce4d1f1048df2b58e28978fcb01a943d67339dd93e4175f019cc40757deb378b86e1c2a1c241844652e6d3fff8f75876246e4153bea1da77a1f018cd
-  data.tar.gz: 252c1280c4b61671975ff387b2b3ded22e55747b8125860ff3b37728ac6192716eb0c118db22cb34fc9ae046e5aec3d56ea74174339f1ea521f983b4f13cde0b
+  metadata.gz: 1f95f01b2d2bc692b651dbb364fcf5c5a4a17d4007b0ddc120d97ba3025dc314b091b1bb3b088d0f8182cc4cd9088548d794fedbd3a4702fff86632579fea9e7
+  data.tar.gz: 4fd9025bfd1273ed564071eadff4bf17ed416b56def7f24fe10598846b5988cbf9fbf23f2af57072c68c84ebaabae3250467860f1f8557db1cbc4e812bf6dfb5

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 3.0.0
+* Update to rubocop 0.76
+* Enable Rails/IgnoredSkipActionFilterOption
+* Enable Rails/ReflectionClassName
+* Disable and delete Airbnb/ClassName
+* Enable Layout/IndentFirstParameter
+* Drop support for Ruby 2.2
+
 # 2.0.0
 * Upgrade to rubocop-rspec 1.30.0, use ~> to allow for PATCH version flexibility
 * Upgrade to rubocop 0.58.0, use ~> to allow for PATCH version flexibility

data/README.md

@@ -15,6 +15,11 @@ Just put this in your `Gemfile` it depends on the appropriate version of rubocop
 gem 'rubocop-airbnb'
 ```
 
+Note: If you want to run with Ruby 2.2 you will need to set your version to 2
+```
+gem 'rubocop-airbnb', '~> 2'
+```
+
 ## Usage
 
 You need to tell RuboCop to load the Airbnb extension. There are three
@@ -29,7 +34,7 @@ require:
 ```
 
 Next add the following to `.rubocop.yml`
-or add before `.rubocop_todo.yml` in your existin `inherit_from`
+or add before `.rubocop_todo.yml` in your existing `inherit_from`
 
 ```
 inherit_from:

data/config/rubocop-airbnb.yml

@@ -2,11 +2,6 @@
 # They are custom built for use inside Airbnb and address issues that we have experienced in
 # testing and production.
 
-Airbnb/ClassName:
-  Description: Use :class_name => "Model" instead of :class_name => Model.name
-    to avoid a long cascade of autoloading.
-  Enabled: true
-
 Airbnb/ClassOrModuleDeclaredInWrongFile:
   Description: Declare a class or module in the file that matches its namespace and name.
   Enabled: true

data/config/rubocop-gemspec.yml

@@ -7,3 +7,6 @@ Gemspec/RequiredRubyVersion:
   Enabled: false
   Include:
     - '**/*.gemspec'
+
+Gemspec/RubyVersionGlobalsUsage:
+  Enabled: true

data/config/rubocop-layout.yml

@@ -227,7 +227,7 @@ Layout/FirstMethodParameterLineBreak:
   Enabled: false
 
 # Supports --auto-correct
-Layout/FirstParameterIndentation:
+Layout/IndentFirstArgument:
   Description: Checks the indentation of the first parameter in a method call.
   Enabled: true
   EnforcedStyle: consistent
@@ -238,7 +238,7 @@ Layout/FirstParameterIndentation:
   - special_for_inner_method_call_in_parentheses
 
 # Supports --auto-correct
-Layout/IndentArray:
+Layout/IndentFirstArrayElement:
   Description: Checks the indentation of the first element in an array literal.
   Enabled: true
   EnforcedStyle: consistent
@@ -248,10 +248,9 @@ Layout/IndentAssignment:
   Description: Checks the indentation of the first line of the right-hand-side of a
     multi-line assignment.
   Enabled: true
-  IndentationWidth:
 
 # Supports --auto-correct
-Layout/IndentHash:
+Layout/IndentFirstHashElement:
   Description: Checks the indentation of the first key in a hash literal.
   Enabled: true
   EnforcedStyle: consistent
@@ -344,7 +343,6 @@ Layout/MultilineMethodCallIndentation:
   SupportedStyles:
   - aligned
   - indented
-  IndentationWidth:
 
 Layout/MultilineMethodDefinitionBraceLayout:
   Description: >-
@@ -474,11 +472,6 @@ Layout/SpaceInsideBlockBraces:
   EnforcedStyleForEmptyBraces: no_space
   SpaceBeforeBlockParameters: true
 
-Layout/SpaceInsideParens:
-  Description: 'No spaces after ( or before ).'
-  StyleGuide: '#spaces-braces'
-  Enabled: true
-
 Layout/SpaceInsideArrayLiteralBrackets:
   EnforcedStyle: no_space
   SupportedStyles:
@@ -558,3 +551,6 @@ Layout/TrailingWhitespace:
   Description: Avoid trailing whitespace.
   StyleGuide: https://github.com/rubocop-hq/ruby-style-guide#no-trailing-whitespace
   Enabled: true
+
+Layout/IndentFirstParameter:
+  Enabled: true

data/config/rubocop-lint.yml

@@ -80,6 +80,11 @@ Lint/EnsureReturn:
 Lint/ErbNewArguments:
   Enabled: false
 
+Lint/FlipFlop:
+  Description: Checks for flip flops
+  StyleGuide: https://github.com/rubocop-hq/ruby-style-guide#no-flip-flops
+  Enabled: false
+
 Lint/FloatOutOfRange:
   Description: Catches floating-point literals too large or small for Ruby to represent.
   Enabled: false
@@ -237,20 +242,20 @@ Lint/UnderscorePrefixedVariableName:
 Lint/UnifiedInteger:
   Enabled: false
 
-Lint/UnneededCopDisableDirective:
+Lint/RedundantCopDisableDirective:
   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/UnneededCopEnableDirective:
+Lint/RedundantCopEnableDirective:
   Description: Checks for rubocop:enable comments that can be removed.
   Enabled: true
 
-Lint/UnneededRequireStatement:
+Lint/RedundantRequireStatement:
   Enabled: false
 
-Lint/UnneededSplatExpansion:
+Lint/RedundantSplatExpansion:
   Enabled: false
 
 Lint/UnreachableCode:

data/config/rubocop-naming.yml

@@ -83,3 +83,6 @@ Naming/VariableName:
 
 Naming/VariableNumber:
   Enabled: false
+
+Naming/RescuedExceptionsVariableName:
+  Enabled: false

data/config/rubocop-performance.yml

@@ -56,11 +56,6 @@ Performance/FlatMap:
 Performance/InefficientHashSearch:
   Enabled: false
 
-# Supports --auto-correct
-Performance/LstripRstrip:
-  Description: Use `strip` instead of `lstrip.rstrip`.
-  Enabled: false
-
 # Supports --auto-correct
 Performance/RangeInclude:
   Description: Use `Range#cover?` instead of `Range#include?`.
@@ -85,11 +80,6 @@ Performance/RedundantMerge:
   Reference: https://github.com/JuanitoFatas/fast-ruby#hashmerge-vs-hash-code
   Enabled: false
 
-# Supports --auto-correct
-Performance/RedundantSortBy:
-  Description: Use `sort` instead of `sort_by { |x| x }`.
-  Enabled: false
-
 Performance/RegexpMatch:
   Enabled: false
 
@@ -99,12 +89,6 @@ Performance/ReverseEach:
   Reference: https://github.com/JuanitoFatas/fast-ruby#enumerablereverseeach-vs-enumerablereverse_each-code
   Enabled: false
 
-# Supports --auto-correct
-Performance/Sample:
-  Description: Use `sample` instead of `shuffle.first`, `shuffle.last`, and `shuffle[Fixnum]`.
-  Reference: https://github.com/JuanitoFatas/fast-ruby#arrayshufflefirst-vs-arraysample-code
-  Enabled: false
-
 # Supports --auto-correct
 Performance/Size:
   Description: Use `size` instead of `count` for counting the number of elements in
@@ -133,9 +117,6 @@ Performance/TimesMap:
 Performance/UnfreezeString:
   Enabled: false
 
-Performance/UnneededSort:
-  Enabled: false
-
 Performance/UriDefaultParser:
   Enabled: false
 

data/config/rubocop-rails.yml

@@ -206,3 +206,9 @@ Rails/Validation:
   Enabled: false
   Include:
   - app/models/**/*.rb
+
+Rails/IgnoredSkipActionFilterOption:
+  Enabled: true
+
+Rails/ReflectionClassName:
+  Enabled: true

data/config/rubocop-style.yml

@@ -328,11 +328,6 @@ Style/ExpandPathArguments:
   Description: "Use `expand_path(__dir__)` instead of `expand_path('..', __FILE__)`."
   Enabled: false
 
-Style/FlipFlop:
-  Description: Checks for flip flops
-  StyleGuide: https://github.com/rubocop-hq/ruby-style-guide#no-flip-flops
-  Enabled: false
-
 Style/For:
   Description: Checks use of for or each in multiline loops.
   StyleGuide: https://github.com/rubocop-hq/ruby-style-guide#no-for-loops
@@ -360,10 +355,10 @@ Style/FrozenStringLiteralComment:
   Description: Add the frozen_string_literal comment to the top of files to help transition
     from Ruby 2.3.0 to Ruby 3.0.
   Enabled: false
-  EnforcedStyle: when_needed
   SupportedStyles:
-  - when_needed
   - always
+  - never
+  EnforcedStyle: always
 
 Style/GlobalVars:
   Description: Do not introduce global variables.
@@ -735,6 +730,11 @@ Style/RedundantSelf:
   StyleGuide: https://github.com/rubocop-hq/ruby-style-guide#no-self-unless-required
   Enabled: true
 
+# Supports --auto-correct
+Style/RedundantSortBy:
+  Description: Use `sort` instead of `sort_by { |x| x }`.
+  Enabled: false
+
 # Supports --auto-correct
 Style/RegexpLiteral:
   Description: Use / or %r around regular expressions.
@@ -763,6 +763,12 @@ Style/ReturnNil:
 Style/SafeNavigation:
   Enabled: false
 
+# Supports --auto-correct
+Style/Sample:
+  Description: Use `sample` instead of `shuffle.first`, `shuffle.last`, and `shuffle[Fixnum]`.
+  Reference: https://github.com/JuanitoFatas/fast-ruby#arrayshufflefirst-vs-arraysample-code
+  Enabled: false
+
 # Supports --auto-correct
 Style/SelfAssignment:
   Description: Checks for places where self-assignment shorthand should have been used.
@@ -856,6 +862,11 @@ Style/StringMethods:
   PreferredMethods:
     intern: to_sym
 
+# Supports --auto-correct
+Style/Strip:
+  Description: Use `strip` instead of `lstrip.rstrip`.
+  Enabled: false
+
 Style/StructInheritance:
   Description: Checks for inheritance from Struct.new.
   StyleGuide: https://github.com/rubocop-hq/ruby-style-guide#no-extend-struct-new
@@ -922,24 +933,27 @@ Style/UnlessElse:
   Enabled: true
 
 # Supports --auto-correct
-Style/UnneededCapitalW:
+Style/RedundantCapitalW:
   Description: Checks for %W when interpolation is not needed.
   Enabled: false
 
-Style/UnneededCondition:
+Style/RedundantCondition:
   Enabled: false
 
 # Supports --auto-correct
-Style/UnneededInterpolation:
+Style/RedundantInterpolation:
   Description: Checks for strings that are just an interpolated expression.
   Enabled: false
 
 # Supports --auto-correct
-Style/UnneededPercentQ:
+Style/RedundantPercentQ:
   Description: Checks for %q/%Q when single quotes or double quotes would do.
   StyleGuide: https://github.com/rubocop-hq/ruby-style-guide#percent-q
   Enabled: false
 
+Style/RedundantSort:
+  Enabled: false
+
 Style/UnpackFirst:
   Enabled: false
 

data/lib/rubocop/airbnb/version.rb

@@ -3,6 +3,6 @@
 module RuboCop
   module Airbnb
     # Version information for the the Airbnb RuboCop plugin.
-    VERSION = '2.0.0'.freeze
+    VERSION = '3.0.0'
   end
 end

data/lib/rubocop/cop/airbnb/continuation_slash.rb

@@ -14,7 +14,7 @@ module RuboCop
         alias on_send enforce_violation
         alias on_if enforce_violation
 
-        Util::ASGN_NODES.each do |type|
+        RuboCop::AST::Node::ASSIGNMENTS.each do |type|
           define_method("on_#{type}") do |node|
             enforce_violation(node)
           end

data/rubocop-airbnb.gemspec

@@ -25,7 +25,9 @@ Gem::Specification.new do |spec|
     'Gemfile',
   ]
 
-  spec.add_dependency('rubocop', '~> 0.58.0')
+  spec.add_dependency('rubocop', '~> 0.76.0')
+  spec.add_dependency('rubocop-performance', '~> 1.5.0')
+  spec.add_dependency('rubocop-rails', '~> 2.3.2')
   spec.add_dependency('rubocop-rspec', '~> 1.30.0')
   spec.add_development_dependency('rspec', '~> 3.5')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-airbnb
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Airbnb Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.58.0
+        version: 0.76.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.58.0
+        version: 0.76.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +113,6 @@ files:
 - lib/rubocop/airbnb/inject.rb
 - lib/rubocop/airbnb/rails_autoloading.rb
 - lib/rubocop/airbnb/version.rb
-- lib/rubocop/cop/airbnb/class_name.rb
 - lib/rubocop/cop/airbnb/class_or_module_declared_in_wrong_file.rb
 - lib/rubocop/cop/airbnb/const_assigned_in_wrong_file.rb
 - lib/rubocop/cop/airbnb/continuation_slash.rb
@@ -105,7 +132,6 @@ files:
 - lib/rubocop/cop/airbnb/spec_constant_assignment.rb
 - lib/rubocop/cop/airbnb/unsafe_yaml_marshal.rb
 - rubocop-airbnb.gemspec
-- spec/rubocop/cop/airbnb/class_name_spec.rb
 - spec/rubocop/cop/airbnb/class_or_module_declared_in_wrong_file_spec.rb
 - spec/rubocop/cop/airbnb/const_assigned_in_wrong_file_spec.rb
 - spec/rubocop/cop/airbnb/continuation_slash_spec.rb
@@ -145,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Custom code style checking for Airbnb.

data/lib/rubocop/cop/airbnb/class_name.rb

@@ -1,47 +0,0 @@
-module RuboCop
-  module Cop
-    module Airbnb
-      # Cop to prevent cross-model references, which result in a cascade of autoloads. E.g.,
-      # belongs_to :user, :class_name => User.name
-      class ClassName < Cop
-        MSG = 'Use "Model" instead of Model.name at class scope to avoid cross-model references. ' \
-          'They cause a long cascade of autoloading, slowing down app startup and slowing down ' \
-          'reloading of zeus after changing a model.'.freeze
-
-        # Is this a has_many, has_one, or belongs_to with a :class_name arg? Make sure the
-        # class name is a hardcoded string. If not, add an offense and return true.
-        def on_send(node)
-          association_statement =
-            node.command?(:has_many) ||
-            node.command?(:has_one) ||
-            node.command?(:belongs_to)
-
-          return unless association_statement
-
-          class_pair = class_name_node(node)
-
-          if class_pair && !string_class_name?(class_pair)
-            add_offense(class_pair)
-          end
-        end
-
-        private
-
-        # Return the descendant node that is a hash pair (:key => value) whose key
-        # is :class_name.
-        def class_name_node(node)
-          node.descendants.detect do |e|
-            e.is_a?(Parser::AST::Node) &&
-              e.pair_type? &&
-              e.children[0].children[0] == :class_name
-          end
-        end
-
-        # Given a hash pair :class_name => value, is the value a hardcoded string?
-        def string_class_name?(class_pair)
-          class_pair.children[1].str_type?
-        end
-      end
-    end
-  end
-end

data/spec/rubocop/cop/airbnb/class_name_spec.rb

@@ -1,78 +0,0 @@
-describe RuboCop::Cop::Airbnb::ClassName do
-  subject(:cop) { described_class.new }
-
-  describe "belongs_to" do
-    it 'rejects with Model.name' do
-      source = [
-        'class Coupon',
-        '  belongs_to :user, :class_name => User.name',
-        'end',
-      ].join("\n")
-      inspect_source(source)
-
-      expect(cop.offenses.size).to eq(1)
-      expect(cop.offenses.map(&:line).sort).to eq([2])
-    end
-
-    it 'passes with "Model"' do
-      source = [
-        'class Coupon',
-        '  belongs_to :user, :class_name => "User"',
-        'end',
-      ].join("\n")
-      inspect_source(source)
-
-      expect(cop.offenses).to be_empty
-    end
-  end
-
-  describe "has_many" do
-    it 'rejects with Model.name' do
-      source = [
-        'class Coupon',
-        '  has_many :reservations, :class_name => Reservation2.name',
-        'end',
-      ].join("\n")
-      inspect_source(source)
-
-      expect(cop.offenses.size).to eq(1)
-      expect(cop.offenses.map(&:line)).to eq([2])
-    end
-
-    it 'passes with "Model"' do
-      source = [
-        'class Coupon',
-        '  has_many :reservations, :class_name => "Reservation2"',
-        'end',
-      ].join("\n")
-      inspect_source(source)
-
-      expect(cop.offenses).to be_empty
-    end
-  end
-
-  describe "has_one" do
-    it 'rejects with Model.name' do
-      source = [
-        'class Coupon',
-        '  has_one :loss, :class_name => Payments::Loss.name',
-        'end',
-      ].join("\n")
-      inspect_source(source)
-
-      expect(cop.offenses.size).to eq(1)
-      expect(cop.offenses.map(&:line)).to eq([2])
-    end
-
-    it 'passes with "Model"' do
-      source = [
-        'class Coupon',
-        '  has_one :loss, :class_name => "Payments::Loss"',
-        'end',
-      ].join("\n")
-      inspect_source(source)
-
-      expect(cop.offenses).to be_empty
-    end
-  end
-end