rubocop-github 0.16.1 → 0.18.0

data/lib/rubocop/cop/github/rails_controller_render_paths_exist.rb

@@ -5,7 +5,7 @@ require "rubocop"
 module RuboCop
   module Cop
     module GitHub
-      class RailsControllerRenderPathsExist < Cop
+      class RailsControllerRenderPathsExist < Base
         def_node_matcher :render?, <<-PATTERN
           (send nil? {:render :render_to_string} $...)
         PATTERN
@@ -28,7 +28,7 @@ module RuboCop
           if args = render_str?(node)
             node, path = args
             unless resolve_template(path.to_s)
-              add_offense(node, location: :expression, message: "Template could not be found")
+              add_offense(node, message: "Template could not be found")
             end
           elsif pairs = render_options?(node)
             if pair = pairs.detect { |p| render_key?(p) }
@@ -37,11 +37,11 @@ module RuboCop
               case key
               when :action, :template
                 unless resolve_template(path.to_s)
-                  add_offense(node, location: :expression, message: "Template could not be found")
+                  add_offense(node, message: "Template could not be found")
                 end
               when :partial
                 unless resolve_partial(path.to_s)
-                  add_offense(node, location: :expression, message: "Partial template could not be found")
+                  add_offense(node, message: "Partial template could not be found")
                 end
               end
             end

data/lib/rubocop/cop/github/rails_controller_render_shorthand.rb

@@ -5,7 +5,9 @@ require "rubocop"
 module RuboCop
   module Cop
     module GitHub
-      class RailsControllerRenderShorthand < Cop
+      class RailsControllerRenderShorthand < Base
+        extend AutoCorrector
+
         MSG = "Prefer `render` template shorthand"
 
         def_node_matcher :render_with_options?, <<-PATTERN
@@ -20,14 +22,6 @@ module RuboCop
           ({str sym} $_)
         PATTERN
 
-        def investigate(*)
-          @autocorrect = {}
-        end
-
-        def autocorrect(node)
-          @autocorrect[node]
-        end
-
         def on_send(node)
           if option_pairs = render_with_options?(node)
             option_pairs.each do |pair|
@@ -37,10 +31,9 @@ module RuboCop
                   .sub(/#{pair.source}(,\s*)?/, "")
                   .sub("render ", "render \"#{str(value_node)}\"#{comma}")
 
-                @autocorrect[node] = lambda do |corrector|
+                add_offense(node, message: "Use `#{corrected_source}` instead") do |corrector|
                   corrector.replace(node.source_range, corrected_source)
                 end
-                add_offense(node, location: :expression, message: "Use `#{corrected_source}` instead")
               end
             end
           end

data/lib/rubocop/cop/github/rails_render_inline.rb

@@ -5,7 +5,7 @@ require "rubocop"
 module RuboCop
   module Cop
     module GitHub
-      class RailsRenderInline < Cop
+      class RailsRenderInline < Base
         MSG = "Avoid `render inline:`"
 
         def_node_matcher :render_with_options?, <<-PATTERN
@@ -19,7 +19,7 @@ module RuboCop
         def on_send(node)
           if option_pairs = render_with_options?(node)
             if option_pairs.detect { |pair| inline_key?(pair) }
-              add_offense(node, location: :expression)
+              add_offense(node)
             end
           end
         end

data/lib/rubocop/cop/github/rails_render_object_collection.rb

@@ -5,7 +5,7 @@ require "rubocop"
 module RuboCop
   module Cop
     module GitHub
-      class RailsRenderObjectCollection < Cop
+      class RailsRenderObjectCollection < Base
         MSG = "Avoid `render object:`"
 
         def_node_matcher :render_with_options?, <<-PATTERN
@@ -34,9 +34,9 @@ module RuboCop
                 if partial_name.children[0].is_a?(String)
                   suggestion = ", instead `render partial: #{partial_name.source}, locals: { #{File.basename(partial_name.children[0], '.html.erb')}: #{object_node.source} }`"
                 end
-                add_offense(node, location: :expression, message: "Avoid `render object:`#{suggestion}")
+                add_offense(node, message: "Avoid `render object:`#{suggestion}")
               when :collection, :spacer_template
-                add_offense(node, location: :expression, message: "Avoid `render collection:`")
+                add_offense(node, message: "Avoid `render collection:`")
               end
             end
           end

data/lib/rubocop/cop/github/rails_view_render_literal.rb

@@ -6,7 +6,7 @@ require "rubocop/cop/github/render_literal_helpers"
 module RuboCop
   module Cop
     module GitHub
-      class RailsViewRenderLiteral < Cop
+      class RailsViewRenderLiteral < Base
         include RenderLiteralHelpers
 
         MSG = "render must be used with a literal template and use literals for locals keys"
@@ -40,15 +40,15 @@ module RuboCop
 
             if partial_node = option_pairs.map { |pair| partial_key?(pair) }.compact.first
               if !literal?(partial_node)
-                add_offense(node, location: :expression)
+                add_offense(node)
                 return
               end
             else
-              add_offense(node, location: :expression)
+              add_offense(node)
               return
             end
           else
-            add_offense(node, location: :expression)
+            add_offense(node)
             return
           end
 
@@ -61,10 +61,10 @@ module RuboCop
           if locals
             if locals.hash_type?
               if !hash_with_literal_keys?(locals)
-                add_offense(node, location: :expression)
+                add_offense(node)
               end
             else
-              add_offense(node, location: :expression)
+              add_offense(node)
             end
           end
         end

data/lib/rubocop/cop/github/rails_view_render_paths_exist.rb

@@ -5,7 +5,7 @@ require "rubocop"
 module RuboCop
   module Cop
     module GitHub
-      class RailsViewRenderPathsExist < Cop
+      class RailsViewRenderPathsExist < Base
         def_node_matcher :render?, <<-PATTERN
           (send nil? {:render :render_to_string} $...)
         PATTERN
@@ -28,14 +28,14 @@ module RuboCop
           if args = render_str?(node)
             node, path = args
             unless resolve_partial(path.to_s)
-              add_offense(node, location: :expression, message: "Partial template could not be found")
+              add_offense(node, message: "Partial template could not be found")
             end
           elsif pairs = render_options?(node)
             if pair = pairs.detect { |p| partial_key?(p) }
               node, path = partial_key?(pair)
 
               unless resolve_partial(path.to_s)
-                add_offense(node, location: :expression, message: "Partial template could not be found")
+                add_offense(node, message: "Partial template could not be found")
               end
             end
           end

data/lib/rubocop/cop/github/rails_view_render_shorthand.rb

@@ -5,7 +5,7 @@ require "rubocop"
 module RuboCop
   module Cop
     module GitHub
-      class RailsViewRenderShorthand < Cop
+      class RailsViewRenderShorthand < Base
         MSG = "Prefer `render` partial shorthand"
 
         def_node_matcher :render_with_options?, <<-PATTERN
@@ -26,9 +26,9 @@ module RuboCop
             locals_key = option_pairs.map { |pair| locals_key?(pair) }.compact.first
 
             if option_pairs.length == 1 && partial_key
-              add_offense(node, location: :expression, message: "Use `render #{partial_key.source}` instead")
+              add_offense(node, message: "Use `render #{partial_key.source}` instead")
             elsif option_pairs.length == 2 && partial_key && locals_key
-              add_offense(node, location: :expression, message: "Use `render #{partial_key.source}, #{locals_key.source}` instead")
+              add_offense(node, message: "Use `render #{partial_key.source}, #{locals_key.source}` instead")
             end
           end
         end

data/lib/rubocop/cop/github/render_literal_helpers.rb

@@ -20,10 +20,6 @@ module RuboCop
           (send nil? {:render :render_to_string} ({str sym} $_) $...)
         PATTERN
 
-        def_node_matcher :render_inst?, <<-PATTERN
-          (send nil? {:render :render_to_string} (send _ :new ...) ...)
-        PATTERN
-
         def_node_matcher :render_with_options?, <<-PATTERN
           (send nil? {:render :render_to_string} (hash $...) ...)
         PATTERN
@@ -32,6 +28,10 @@ module RuboCop
           (send nil? {:render :render_to_string} (send _ :new ...) ...)
         PATTERN
 
+        def_node_matcher :render_view_component_instance_with_content?, <<-PATTERN
+          (send nil? {:render :render_to_string} (send (send _ :new ...) `:with_content ...))
+        PATTERN
+
         def_node_matcher :render_view_component_collection?, <<-PATTERN
           (send nil? {:render :render_to_string} (send _ :with_collection ...) ...)
         PATTERN
@@ -45,7 +45,8 @@ module RuboCop
         end
 
         def render_view_component?(node)
-          render_view_component_instance?(node) ||
+          render_view_component_instance_with_content?(node) ||
+            render_view_component_instance?(node) ||
             render_view_component_collection?(node)
         end
       end

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-github
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.18.0
 platform: ruby
 authors:
 - GitHub
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 description: 'Code style checking for GitHub Ruby repositories '
 email: engineering@github.com
 executables: []
@@ -103,14 +103,8 @@ files:
 - LICENSE
 - README.md
 - STYLEGUIDE.md
-- config/_default_shared.yml
-- config/_rails_shared.yml
 - config/default.yml
-- config/default_deprecated.yml
-- config/default_edge.yml
 - config/rails.yml
-- config/rails_deprecated.yml
-- config/rails_edge.yml
 - guides/rails-controller-render-shorthand.md
 - guides/rails-render-inline.md
 - guides/rails-render-literal.md
@@ -146,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: RuboCop GitHub

data/config/_default_shared.yml

@@ -1,329 +0,0 @@
-require:
-  - rubocop/cop/github
-  - rubocop-performance
-
-# These cops are compatible across supported versions of rubocop
-
-Bundler/DuplicatedGem:
-  Enabled: true
-
-Bundler/OrderedGems:
-  Enabled: true
-
-GitHub/InsecureHashAlgorithm:
-  Enabled: true
-
-Layout/BlockAlignment:
-  Enabled: true
-
-Layout/BlockEndNewline:
-  Enabled: true
-
-Layout/ConditionPosition:
-  Enabled: true
-
-Layout/DefEndAlignment:
-  Enabled: true
-
-Layout/EndAlignment:
-  Enabled: false
-
-Layout/EndOfLine:
-  Enabled: true
-
-Layout/IndentationStyle:
-  Enabled: true
-  EnforcedStyle: spaces
-  IndentationWidth: 2
-
-Layout/InitialIndentation:
-  Enabled: true
-
-Layout/LineLength:
-  Enabled: false
-
-Layout/SpaceAfterColon:
-  Enabled: true
-
-Layout/SpaceAfterComma:
-  Enabled: true
-
-Layout/SpaceAfterMethodName:
-  Enabled: true
-
-Layout/SpaceAfterNot:
-  Enabled: true
-
-Layout/SpaceAfterSemicolon:
-  Enabled: true
-
-Layout/SpaceAroundBlockParameters:
-  Enabled: true
-
-Layout/SpaceAroundEqualsInParameterDefault:
-  Enabled: true
-
-Layout/SpaceBeforeBlockBraces:
-  Enabled: true
-
-Layout/SpaceInsideArrayLiteralBrackets:
-  Enabled: true
-  EnforcedStyle: no_space
-
-Layout/SpaceInsideArrayPercentLiteral:
-  Enabled: true
-
-Layout/SpaceInsideBlockBraces:
-  Enabled: true
-
-Layout/SpaceInsideParens:
-  Enabled: true
-
-Layout/SpaceInsideRangeLiteral:
-  Enabled: true
-
-Layout/SpaceInsideReferenceBrackets:
-  Enabled: true
-
-Layout/TrailingEmptyLines:
-  Enabled: true
-
-Layout/TrailingWhitespace:
-  Enabled: true
-
-Lint/CircularArgumentReference:
-  Enabled: true
-
-Lint/Debugger:
-  Enabled: true
-
-Lint/DeprecatedClassMethods:
-  Enabled: true
-
-Lint/DuplicateMethods:
-  Enabled: true
-
-Lint/DuplicateHashKey:
-  Enabled: true
-
-Lint/EachWithObjectArgument:
-  Enabled: true
-
-Lint/ElseLayout:
-  Enabled: true
-
-Lint/EmptyEnsure:
-  Enabled: true
-
-Lint/EmptyInterpolation:
-  Enabled: true
-
-Lint/EnsureReturn:
-  Enabled: true
-
-Lint/FlipFlop:
-  Enabled: true
-
-Lint/FloatOutOfRange:
-  Enabled: true
-
-Lint/FormatParameterMismatch:
-  Enabled: true
-
-Lint/LiteralAsCondition:
-  Enabled: true
-
-Lint/LiteralInInterpolation:
-  Enabled: true
-
-Lint/Loop:
-  Enabled: true
-
-Lint/NextWithoutAccumulator:
-  Enabled: true
-
-Lint/RandOne:
-  Enabled: true
-
-Lint/RequireParentheses:
-  Enabled: true
-
-Lint/RescueException:
-  Enabled: true
-
-Lint/RedundantStringCoercion:
-  Enabled: true
-
-Lint/UnderscorePrefixedVariableName:
-  Enabled: true
-
-Lint/RedundantCopDisableDirective:
-  Enabled: true
-
-Lint/RedundantSplatExpansion:
-  Enabled: true
-
-Lint/UnreachableCode:
-  Enabled: true
-
-Lint/BinaryOperatorWithIdenticalOperands:
-  Enabled: true
-
-Lint/UselessSetterCall:
-  Enabled: true
-
-Lint/Void:
-  Enabled: true
-
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/BlockLength:
-  Enabled: false
-
-Metrics/BlockNesting:
-  Enabled: false
-
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/ModuleLength:
-  Enabled: false
-
-Metrics/ParameterLists:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
-  Enabled: false
-
-Naming/AsciiIdentifiers:
-  Enabled: true
-
-Naming/ClassAndModuleCamelCase:
-  Enabled: true
-
-Naming/FileName:
-  Enabled: true
-
-Naming/MethodName:
-  Enabled: true
-
-Performance/CaseWhenSplat:
-  Enabled: false
-
-Performance/Count:
-  Enabled: true
-
-Performance/Detect:
-  Enabled: true
-
-Performance/DoubleStartEndWith:
-  Enabled: true
-
-Performance/EndWith:
-  Enabled: true
-
-Performance/FlatMap:
-  Enabled: true
-
-Performance/RangeInclude:
-  Enabled: false
-
-Performance/RedundantMatch:
-  Enabled: false
-
-Performance/RedundantMerge:
-  Enabled: true
-  MaxKeyValuePairs: 1
-
-Performance/ReverseEach:
-  Enabled: true
-
-Performance/Size:
-  Enabled: true
-
-Performance/StartWith:
-  Enabled: true
-
-Security/Eval:
-  Enabled: true
-
-Style/ArrayJoin:
-  Enabled: true
-
-Style/BeginBlock:
-  Enabled: true
-
-Style/BlockComments:
-  Enabled: true
-
-Style/CaseEquality:
-  Enabled: true
-
-Style/CharacterLiteral:
-  Enabled: true
-
-Style/ClassMethods:
-  Enabled: true
-
-Style/Copyright:
-  Enabled: false
-
-Style/DefWithParentheses:
-  Enabled: true
-
-Style/EndBlock:
-  Enabled: true
-
-Style/For:
-  Enabled: true
-
-Style/FrozenStringLiteralComment:
-  Enabled: true
-
-Style/HashSyntax:
-  Enabled: true
-  EnforcedStyle: ruby19_no_mixed_keys
-
-Style/LambdaCall:
-  Enabled: true
-
-Style/MethodCallWithoutArgsParentheses:
-  Enabled: true
-
-Style/MethodDefParentheses:
-  Enabled: true
-
-Style/MultilineIfThen:
-  Enabled: true
-
-Style/NilComparison:
-  Enabled: true
-
-Style/Not:
-  Enabled: true
-
-Style/OneLineConditional:
-  Enabled: true
-
-Style/RedundantSortBy:
-  Enabled: true
-
-Style/Sample:
-  Enabled: true
-
-Style/StabbyLambdaParentheses:
-  Enabled: true
-
-Style/Strip:
-  Enabled: true
-
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes