sevencop 0.26.2 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b77d2e545ac1a1e5b85a636130c793c0268ff8740636b7a8a99e419d1991477d
-  data.tar.gz: df0ee08ada7246f370bb32da744ea1d2482fb196eb103de0ea2546ad433517aa
+  metadata.gz: 9a2d0d56a1f5cbd0bc259bf81abbd5f2120f0a79e535ff9fafe6793de262dfb0
+  data.tar.gz: a43deda18fed1e061b3442a4bfb6ed27f7af6b71522adde160fe530326462722
 SHA512:
-  metadata.gz: b1eaf0aea17f94ec3cdada0afc664724104d3da9abf190ea11ada7db715f39175bbc3471046af08dfc71fa5fe6841a8678becd8d9b4b85d9f2f3a071af491ed0
-  data.tar.gz: 5c2419f1ea701a95478a872c57f40e0a8af77cdf85f2ae154f4e75ae7a0e1981d7da7fe0d57152a20ee96937f4cdb7f2aff2c431a94ea1fb222203891d74ce69
+  metadata.gz: f4888e9cd333099c4ec83c9d0b71349572ad471f4788efe1d8eee377f10286eb6d5c8534e6bb427ad52303f5fcf24e77fc7f3df9aab9ebc35ac726e0098b940f
+  data.tar.gz: 1cc3e089fa3e922131dd91e4e2c1c7fa6f835a1619bc8c9234f7f86af4e677a0d033583ea8f4eb1cfc3f1da5abc93222eb8506749c616c434350275a18859af0

data/.rubocop.yml

@@ -32,7 +32,9 @@ RSpec/ExampleLength:
 RSpec/FilePath:
   CustomTransform:
     RSpecDescribeHttpEndpoint: rspec_describe_http_endpoint
+    RSpecEmptyLineAfterLet: rspec_empty_line_after_let
     RSpecExamplesInSameGroup: rspec_examples_in_same_group
+    RSpecMemoizedHelperBlockDelimiter: rspec_memoized_helper_block_delimiter
 
 RSpec/MultipleExpectations:
   Enabled: false

data/Gemfile.lock

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

data/README.md

@@ -45,7 +45,9 @@ Note that all cops are `Enabled: false` by default.
 - [Sevencop/RailsWhereNot](lib/rubocop/cop/sevencop/rails_where_not.rb)
 - [Sevencop/RequireOrdered](lib/rubocop/cop/sevencop/require_ordered.rb)
 - [Sevencop/RSpecDescribeHttpEndpoint](lib/rubocop/cop/sevencop/rspec_describe_http_endpoint.rb)
+- [Sevencop/RSpecEmptyLineAfterLet](lib/rubocop/cop/sevencop/rspec_empty_line_after_let.rb)
 - [Sevencop/RSpecExamplesInSameGroup](lib/rubocop/cop/sevencop/rspec_examples_in_same_group.rb)
+- [Sevencop/RSpecMemoizedHelperBlockDelimiter](lib/rubocop/cop/sevencop/rspec_memoized_helper_block_delimiter.rb)
 
 ## Notes
 

data/config/default.yml

@@ -141,6 +141,14 @@ Sevencop/RSpecDescribeHttpEndpoint:
   Include:
     - spec/requests/**/*.rb
 
+Sevencop/RSpecEmptyLineAfterLet:
+  Description: |
+    Insert empty line after `let`.
+  Enabled: false
+  VersionAdded: '0.27'
+  Include:
+    - spec/**/*
+
 Sevencop/RSpecExamplesInSameGroup:
   Description: |
     Combine examples in the same groups in the time-consuming kinds of specs.
@@ -150,3 +158,11 @@ Sevencop/RSpecExamplesInSameGroup:
   Include:
     - spec/controllers/**/*
     - spec/requests/**/*
+
+Sevencop/RSpecMemoizedHelperBlockDelimiter:
+  Description: |
+    Use do-end block delimiter on RSpec memoized helper.
+  Enabled: false
+  VersionAdded: '0.27'
+  Include:
+    - spec/**/*

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

@@ -8,7 +8,7 @@ module RuboCop
       # Prefer ActiveSupport date and time helper.
       #
       # @safety
-      #   This cop is unsafe becuase it considers that `n.days` is a Duration,
+      #   This cop is unsafe because it considers that `n.days` is a Duration,
       #   and `date` in `date == Date.current` is a Date, but there is no guarantee.
       #
       # @example

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

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+require 'set'
+
+module RuboCop
+  module Cop
+    module Sevencop
+      # Insert empty line after `let`.
+      #
+      # Since `let` defines a method, it should be written in the same style as `def`.
+      #
+      # @example
+      #   # bad
+      #   context 'with something' do
+      #     let(:foo) do
+      #       'foo'
+      #     end
+      #     let(:bar) do
+      #       'bar'
+      #     end
+      #   end
+      #
+      #   # good
+      #   context 'with something' do
+      #     let(:foo) do
+      #       'foo'
+      #     end
+      #
+      #     let(:bar) do
+      #       'bar'
+      #     end
+      #   end
+      #
+      #   # good
+      #   context 'with something' do
+      #     let(:foo) do
+      #       'foo'
+      #     end
+      #   end
+      class RSpecEmptyLineAfterLet < Base
+        extend AutoCorrector
+
+        MSG = 'Insert empty line after `let`.'
+
+        # @param node [RuboCop::AST::BlockNode]
+        # @return [void]
+        def on_block(node) # rubocop:disable InternalAffairs/NumblockHandler
+          return unless bad?(node)
+
+          add_offense(node) do |corrector|
+            corrector.insert_after(node.location.end, "\n")
+          end
+        end
+
+        private
+
+        # @!method let?(node)
+        #   @param node [RuboCop::AST::BlockNode]
+        #   @return [Boolean]
+        def_node_matcher :let?, <<~PATTERN
+          (block
+            (send
+              nil?
+              {:let :let!}
+              ...
+            )
+            ...
+          )
+        PATTERN
+
+        # @param node [RuboCop::AST::BlockNode]
+        # @return [Boolean]
+        def bad?(node)
+          let?(node) &&
+            !empty_line_after?(node) &&
+            !last_child?(node)
+        end
+
+        # @param node [RuboCop::AST::BlockNode]
+        # @return [Boolean]
+        def empty_line_after?(node)
+          processed_source[node.location.end.line].strip.empty?
+        end
+
+        # @param node [RuboCop::AST::BlockNode]
+        # @return [Boolean]
+        def last_child?(node)
+          !node.parent&.begin_type? ||
+            node.equal?(node.parent.children.last)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require 'set'
+
+module RuboCop
+  module Cop
+    module Sevencop
+      # Use do-end block delimiter on RSpec memoized helper.
+      #
+      # Since these helpers define methods, they should be written in the same style as `def`.
+      #
+      # @example
+      #   # bad
+      #   let(:foo) { 'bar' }
+      #
+      #   # good
+      #   let(:foo) do
+      #     'bar'
+      #   end
+      #
+      #   # bad
+      #   subject(:foo) { 'bar' }
+      #
+      #   # good
+      #   subject(:foo) do
+      #     'bar'
+      #   end
+      class RSpecMemoizedHelperBlockDelimiter < Base
+        extend AutoCorrector
+
+        include ConfigurableEnforcedStyle
+        include RangeHelp
+
+        MSG = 'Use do-end block delimiter on RSpec memoized helper.'
+
+        # @param node [RuboCop::AST::BlockNode]
+        # @return [void]
+        def on_block(node) # rubocop:disable InternalAffairs/NumblockHandler
+          return unless bad?(node)
+
+          add_offense(
+            node.location.begin.with(
+              end_pos: node.location.end.end_pos
+            )
+          ) do |corrector|
+            autocorrect(corrector, node)
+          end
+        end
+
+        private
+
+        # @!method memoized_helper?(node)
+        #   @param node [RuboCop::AST::Node]
+        #   @return [Boolean]
+        def_node_matcher :memoized_helper?, <<~PATTERN
+          (block
+            (send
+              nil?
+              {
+                :let
+                :let!
+                :subject
+              }
+              ...
+            )
+            ...
+          )
+        PATTERN
+
+        # @param corrector [RuboCop::Cop::Corrector]
+        # @param node [RuboCop::AST::BlockNode]
+        # @return [void]
+        def autocorrect(
+          corrector,
+          node
+        )
+          corrector.insert_before(node.location.begin, ' ') unless whitespace_before?(node.location.begin)
+          corrector.replace(node.location.begin, 'do')
+          corrector.replace(node.location.end, 'end')
+          wrap_in_newlines(corrector, node) if node.single_line?
+        end
+
+        # @param node [RuboCop::AST::BlockNode]
+        # @return [Boolean]
+        def bad?(node)
+          memoized_helper?(node) && node.braces?
+        end
+
+        # @param range [Parser::Source::Range]
+        # @return [Boolean]
+        def whitespace_before?(range)
+          range.source_buffer.source[range.begin_pos - 1].match?(/\s/)
+        end
+
+        # @param corrector [RuboCop::Cop::Corrector]
+        # @param node [RuboCop::AST::BlockNode]
+        # @return [void]
+        def wrap_in_newlines(
+          corrector,
+          node
+        )
+          corrector.wrap(
+            node.location.begin.with(
+              begin_pos: node.location.begin.end_pos,
+              end_pos: node.location.end.begin_pos
+            ),
+            "\n",
+            "\n"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/sevencop/version.rb

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

data/lib/sevencop.rb

@@ -21,4 +21,6 @@ require_relative 'rubocop/cop/sevencop/rails_uniqueness_validator_explicit_case_
 require_relative 'rubocop/cop/sevencop/rails_where_not'
 require_relative 'rubocop/cop/sevencop/require_ordered'
 require_relative 'rubocop/cop/sevencop/rspec_describe_http_endpoint'
+require_relative 'rubocop/cop/sevencop/rspec_empty_line_after_let'
 require_relative 'rubocop/cop/sevencop/rspec_examples_in_same_group'
+require_relative 'rubocop/cop/sevencop/rspec_memoized_helper_block_delimiter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sevencop
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.27.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -73,7 +73,9 @@ files:
 - lib/rubocop/cop/sevencop/rails_where_not.rb
 - lib/rubocop/cop/sevencop/require_ordered.rb
 - lib/rubocop/cop/sevencop/rspec_describe_http_endpoint.rb
+- lib/rubocop/cop/sevencop/rspec_empty_line_after_let.rb
 - lib/rubocop/cop/sevencop/rspec_examples_in_same_group.rb
+- lib/rubocop/cop/sevencop/rspec_memoized_helper_block_delimiter.rb
 - lib/sevencop.rb
 - lib/sevencop/config_loader.rb
 - lib/sevencop/cop_concerns.rb