RubyGems - rubocop - Versions diffs - 0.43.0 → 0.44.0 - Mend

rubocop 0.43.0 → 0.44.0

Potentially problematic release.

This version of rubocop might be problematic. Click here for more details.

Files changed (430) hide show

data/lib/rubocop/cop/rails/not_null_column.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop
@@ -15,7 +14,7 @@ module RuboCop
       #   add_column :users, :name, :string, null: true
       #   add_column :users, :name, :string, null: false, default: ''
       class NotNullColumn < Cop
-        MSG = 'Do not add a NOT NULL column without a default value'.freeze
+        MSG = 'Do not add a NOT NULL column without a default value.'.freeze
         def_node_matcher :add_not_null_column?, <<-PATTERN
           (send nil :add_column _ _ _ (hash $...))

data/lib/rubocop/cop/rails/output.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/rails/output_safety.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop
@@ -28,7 +27,7 @@ module RuboCop
       #
       class OutputSafety < Cop
         MSG = 'Tagging a string as html safe may be a security risk, ' \
-              'prefer `safe_join` or other Rails tag helpers instead'.freeze
+              'prefer `safe_join` or other Rails tag helpers instead.'.freeze
         def on_send(node)
           receiver, method_name, *_args = *node

data/lib/rubocop/cop/rails/pluralization_grammar.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/rails/read_write_attribute.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/rails/request_referer.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/rails/safe_navigation.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/rails/save_bang.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop
@@ -82,6 +81,7 @@ module RuboCop
           return unless expected_signature?(node)
           return if return_value_assigned?(node)
           return if check_used_in_conditional(node)
+          return if last_call_of_method?(node)
           add_offense(node, node.loc.selector,
                       format(MSG,
@@ -112,8 +112,7 @@ module RuboCop
         end
         def check_used_in_conditional(node)
-          return false unless node.parent
-          return false unless node.parent.if_type? && node.sibling_index.zero?
+          return false unless conditional?(node)
           unless MODIFY_PERSIST_METHODS.include?(node.method_name)
             add_offense(node, node.loc.selector,
@@ -124,6 +123,16 @@ module RuboCop
           true
         end
+        def conditional?(node)
+          node.parent && (node.parent.if_type? && node.sibling_index.zero? ||
+            conditional?(node.parent))
+        end
+        def last_call_of_method?(node)
+          !node.parent.nil? &&
+            node.parent.children.count == node.sibling_index + 1
+        end
         # Ignore simple assignment or if condition
         def return_value_assigned?(node)
           return false unless node.parent

data/lib/rubocop/cop/rails/scope_args.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/rails/time_zone.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/rails/uniq_before_pluck.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop
@@ -36,7 +35,7 @@ module RuboCop
       # false positives.
       #
       class UniqBeforePluck < RuboCop::Cop::Cop
-        MSG = 'Use `%s` before `pluck`'.freeze
+        MSG = 'Use `%s` before `pluck`.'.freeze
         NEWLINE = "\n".freeze
         PATTERN = '[!^block (send (send %s :pluck ...) ${:uniq :distinct} ...)]'
                   .freeze

data/lib/rubocop/cop/rails/validation.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/security/json_load.rb CHANGED

@@ -1,10 +1,18 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop
   module Cop
     module Security
-      # This cop checks for the use of unsecure JSON methods.
+      # This cop checks for the use of JSON class methods which have potential
+      # security issues.
+      #
+      # Autocorrect is disabled by default because it's potentially dangerous.
+      # If using a stream, like `JSON.load(open('file'))`, it will need to call
+      # `#read` manually, like `JSON.parse(open('file').read)`.
+      # If reading single values (rather than proper JSON objects), like
+      # `JSON.load('false')`, it will need to pass the `quirks_mode: true`
+      # option, like `JSON.parse('false', quirks_mode: true)`.
+      # Other similar issues may apply.
       #
       # @example
       #   # always offense
@@ -15,7 +23,7 @@ module RuboCop
       #   JSON.parse("{}")
       #
       class JSONLoad < Cop
-        MSG = 'Prefer `JSON.parse` instead of `JSON#%s`.'.freeze
+        MSG = 'Prefer `JSON.parse` over `JSON.%s`.'.freeze
         def_node_matcher :json_load, <<-END
           (send (const nil :JSON) ${:load :restore} ...)

data/lib/rubocop/cop/severity.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/access_modifier_indentation.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/accessor_method_name.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/alias.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/align_array.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/align_hash.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/align_parameters.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/and_or.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/array_join.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/ascii_comments.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/ascii_identifiers.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/attr.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/auto_resource_cleanup.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/bare_percent_literals.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/begin_block.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/block_comments.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/block_delimiters.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/block_end_newline.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/braces_around_hash_parameters.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/case_equality.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/case_indentation.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/character_literal.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/class_and_module_camel_case.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/class_and_module_children.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/class_check.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/class_methods.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/class_vars.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/closing_parenthesis_indentation.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/collection_methods.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/colon_method_call.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/command_literal.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/comment_annotation.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/comment_indentation.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/conditional_assignment.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/constant_name.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/copyright.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/def_with_parentheses.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/documentation.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/documentation_method.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop
   module Cop

data/lib/rubocop/cop/style/dot_position.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/double_negation.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/each_for_simple_loop.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/each_with_object.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/else_alignment.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/empty_case_condition.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop

data/lib/rubocop/cop/style/empty_else.rb CHANGED

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 module RuboCop
@@ -111,16 +110,18 @@ module RuboCop
           return false if autocorrect_forbidden?(node.type.to_s)
           lambda do |corrector|
-            end_pos = if node.loc.end
-                        node.loc.end.begin_pos
-                      else
-                        node.parent.loc.end.begin_pos
-                      end
+            end_pos = base_if_node(node).loc.end.begin_pos
             corrector.remove(range_between(node.loc.else.begin_pos, end_pos))
           end
         end
+        def base_if_node(node)
+          parent_node = node
+          parent_node = parent_node.parent until parent_node.loc.end
+          parent_node
+        end
         def autocorrect_forbidden?(type)
           [type, 'both'].include? missing_else_style
         end