sevencop 0.26.0 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b03712edc9d72494a99f77fe83b616b83314f1b72347dd96fbe30d3ecb66508
-  data.tar.gz: bf06a9f54c5dfea1d64c357d70e14287b389efe7f26474c87355e38ab7bc5736
+  metadata.gz: b77d2e545ac1a1e5b85a636130c793c0268ff8740636b7a8a99e419d1991477d
+  data.tar.gz: df0ee08ada7246f370bb32da744ea1d2482fb196eb103de0ea2546ad433517aa
 SHA512:
-  metadata.gz: 260701a809a5b831e985ff159550b62bec1e0801c80dbfd7ed79a55ab9297307512116c6cc96161bdf374a8afcd350ea993543b335d5621f296d5d2bbdc451d1
-  data.tar.gz: 894f7f028033cf169c1f5576b29418245dfbe052f6e088e5f5a021c040fef68ab9784f969a98c17287ebbfe5832d79f2d107fd932b5d1f0953c04c07d8f6f07a
+  metadata.gz: b1eaf0aea17f94ec3cdada0afc664724104d3da9abf190ea11ada7db715f39175bbc3471046af08dfc71fa5fe6841a8678becd8d9b4b85d9f2f3a071af491ed0
+  data.tar.gz: 5c2419f1ea701a95478a872c57f40e0a8af77cdf85f2ae154f4e75ae7a0e1981d7da7fe0d57152a20ee96937f4cdb7f2aff2c431a94ea1fb222203891d74ce69

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sevencop (0.26.0)
+    sevencop (0.26.2)
       activesupport
       rubocop
 

data/lib/rubocop/cop/sevencop/rails_date_and_time_calculation.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'set'
+
 module RuboCop
   module Cop
     module Sevencop
@@ -425,10 +427,9 @@ module RuboCop
         )
           corrector.replace(
             node,
-            format(
-              '%<time>s.%<helper_method_name>s',
-              helper_method_name: helper_method_name_for_comparison(node),
-              time: find_comparison_subject_to_time_current(node).source
+            format_to_method_call(
+              method: helper_method_name_for_comparison(node),
+              receiver: find_comparison_subject_to_time_current(node)
             )
           )
         end
@@ -444,10 +445,9 @@ module RuboCop
         )
           corrector.replace(
             node,
-            format(
-              '%<duration>s.%<helper_method_name>s',
-              duration: node.first_argument.source,
-              helper_method_name: helper_method_name
+            format_to_method_call(
+              method: helper_method_name,
+              receiver: node.first_argument
             )
           )
         end
@@ -465,10 +465,9 @@ module RuboCop
         )
           corrector.replace(
             node,
-            format(
-              '%<date>s.%<helper_method_name>s',
-              date: find_equality_subject_to_date_with(node, date_method_name).source,
-              helper_method_name: helper_method_name
+            format_to_method_call(
+              method: helper_method_name,
+              receiver: find_equality_subject_to_date_with(node, date_method_name)
             )
           )
         end
@@ -701,6 +700,14 @@ module RuboCop
           end
         end
 
+        # Determine whether this node should be enclosed in parentheses
+        # when it is used as a receiver of a method call in autocorrection.
+        # @param node [RuboCop::AST::Node]
+        # @return [Boolean]
+        def enclose_by_parentheses?(node)
+          node.send_type? && node.operator_method?
+        end
+
         # @param node [RuboCop::AST::SendNode]
         # @param method_name [Symbol]
         # @return [Boolean]
@@ -736,6 +743,18 @@ module RuboCop
           end
         end
 
+        # @param receiver [RuboCop::AST::Node]
+        # @param method [String]
+        # @return [String]
+        def format_to_method_call(
+          method:,
+          receiver:
+        )
+          receiver_source = receiver.source
+          receiver_source = "(#{receiver_source})" if enclose_by_parentheses?(receiver)
+          [receiver_source, method].join('.')
+        end
+
         # @param node [RuboCop::AST::SendNode]
         # @return [Symbol]
         def helper_method_name_for_comparison(node)

data/lib/sevencop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sevencop
-  VERSION = '0.26.0'
+  VERSION = '0.26.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sevencop
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.26.2
 platform: ruby
 authors:
 - Ryo Nakamura