rubocop-standard 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a278ae17b941dde291fbf9b0917c87731c0cb00c7f57ba6686e07708ad9d3ed1
-  data.tar.gz: 5679d32a6f9a89bd56e1458e8ca23b6c5728dff8b5a5419569153cebec67f578
+  metadata.gz: 255673146dc715318488a00c6acf2b2f028c3c447824e01dc120e78bd6be3478
+  data.tar.gz: 3c477ce44365e81ac03f027e23ab2b2b479cdfdc8e8d0bbb329b3de64e97faea
 SHA512:
-  metadata.gz: 914945a7573c9c7a30e0a4b4b0a5c80755d39967a098f126459a5d0f16f5a5a2a9f018528ac0397b588bddb54eafb8cc69c9cb50455a41fb0242b7eede98ba3b
-  data.tar.gz: b6478eb87ba36ffcc66f88852708f00ac9d372e5568d41e00be0f9ba61caf4a1d900298d57271acd8a5aad61f4858a62b5e34635a1cac66e7689a5eeda6e9903
+  metadata.gz: 63b8c5b720621c03508c3bbc07c5f904456fb2330a83446f862c7cab921c8eb596e05d1ab69f71c98b806635916e9763c46af3d0af364bad90a482031f6952cb
+  data.tar.gz: ccfd489f536affc8d5bf7594480f79aa687be847d02f6af98b8f071649b69e2430da0eb8f7168b3f397c64c2c8ec8239d8fbb86d4bc6793dc0151b709c0d6a7b

data/config/default.yml

@@ -1,5 +1,4 @@
 require:
-  - rubocop/cop/standard
   - rubocop-performance
 
 Bundler/DuplicatedGem:
@@ -29,6 +28,9 @@ Layout/EndOfLine:
 Layout/InitialIndentation:
   Enabled: true
 
+Layout/LineLength:
+  Enabled: false
+
 Layout/SpaceAfterColon:
   Enabled: true
 
@@ -183,9 +185,6 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-Metrics/LineLength:
-  Enabled: false
-
 Metrics/MethodLength:
   Enabled: false
 
@@ -274,6 +273,9 @@ Style/Copyright:
 Style/DefWithParentheses:
   Enabled: true
 
+Style/Documentation:
+  Enabled: false
+
 Style/EndBlock:
   Enabled: true
 

data/config/rails.yml

@@ -1,5 +1,6 @@
 require:
   - rubocop-rails
+  - rubocop/cop/standard/rails
 
 Rails/OutputSafety:
   Enabled: true

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'rubocop/cop/standard/rails/rails_application_record'
+require 'rubocop/cop/standard/rails/rails_controller_render_action_symbol'
+require 'rubocop/cop/standard/rails/rails_controller_render_literal'
+require 'rubocop/cop/standard/rails/rails_controller_render_paths_exist'
+require 'rubocop/cop/standard/rails/rails_controller_render_shorthand'
+require 'rubocop/cop/standard/rails/rails_render_inline'
+require 'rubocop/cop/standard/rails/rails_render_object_collection'
+require 'rubocop/cop/standard/rails/rails_view_render_literal'
+require 'rubocop/cop/standard/rails/rails_view_render_paths_exist'
+require 'rubocop/cop/standard/rails/rails_view_render_shorthand'

data/lib/rubocop/cop/standard/{rails_controller_render_action_symbol.rb → rails/rails_controller_render_action_symbol.rb}

@@ -21,11 +21,11 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          if sym_node = render_sym?(node)
+          if (sym_node = render_sym?(node))
             add_offense(sym_node, location: :expression)
-          elsif option_pairs = render_with_options?(node)
+          elsif (option_pairs = render_with_options?(node))
             option_pairs.each do |pair|
-              if sym_node = action_key?(pair)
+              if (sym_node = action_key?(pair))
                 add_offense(sym_node, location: :expression)
               end
             end

data/lib/rubocop/cop/standard/{rails_controller_render_literal.rb → rails/rails_controller_render_literal.rb}

@@ -72,18 +72,18 @@ module RuboCop
           return unless render?(node)
 
           if render_literal?(node) || render_inst?(node) || render_const?(node)
-          elsif option_pairs = render_with_options?(node)
+          elsif (option_pairs = render_with_options?(node))
             option_pairs = option_pairs.reject { |pair| options_key?(pair) }
 
             return if option_pairs.any? { |pair| ignore_key?(pair) }
 
-            if template_node = option_pairs.map { |pair| template_key?(pair) }.compact.first
+            if (template_node = option_pairs.map { |pair| template_key?(pair) }.compact.first)
               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 (layout_node = option_pairs.map { |pair| layout_key?(pair) }.compact.first)
               add_offense(node, location: :expression) unless literal?(layout_node)
             end
           else

data/lib/rubocop/cop/standard/{rails_controller_render_paths_exist.rb → rails/rails_controller_render_paths_exist.rb}

@@ -25,11 +25,11 @@ module RuboCop
         def on_send(node)
           return unless cop_config['ViewPath']
 
-          if args = render_str?(node)
+          if (args = render_str?(node))
             node, path = args
             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) }
+          elsif (pairs = render_options?(node))
+            if (pair = pairs.detect { |p| render_key?(p) })
               key, node, path = render_key?(pair)
 
               case key
@@ -44,7 +44,7 @@ module RuboCop
 
         def resolve_template(path)
           cop_config['ViewPath'].each do |view_path|
-            if m = Dir[File.join(config.path_relative_to_config(view_path), path) + '*'].first
+            if (m = Dir[File.join(config.path_relative_to_config(view_path), path) + '*'].first)
               return m
             end
           end

data/lib/rubocop/cop/standard/{rails_controller_render_shorthand.rb → rails/rails_controller_render_shorthand.rb}

@@ -29,20 +29,20 @@ module RuboCop
         end
 
         def on_send(node)
-          if option_pairs = render_with_options?(node)
-            option_pairs.each do |pair|
-              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")
+          return unless (option_pairs = render_with_options?(node))
+
+          option_pairs.each do |pair|
+            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 → rails/rails_render_inline.rb}

@@ -17,9 +17,9 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          if option_pairs = render_with_options?(node)
-            add_offense(node, location: :expression) if option_pairs.detect { |pair| inline_key?(pair) }
-          end
+          return unless (option_pairs = render_with_options?(node))
+
+          add_offense(node, location: :expression) if option_pairs.detect { |pair| inline_key?(pair) }
         end
       end
     end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'rubocop'
+
+module RuboCop
+  module Cop
+    module Standard
+      class RailsRenderObjectCollection < Cop
+        MSG = 'Avoid `render object:`'
+
+        def_node_matcher :render_with_options?, <<-PATTERN
+          (send nil? :render (hash $...) ...)
+        PATTERN
+
+        def_node_matcher :partial_key?, <<-PATTERN
+          (pair (sym :partial) $_)
+        PATTERN
+
+        def_node_matcher :object_key?, <<-PATTERN
+          (pair (sym ${:object :collection :spacer_template}) $_)
+        PATTERN
+
+        def on_send(node)
+          return unless (option_pairs = render_with_options?(node))
+
+          partial_pair = option_pairs.detect { |pair| partial_key?(pair) }
+          object_pair  = option_pairs.detect { |pair| object_key?(pair) }
+
+          return unless partial_pair && object_pair
+
+          partial_name = partial_key?(partial_pair)
+          object_sym, object_node = object_key?(object_pair)
+
+          case object_sym
+          when :object
+            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:`')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/standard/{rails_view_render_literal.rb → rails/rails_view_render_literal.rb}

@@ -51,10 +51,10 @@ module RuboCop
           return unless render?(node)
 
           if render_literal?(node) || render_inst?(node) || render_const?(node)
-          elsif option_pairs = render_with_options?(node)
+          elsif (option_pairs = render_with_options?(node))
             return if option_pairs.any? { |pair| ignore_key?(pair) }
 
-            if partial_node = option_pairs.map { |pair| partial_key?(pair) }.compact.first
+            if (partial_node = option_pairs.map { |pair| partial_key?(pair) }.compact.first)
               add_offense(node, location: :expression) unless literal?(partial_node)
             else
               add_offense(node, location: :expression)

data/lib/rubocop/cop/standard/{rails_view_render_paths_exist.rb → rails/rails_view_render_paths_exist.rb}

@@ -25,11 +25,11 @@ module RuboCop
         def on_send(node)
           return unless cop_config['ViewPath']
 
-          if args = render_str?(node)
+          if (args = render_str?(node))
             node, path = args
             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) }
+          elsif (pairs = render_options?(node))
+            if (pair = pairs.detect { |p| partial_key?(p) })
               node, path = partial_key?(pair)
 
               add_offense(node, location: :expression, message: 'Partial template could not be found') unless resolve_partial(path.to_s)
@@ -43,7 +43,7 @@ module RuboCop
           path = parts.join(File::SEPARATOR)
 
           cop_config['ViewPath'].each do |view_path|
-            if m = Dir[File.join(config.path_relative_to_config(view_path), path) + '*'].first
+            if (m = Dir[File.join(config.path_relative_to_config(view_path), path) + '*'].first)
               return m
             end
           end

data/lib/rubocop/cop/standard/{rails_view_render_shorthand.rb → rails/rails_view_render_shorthand.rb}

@@ -21,15 +21,15 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          if option_pairs = render_with_options?(node)
-            partial_key = option_pairs.map { |pair| partial_key?(pair) }.compact.first
-            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")
-            elsif option_pairs.length == 2 && partial_key && locals_key
-              add_offense(node, location: :expression, message: "Use `render #{partial_key.source}, #{locals_key.source}` instead")
-            end
+          return unless (option_pairs = render_with_options?(node))
+
+          partial_key = option_pairs.map { |pair| partial_key?(pair) }.compact.first
+          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")
+          elsif option_pairs.length == 2 && partial_key && locals_key
+            add_offense(node, location: :expression, message: "Use `render #{partial_key.source}, #{locals_key.source}` instead")
           end
         end
       end

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

@@ -0,0 +1 @@
+# frozen_string_literal: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-standard
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2019-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -109,17 +109,18 @@ files:
 - guides/rails-controller-render-shorthand.md
 - guides/rails-render-inline.md
 - guides/rails-render-literal.md
-- lib/rubocop/cop/standard.rb
-- lib/rubocop/cop/standard/rails_application_record.rb
-- lib/rubocop/cop/standard/rails_controller_render_action_symbol.rb
-- lib/rubocop/cop/standard/rails_controller_render_literal.rb
-- lib/rubocop/cop/standard/rails_controller_render_paths_exist.rb
-- lib/rubocop/cop/standard/rails_controller_render_shorthand.rb
-- lib/rubocop/cop/standard/rails_render_inline.rb
-- lib/rubocop/cop/standard/rails_render_object_collection.rb
-- lib/rubocop/cop/standard/rails_view_render_literal.rb
-- lib/rubocop/cop/standard/rails_view_render_paths_exist.rb
-- lib/rubocop/cop/standard/rails_view_render_shorthand.rb
+- lib/rubocop/cop/standard/rails/rails.rb
+- lib/rubocop/cop/standard/rails/rails_application_record.rb
+- lib/rubocop/cop/standard/rails/rails_controller_render_action_symbol.rb
+- lib/rubocop/cop/standard/rails/rails_controller_render_literal.rb
+- lib/rubocop/cop/standard/rails/rails_controller_render_paths_exist.rb
+- lib/rubocop/cop/standard/rails/rails_controller_render_shorthand.rb
+- lib/rubocop/cop/standard/rails/rails_render_inline.rb
+- lib/rubocop/cop/standard/rails/rails_render_object_collection.rb
+- lib/rubocop/cop/standard/rails/rails_view_render_literal.rb
+- lib/rubocop/cop/standard/rails/rails_view_render_paths_exist.rb
+- lib/rubocop/cop/standard/rails/rails_view_render_shorthand.rb
+- lib/rubocop/cop/standard/standard.rb
 homepage: https://github.com/gjtorikian/rubocop-standard
 licenses:
 - MIT

data/lib/rubocop/cop/standard.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubocop/cop/standard/rails_application_record'
-require 'rubocop/cop/standard/rails_controller_render_action_symbol'
-require 'rubocop/cop/standard/rails_controller_render_literal'
-require 'rubocop/cop/standard/rails_controller_render_paths_exist'
-require 'rubocop/cop/standard/rails_controller_render_shorthand'
-require 'rubocop/cop/standard/rails_render_inline'
-require 'rubocop/cop/standard/rails_render_object_collection'
-require 'rubocop/cop/standard/rails_view_render_literal'
-require 'rubocop/cop/standard/rails_view_render_paths_exist'
-require 'rubocop/cop/standard/rails_view_render_shorthand'

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

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubocop'
-
-module RuboCop
-  module Cop
-    module Standard
-      class RailsRenderObjectCollection < Cop
-        MSG = 'Avoid `render object:`'
-
-        def_node_matcher :render_with_options?, <<-PATTERN
-          (send nil? :render (hash $...) ...)
-        PATTERN
-
-        def_node_matcher :partial_key?, <<-PATTERN
-          (pair (sym :partial) $_)
-        PATTERN
-
-        def_node_matcher :object_key?, <<-PATTERN
-          (pair (sym ${:object :collection :spacer_template}) $_)
-        PATTERN
-
-        def on_send(node)
-          if option_pairs = render_with_options?(node)
-            partial_pair = option_pairs.detect { |pair| partial_key?(pair) }
-            object_pair  = option_pairs.detect { |pair| object_key?(pair) }
-
-            if partial_pair && object_pair
-              partial_name = partial_key?(partial_pair)
-              object_sym, object_node = object_key?(object_pair)
-
-              case object_sym
-              when :object
-                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:`')
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end