rubocop-elegant 0.0.18 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 428395f6329a8a67d9c9eaab7b2ccd7accf953b4e84d8f1998b0979de7f24a8d
-  data.tar.gz: 9d22137083069baf655d62792de5ef2b52e5a1c4e04f5b17351521b38580902f
+  metadata.gz: 68c6e6f486a9804d01f7be2db7087ed14501cec590250e50b89d32511c3cce97
+  data.tar.gz: f654452715b5e92d85fe3d3e410aca24858a9f28ce25ece59103d66bd3f27582
 SHA512:
-  metadata.gz: 3557adeb02af11e41004fb80c02c6c396990b0926a22d03f6771f9dc7034e0a1dc5edfa831ec16fe74326cafd76d8bbacc03c8a767f2d53f776d5e644c4c3c12
-  data.tar.gz: 866970ed181656f0e1f854e280042b24f3ed83c903fac827c646c79372d1c83903fd2d5a0eca8215e5e32911f76cd475ed37950b4c489f913729a7c77bd3f252
+  metadata.gz: af01d8551f274a0c56e69f3caed9097d7db6ffe55d7be9519ba7ea8fc169c6a484eba3e5d5af64e0788eb690d5bd4d155034d60d1d473de6a86bfa4baba480d9
+  data.tar.gz: f58fb9bbbb83617de532b7ac4712d3089fc61548d43040235cef7bbf46e533a6a5b9d0477b6c2c2124bde2a6b1adcb02eac99f8cec5edcbf0e3831c632e3a620

data/config/default.yml

@@ -12,6 +12,10 @@ Elegant/NoEmptyLinesInMethods:
   Description: 'Disallows empty lines inside method bodies'
   Enabled: true
   VersionAdded: '0.0.2'
+Elegant/NoEmptyLinesInBlocks:
+  Description: 'Disallows empty lines inside blocks (do/end, if/end, while, case, begin, etc.)'
+  Enabled: true
+  VersionAdded: '0.0.19'
 Elegant/GoodVariableName:
   Description: 'Checks that variable names match the configured pattern'
   Enabled: true
@@ -22,7 +26,7 @@ Elegant/GoodMethodName:
   Description: 'Checks that method names match the configured pattern'
   Enabled: true
   VersionAdded: '0.0.3'
-  Pattern: '^(((to|fake|the|with|without|on)_)?[a-z]{1,16}[!?]?|test_[a-z_]+)$'
+  Pattern: '^(((to|fake|the|with|without)_)?[a-z]{1,16}[!?]?|(on|test)_[a-z_]+)$'
   AllowedNames: []
 
 Style/RedundantException:

data/lib/rubocop/cop/elegant/no_comments.rb

@@ -12,13 +12,11 @@ module RuboCop
         MSG = 'Comment is not allowed, unless it is SPDX, magic, rubocop directive, or docblock'
         public_constant :MSG
 
-        # rubocop:disable Elegant/GoodMethodName
         def on_new_investigation
           processed_source.comments.each do |comment|
             register(comment) unless allowed?(comment)
           end
         end
-        # rubocop:enable Elegant/GoodMethodName
 
         private
 

data/lib/rubocop/cop/elegant/no_empty_lines_in_blocks.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+module RuboCop
+  module Cop
+    module Elegant
+      class NoEmptyLinesInBlocks < Base
+        extend AutoCorrector
+
+        MSG = 'Empty line inside block body is not allowed'
+        public_constant :MSG
+
+        def on_new_investigation
+          super
+          @reported = []
+          @gaps = scan
+        end
+
+        def on_block(node)
+          check(node)
+        end
+
+        def on_numblock(node)
+          check(node)
+        end
+
+        def on_if(node)
+          check(node)
+        end
+
+        def on_while(node)
+          check(node)
+        end
+
+        def on_until(node)
+          check(node)
+        end
+
+        def on_for(node)
+          check(node)
+        end
+
+        def on_case(node)
+          check(node)
+        end
+
+        def on_case_match(node)
+          check(node)
+        end
+
+        def on_kwbegin(node)
+          check(node)
+        end
+
+        private
+
+        def check(node)
+          lines = range(node)
+          return if lines.nil?
+          empty(lines).each { |num| register(num) }
+        end
+
+        def range(node)
+          first = node.first_line + 1
+          last = node.last_line - 1
+          return if first > last
+          (first..last)
+        end
+
+        def empty(lines)
+          result = []
+          lines.each do |num|
+            next if @gaps.include?(num)
+            line = processed_source.lines[num - 1]
+            result << num if line.strip.empty?
+          end
+          result
+        end
+
+        def scan
+          gaps = []
+          ast = processed_source.ast
+          return gaps if ast.nil?
+          ast.each_node(:def, :defs) do |node|
+            nxt = node.right_sibling
+            next unless nxt.is_a?(RuboCop::AST::Node)
+            next unless %i[def defs].include?(nxt.type)
+            first = node.last_line + 1
+            last = nxt.first_line - 1
+            next if first > last
+            (first..last).each { |n| gaps << n }
+          end
+          gaps
+        end
+
+        def register(num)
+          return if @reported.include?(num)
+          @reported << num
+          target = processed_source.buffer.line_range(num)
+          add_offense(target) do |corrector|
+            corrector.remove(fullrange(target))
+          end
+        end
+
+        def fullrange(target)
+          ending = target.end_pos
+          ending += 1 if processed_source.buffer.source[ending] == "\n"
+          target.with(end_pos: ending)
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/elegant_cops.rb

@@ -6,4 +6,5 @@ require_relative 'elegant/good_variable_name'
 # SPDX-License-Identifier: MIT
 
 require_relative 'elegant/no_comments'
+require_relative 'elegant/no_empty_lines_in_blocks'
 require_relative 'elegant/no_empty_lines_in_methods'

data/rubocop-elegant.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to?(:required_rubygems_version=)
   s.required_ruby_version = '>=2.2'
   s.name = 'rubocop-elegant'
-  s.version = '0.0.18'
+  s.version = '0.0.20'
   s.license = 'MIT'
   s.summary = 'Set of custom RuboCop cops for elegant Ruby coding'
   s.description =

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-elegant
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.20
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -56,6 +56,7 @@ files:
 - lib/rubocop/cop/elegant/good_method_name.rb
 - lib/rubocop/cop/elegant/good_variable_name.rb
 - lib/rubocop/cop/elegant/no_comments.rb
+- lib/rubocop/cop/elegant/no_empty_lines_in_blocks.rb
 - lib/rubocop/cop/elegant/no_empty_lines_in_methods.rb
 - lib/rubocop/cop/elegant_cops.rb
 - lib/rubocop/elegant/plugin.rb