rubocop-standard 1.15.1 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27b8d90563424cdb8e15f16e85ee4a012a0a257c2025307fa4cd588f7ab3c0a5
-  data.tar.gz: a1054ba318de19986785ed3648f0fd33c5d10cf51524127d17b404f121af3680
+  metadata.gz: 4ff86603c5200d0aaf96d6141ee15b32b84484a970b6fda00b6509689d837c59
+  data.tar.gz: 42c8bf7bf7f5c126bd6f307c4562c05cad20f38c6034b6a0a600e3d899c9dcd6
 SHA512:
-  metadata.gz: 63c331df6f24b4172587a49c9e084dbc0033ee9b6e762119fb171afe05d56bc24fa1f2bcb426d82fafc191c3eefe8d787f709111e11ae59d7f43df712cd08cee
-  data.tar.gz: 4882d596fc5c265acf84447ce93f74cd7fce61c233d76c5be3e2d1e4ce36d6d19b569bc96f6dc618f53af4958790a018fff060d04b9bbef8d6bff56ac49ef2fa
+  metadata.gz: 7583c6adb7b95deed066c99466b574143635da619506f283ba7071189977692f3386fcc36aa625b0314c832ea2e979d2a7814ff24bd1479cb49bfccb2df92119
+  data.tar.gz: b97e83353026c7fb74f4c99a85706012d608dbdff507741bf7b786b635241a3816caf906dad13e6c16e270ae2cdc571033e0cdc71e50de99fd05b22c198410f0

data/README.md

@@ -13,10 +13,8 @@ gem "rubocop-standard"
 **.rubocop.yml**
 
 ``` yaml
-inherit_gem:
-  rubocop-standard:
-    - config/default.yml
-    - config/rails.yml
+require:
+  - rubocop-standard
 ```
 
 ## The Cops

data/config/default.yml

@@ -1,9 +1,4 @@
-require:
-  - rubocop/cop/standard
-  - rubocop-performance
-
-AllCops:
-  DisabledByDefault: true
+require: rubocop/cop/standard
 
 Bundler/DuplicatedGem:
   Enabled: true
@@ -153,10 +148,10 @@ Lint/StringConversionInInterpolation:
 Lint/UnderscorePrefixedVariableName:
   Enabled: true
 
-Lint/UnneededCopDisableDirective:
+Lint/RedundantCopDisableDirective:
   Enabled: true
 
-Lint/UnneededSplatExpansion:
+Lint/RedundantSplatExpansion:
   Enabled: true
 
 Lint/UnreachableCode:

data/config/rails.yml

@@ -1,8 +1,5 @@
-Rails:
-  Enabled: true
-
-Rails/FindEach:
-  Enabled: false
+require:
+  - rubocop-rails
 
 Rails/OutputSafety:
   Enabled: true
@@ -20,99 +17,107 @@ Rails/ScopeArgs:
 Rails/UniqBeforePluck:
   Enabled: true
 
-Standard/RailsApplicationRecord:
+GitHub/RailsApplicationRecord:
   Enabled: true
 
-Standard/RailsControllerRenderActionSymbol:
+GitHub/RailsControllerRenderActionSymbol:
   Enabled: true
   Include:
-    - 'app/controllers/**/*.rb'
+    - "app/controllers/**/*.rb"
 
-Standard/RailsControllerRenderLiteral:
+GitHub/RailsControllerRenderLiteral:
   Enabled: true
-  StyleGuide: https://github.com/gjtorikian/rubocop-standard/blob/master/guides/rails-render-literal.md
+  StyleGuide: https://github.com/github/rubocop-github/blob/master/guides/rails-render-literal.md
   Include:
-    - 'app/controllers/**/*.rb'
+    - "app/controllers/**/*.rb"
 
-Standard/RailsControllerRenderPathsExist:
+GitHub/RailsControllerRenderPathsExist:
   Enabled: true
   ViewPath:
-    - 'app/views'
+    - "app/views"
   Include:
-    - 'app/controllers/**/*.rb'
+    - "app/controllers/**/*.rb"
 
-Standard/RailsControllerRenderShorthand:
+GitHub/RailsControllerRenderShorthand:
   Enabled: true
-  StyleGuide: https://github.com/gjtorikian/rubocop-standard/blob/master/guides/rails-controller-render-shorthand.md
+  StyleGuide: https://github.com/github/rubocop-github/blob/master/guides/rails-controller-render-shorthand.md
   Include:
-    - 'app/controllers/**/*.rb'
+    - "app/controllers/**/*.rb"
 
-Standard/RailsRenderInline:
+GitHub/RailsRenderInline:
   Enabled: true
-  StyleGuide: https://github.com/gjtorikian/rubocop-standard/blob/master/guides/rails-controller-render-inline.md
+  StyleGuide: https://github.com/github/rubocop-github/blob/master/guides/rails-controller-render-inline.md
   Include:
-    - 'app/controllers/**/*.rb'
-    - 'app/helpers/**/*.rb'
-    - 'app/view_models/**/*.rb'
-    - 'app/views/**/*.erb'
+    - "app/controllers/**/*.rb"
+    - "app/helpers/**/*.rb"
+    - "app/view_models/**/*.rb"
+    - "app/views/**/*.erb"
 
-Standard/RailsRenderObjectCollection:
+GitHub/RailsRenderObjectCollection:
   Enabled: false
 
-Standard/RailsViewRenderLiteral:
+GitHub/RailsViewRenderLiteral:
   Enabled: true
-  StyleGuide: https://github.com/gjtorikian/rubocop-standard/blob/master/guides/rails-render-literal.md
+  StyleGuide: https://github.com/github/rubocop-github/blob/master/guides/rails-render-literal.md
   Include:
-    - 'app/helpers/**/*.rb'
-    - 'app/view_models/**/*.rb'
-    - 'app/views/**/*.erb'
+    - "app/helpers/**/*.rb"
+    - "app/view_models/**/*.rb"
+    - "app/views/**/*.erb"
 
-Standard/RailsViewRenderPathsExist:
+GitHub/RailsViewRenderPathsExist:
   Enabled: true
   ViewPath:
-    - 'app/views'
+    - "app/views"
   Include:
-    - 'app/helpers/**/*.rb'
-    - 'app/view_models/**/*.rb'
-    - 'app/views/**/*.erb'
+    - "app/helpers/**/*.rb"
+    - "app/view_models/**/*.rb"
+    - "app/views/**/*.erb"
 
-Standard/RailsViewRenderShorthand:
+GitHub/RailsViewRenderShorthand:
   Enabled: true
   Include:
-    - 'app/helpers/**/*.rb'
-    - 'app/view_models/**/*.rb'
-    - 'app/views/**/*.erb'
+    - "app/helpers/**/*.rb"
+    - "app/view_models/**/*.rb"
+    - "app/views/**/*.erb"
 
 # Exclude Rails ERB files from incompatible cops
 
 Layout/BlockAlignment:
   Exclude:
-    - 'app/views/**/*.erb'
+    - "app/views/**/*.erb"
 
 Style/For:
   Exclude:
-    - 'app/views/**/*.erb'
+    - "app/views/**/*.erb"
 
 Style/OneLineConditional:
   Exclude:
-    - 'app/views/**/*.erb'
+    - "app/views/**/*.erb"
 
 Style/Semicolon:
   Exclude:
-    - 'app/views/**/*.erb'
+    - "app/views/**/*.erb"
 
 Layout/SpaceInsideParens:
   Exclude:
-    - 'app/views/**/*.erb'
+    - "app/views/**/*.erb"
 
 Style/StringLiterals:
   Exclude:
-    - 'app/views/**/*.erb'
+    - "app/views/**/*.erb"
 
 Layout/TrailingBlankLines:
   Exclude:
-    - 'app/views/**/*.erb'
+    - "app/views/**/*.erb"
 
 Layout/TrailingWhitespace:
   Exclude:
-    - 'app/views/**/*.erb'
+    - "app/views/**/*.erb"
+
+Layout/InitialIndentation:
+  Exclude:
+    - "app/views/**/*.erb"
+
+Lint/UselessAccessModifier:
+  ContextCreatingMethods:
+    - concerning

data/lib/rubocop/cop/standard/rails_application_record.rb

@@ -17,11 +17,9 @@ module RuboCop
         PATTERN
 
         def on_class(node)
-          klass, superclass, _ = *node
+          klass, superclass, = *node
 
-          if active_record_base_const?(superclass) && !(application_record_const?(klass))
-            add_offense(superclass, location: :expression)
-          end
+          add_offense(superclass, location: :expression) if active_record_base_const?(superclass) && !application_record_const?(klass)
         end
       end
     end

data/lib/rubocop/cop/standard/rails_controller_render_literal.rb

@@ -6,7 +6,7 @@ module RuboCop
   module Cop
     module Standard
       class RailsControllerRenderLiteral < Cop
-        MSG = 'render must be used with a string literal'
+        MSG = 'render must be used with a string literal or an instance of a Class'
 
         def_node_matcher :literal?, <<-PATTERN
           ({str sym true false nil?} ...)
@@ -20,6 +20,14 @@ module RuboCop
           (send nil? :render ({str sym} $_) $...)
         PATTERN
 
+        def_node_matcher :render_const?, <<-PATTERN
+          (send nil? :render (const _ _) ...)
+        PATTERN
+
+        def_node_matcher :render_inst?, <<-PATTERN
+          (send nil? :render (send _ :new ...) ...)
+        PATTERN
+
         def_node_matcher :render_with_options?, <<-PATTERN
           (send nil? :render (hash $...))
         PATTERN
@@ -63,26 +71,20 @@ module RuboCop
         def on_send(node)
           return unless render?(node)
 
-          if render_literal?(node)
+          if render_literal?(node) || render_inst?(node) || render_const?(node)
           elsif option_pairs = render_with_options?(node)
             option_pairs = option_pairs.reject { |pair| options_key?(pair) }
 
-            if option_pairs.any? { |pair| ignore_key?(pair) }
-              return
-            end
+            return if option_pairs.any? { |pair| ignore_key?(pair) }
 
             if template_node = option_pairs.map { |pair| template_key?(pair) }.compact.first
-              if !literal?(template_node)
-                add_offense(node, location: :expression)
-              end
+              add_offense(node, location: :expression) unless literal?(template_node)
             else
               add_offense(node, location: :expression)
             end
 
             if layout_node = option_pairs.map { |pair| layout_key?(pair) }.compact.first
-              if !literal?(layout_node)
-                add_offense(node, location: :expression)
-              end
+              add_offense(node, location: :expression) unless literal?(layout_node)
             end
           else
             add_offense(node, location: :expression)

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

@@ -27,22 +27,16 @@ 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')
-            end
+            add_offense(node, location: :expression, message: 'Template could not be found') unless resolve_template(path.to_s)
           elsif pairs = render_options?(node)
             if pair = pairs.detect { |p| render_key?(p) }
               key, node, path = render_key?(pair)
 
               case key
               when :action, :template
-                unless resolve_template(path.to_s)
-                  add_offense(node, location: :expression, message: 'Template could not be found')
-                end
+                add_offense(node, location: :expression, message: 'Template could not be found') unless resolve_template(path.to_s)
               when :partial
-                unless resolve_partial(path.to_s)
-                  add_offense(node, location: :expression, message: 'Partial template could not be found')
-                end
+                add_offense(node, location: :expression, message: 'Partial template could not be found') unless resolve_partial(path.to_s)
               end
             end
           end

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

@@ -31,17 +31,17 @@ module RuboCop
         def on_send(node)
           if option_pairs = render_with_options?(node)
             option_pairs.each do |pair|
-              if value_node = action_key?(pair)
-                comma = option_pairs.length > 1 ? ', ' : ''
-                corrected_source = node.source
-                  .sub(/#{pair.source}(,\s*)?/, '')
-                  .sub('render ', "render \"#{str(value_node)}\"#{comma}")
-
-                @autocorrect[node] = lambda do |corrector|
-                  corrector.replace(node.source_range, corrected_source)
-                end
-                add_offense(node, location: :expression, message: "Use `#{corrected_source}` instead")
+              next unless value_node = action_key?(pair)
+
+              comma = option_pairs.length > 1 ? ', ' : ''
+              corrected_source = node.source
+                                     .sub(/#{pair.source}(,\s*)?/, '')
+                                     .sub('render ', "render \"#{str(value_node)}\"#{comma}")
+
+              @autocorrect[node] = lambda 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/standard/rails_render_inline.rb

@@ -18,9 +18,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)
-            end
+            add_offense(node, location: :expression) if option_pairs.detect { |pair| inline_key?(pair) }
           end
         end
       end

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

@@ -31,9 +31,7 @@ module RuboCop
 
               case object_sym
               when :object
-                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
+                suggestion = ", instead `render partial: #{partial_name.source}, locals: { #{File.basename(partial_name.children[0], '.html.erb')}: #{object_node.source} }`" if partial_name.children[0].is_a?(String)
                 add_offense(node, location: :expression, message: "Avoid `render object:`#{suggestion}")
               when :collection, :spacer_template
                 add_offense(node, location: :expression, message: 'Avoid `render collection:`')

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

@@ -6,7 +6,7 @@ module RuboCop
   module Cop
     module Standard
       class RailsViewRenderLiteral < Cop
-        MSG = 'render must be used with a string literal'
+        MSG = 'render must be used with a string literal or an instance of a Class'
 
         def_node_matcher :literal?, <<-PATTERN
           ({str sym true false nil?} ...)
@@ -20,6 +20,14 @@ module RuboCop
           (send nil? :render ({str sym} $_) $...)
         PATTERN
 
+        def_node_matcher :render_inst?, <<-PATTERN
+          (send nil? :render (send _ :new ...) ...)
+        PATTERN
+
+        def_node_matcher :render_const?, <<-PATTERN
+          (send nil? :render (const _ _) ...)
+        PATTERN
+
         def_node_matcher :render_with_options?, <<-PATTERN
           (send nil? :render (hash $...) ...)
         PATTERN
@@ -42,16 +50,12 @@ module RuboCop
         def on_send(node)
           return unless render?(node)
 
-          if render_literal?(node)
+          if render_literal?(node) || render_inst?(node) || render_const?(node)
           elsif option_pairs = render_with_options?(node)
-            if option_pairs.any? { |pair| ignore_key?(pair) }
-              return
-            end
+            return if option_pairs.any? { |pair| ignore_key?(pair) }
 
             if partial_node = option_pairs.map { |pair| partial_key?(pair) }.compact.first
-              if !literal?(partial_node)
-                add_offense(node, location: :expression)
-              end
+              add_offense(node, location: :expression) unless literal?(partial_node)
             else
               add_offense(node, location: :expression)
             end

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

@@ -27,16 +27,12 @@ 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')
-            end
+            add_offense(node, location: :expression, message: 'Partial template could not be found') unless resolve_partial(path.to_s)
           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')
-              end
+              add_offense(node, location: :expression, message: 'Partial template could not be found') unless resolve_partial(path.to_s)
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-standard
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: '2.0'
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-01 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -30,14 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -125,8 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: RuboCop Standard