rubocop-betterment 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b851af1c0666fffea3f63f36504e7acf1c6d6324e58caba76bcea50ac752f50
-  data.tar.gz: 6dcbd29396beb9c7310f6ff9082ae9494219741fb17b6306ea976747445e337e
+  metadata.gz: bfc81280ce15b5ff44ba5f45345bf8ec461c34d4058135b2d86b2bb9a5f48600
+  data.tar.gz: fc53b65409351b9604cefff382add3a95c09ae5d98d93d3979ac935fee31c4b1
 SHA512:
-  metadata.gz: 2067d92a8d52c91b76f3f42a470f852567f858ccc34b6ba0d50b0aa2c275ef8ba7b32287bf8592efbea39e18d1a7356ef375e51ffbddd6153d1809173ff5385c
-  data.tar.gz: 8d18894011ce90246f1cdaf5a8c42043df0c6dcd7a92bf9af6407c300c9c01cdd1d2c4ebe941ed26b4eb09500b0abb45f4d59d1286ee1eb622f3a75b2003dff0
+  metadata.gz: cd1bb04b824fbc3386b0ecbe1755820aad68748aa91ad5339a92ceaac2adf08cb4d5cf4cefb7ed94fd972430b359fbb71b924bec0cad14e5d9ec87b7f1d1a96f
+  data.tar.gz: 96453a9b868b7c492712fdd733f1cf39a11e9c5a42136d663edec81405581eca70f019afca25b3c8a5801a06396379ee204bc8649286608a78322690dae28c3c

data/lib/rubocop/cop/betterment.rb

@@ -1,4 +1,5 @@
 require 'rubocop'
+require 'rubocop/cop/betterment/utils/parser'
 require 'rubocop/cop/betterment/authorization_in_controller'
 require 'rubocop/cop/betterment/dynamic_params'
 require 'rubocop/cop/betterment/unscoped_find'

data/lib/rubocop/cop/betterment/authorization_in_controller.rb

@@ -79,7 +79,7 @@ module RuboCop
           return if !node.send_type? && !node.variable?
           return if node.send_type? && (node.method_name == :[])
 
-          name = get_root_token(node)
+          name = Utils::Parser.get_root_token(node)
           add_offense(node, message: MSG_UNSAFE_CREATE) if @wrapper_names.include?(name)
         end
 
@@ -90,7 +90,7 @@ module RuboCop
           methods = get_all_methods(node)
 
           methods.map do |method|
-            method_returns = get_return_values(method)
+            method_returns = Utils::Parser.get_return_values(method)
 
             unless get_param_wrappers(method_returns).empty?
               @wrapper_methods[method.method_name] = method
@@ -114,7 +114,7 @@ module RuboCop
 
             # if rhs is a call to a parameter wrapper, eg
             # @var = parameter_wrapper
-            root_token = get_root_token(value)
+            root_token = Utils::Parser.get_root_token(value)
             if root_token && @wrapper_names.include?(root_token)
               @wrapper_methods[variable_name] = assignment
               @wrapper_names << variable_name
@@ -129,40 +129,6 @@ module RuboCop
           end
         end
 
-        def explicit_returns(node)
-          node.descendants.select(&:return_type?).map { |x|
-            x&.children&.first
-          }.compact
-        end
-
-        def get_return_values(node) # rubocop:disable Metrics/AbcSize
-          return [] unless node
-          return explicit_returns(node) + get_return_values(node.body) if node.def_type?
-          return [node] if node.literal? || node.variable?
-
-          case node.type
-            when :begin
-              get_return_values(node.children.last)
-            when :block
-              get_return_values(node.body)
-            when :if
-              if_rets = get_return_values(node.if_branch)
-              else_rets = get_return_values(node.else_branch)
-              if_rets + else_rets
-            when :case
-              cases = []
-              node.each_when do |block|
-                cases += get_return_values(block.body)
-              end
-
-              cases + get_return_values(node.else_branch)
-            when :send
-              [node]
-            else
-              []
-          end
-        end
-
         def get_all_assignments(node)
           return [] unless node.children && node.type == :class
 
@@ -184,36 +150,6 @@ module RuboCop
           end
         end
 
-        # fetches the name of the leftmost ("root") token
-        # @vars.merge(this: that).merge(etc: etc) => @vars
-        # params.permit(:this) => params
-        # params[:field] => params
-        def get_root_token(node) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize
-          return nil unless node
-
-          return get_root_token(node.receiver) if node.receiver
-
-          if node.send_type?
-            name = node.method_name
-          elsif node.variable?
-            name, = *node
-          elsif node.literal?
-            _, name = *node
-          elsif node.const_type?
-            name = node.const_name
-          elsif node.sym_type?
-            name = node.value
-          elsif node.variable?
-            name = node.children[0]
-          elsif node.parenthesized_call?
-            name = nil
-          else
-            raise "Unknown node type: #{node.type.inspect}"
-          end
-
-          name
-        end
-
         # this finds all calls to any method on a params like object
         # then walks up to find calls to permit
         # if the arguments to permit are "suspicious", then we add
@@ -266,7 +202,7 @@ module RuboCop
           _receiver_node, method_name, *arg_nodes = *argument
           return unless argument.send_type? && method_name == :[]
 
-          argument_name = get_root_token(argument)
+          argument_name = Utils::Parser.get_root_token(argument)
 
           if param_symbol?(argument_name) || @wrapper_names.include?(argument_name)
             arg_nodes.find do |arg|

data/lib/rubocop/cop/betterment/dynamic_params.rb

@@ -15,7 +15,7 @@ module RuboCop
 
         def on_send(node)
           _, _, *arg_nodes = *node
-          return unless permit_or_hash?(node) && get_root_token(node) == :params
+          return unless permit_or_hash?(node) && Utils::Parser.get_root_token(node) == :params
 
           dynamic_param = find_dynamic_param(arg_nodes)
           add_offense(dynamic_param, message: MSG_DYNAMIC_PARAMS) if dynamic_param
@@ -30,32 +30,6 @@ module RuboCop
             arg.type == :array && find_dynamic_param(arg.values) || !arg.literal? && !arg.const_type?
           end
         end
-
-        def get_root_token(node) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize
-          return nil unless node
-
-          return get_root_token(node.receiver) if node.receiver
-
-          if node.send_type?
-            name = node.method_name
-          elsif node.variable?
-            name, = *node
-          elsif node.literal?
-            _, name = *node
-          elsif node.const_type?
-            name = node.const_name
-          elsif node.sym_type?
-            name = node.value
-          elsif node.variable?
-            name = node.children[0]
-          elsif node.parenthesized_call?
-            name = nil
-          else
-            raise "Unknown node type: #{node.type.inspect}"
-          end
-
-          name
-        end
       end
     end
   end

data/lib/rubocop/cop/betterment/unscoped_find.rb

@@ -31,7 +31,7 @@ module RuboCop
         def initialize(config = nil, options = nil)
           super(config, options)
           config = @config.for_cop(self)
-          @unauthenticated_models = config.fetch("unauthenticated_models", [])
+          @unauthenticated_models = config.fetch("unauthenticated_models", []).map(&:to_sym)
         end
 
         def on_send(node)
@@ -41,7 +41,7 @@ module RuboCop
                 find?(node) ||
                 custom_scope_find?(node) ||
                 static_method_name(node.method_name)
-            ) && !@unauthenticated_models.include?(get_root_token(node))
+            ) && !@unauthenticated_models.include?(Utils::Parser.get_root_token(node))
 
           add_offense(node, message: MSG) if find_param_arg(arg_nodes)
         end
@@ -55,10 +55,10 @@ module RuboCop
             if arg.type == :hash
               arg.children.each do |pair|
                 _key, value = *pair.children
-                return arg if get_root_token(value) == :params
+                return arg if Utils::Parser.get_root_token(value) == :params
               end
             end
-            get_root_token(arg) == :params
+            Utils::Parser.get_root_token(arg) == :params
           end
         end
 
@@ -69,32 +69,6 @@ module RuboCop
 
           match[2] ? 'find_by!' : 'find_by'
         end
-
-        def get_root_token(node) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize
-          return nil unless node
-
-          return get_root_token(node.receiver) if node.receiver
-
-          if node.send_type?
-            name = node.method_name
-          elsif node.variable?
-            name, = *node
-          elsif node.literal?
-            _, name = *node
-          elsif node.const_type?
-            name = node.const_name
-          elsif node.sym_type?
-            name = node.value
-          elsif node.variable?
-            name = node.children[0]
-          elsif node.parenthesized_call?
-            name = nil
-          else
-            raise "Unknown node type: #{node.type.inspect}"
-          end
-
-          name
-        end
       end
     end
   end

data/lib/rubocop/cop/betterment/utils/parser.rb

@@ -0,0 +1,69 @@
+module RuboCop
+  module Cop
+    module Utils
+      module Parser
+        def self.get_root_token(node) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
+          return nil unless node
+
+          return get_root_token(node.receiver) if node.receiver
+
+          if node.send_type?
+            name = node.method_name
+          elsif node.variable?
+            name, = *node
+          elsif node.literal?
+            _, name = *node
+          elsif node.const_type?
+            name = node.const_name.to_sym
+          elsif node.sym_type?
+            name = node.value
+          elsif node.variable?
+            name = node.children[0]
+          elsif node.self_type?
+            name = :self
+          elsif node.block_pass_type?
+            name, = *node.children
+          else
+            name = nil
+          end
+
+          name
+        end
+
+        def self.get_return_values(node) # rubocop:disable Metrics/AbcSize
+          return [] unless node
+          return explicit_returns(node) + get_return_values(node.body) if node.def_type?
+          return [node] if node.literal? || node.variable?
+
+          case node.type
+            when :begin
+              get_return_values(node.children.last)
+            when :block
+              get_return_values(node.body)
+            when :if
+              if_rets = get_return_values(node.if_branch)
+              else_rets = get_return_values(node.else_branch)
+              if_rets + else_rets
+            when :case
+              cases = []
+              node.each_when do |block|
+                cases += get_return_values(block.body)
+              end
+
+              cases + get_return_values(node.else_branch)
+            when :send
+              [node]
+            else
+              []
+          end
+        end
+
+        def self.explicit_returns(node)
+          node.descendants.select(&:return_type?).map { |x|
+            x&.children&.first
+          }.compact
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-betterment
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Development
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -100,6 +100,7 @@ files:
 - lib/rubocop/cop/betterment/spec_helper_required_outside_spec_dir.rb
 - lib/rubocop/cop/betterment/timeout.rb
 - lib/rubocop/cop/betterment/unscoped_find.rb
+- lib/rubocop/cop/betterment/utils/parser.rb
 homepage: 
 licenses:
 - MIT
@@ -119,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Betterment rubocop configuration