rubocop-socketry 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dacbb6af420eedc76cec483085c0bac470416faf318a2ddaee52980c3a43f59
-  data.tar.gz: 4f128fdca62a037f273ee0ab534446e08df7b97bd578b6ca50f287f3f63e8d43
+  metadata.gz: 36f3f182b831bb4fbae7b9eddb5504cecb05d10616de4b25307d83baa9e578e1
+  data.tar.gz: a12e31b5ad9834c890ecc20afd9d443ba0b6a760078ee4a5550e63b731e45c4e
 SHA512:
-  metadata.gz: b87895050fdfd00301e6f3f33bd742f87f6ffcc46963f33f33df285e7f8d3e9079b24fb6be8aee2352c697df1d36d7fddf9cca90e9453da047b3fad2cd5208ab
-  data.tar.gz: 0b21c56b058e9a97716e37846c52238afb798d5b584f6920820706aa93e11b41a5f1e5258b5171d7842c943916d9b93b53b9674e4c4a0f1e9fd016f2d7ba9839
+  metadata.gz: ffe0bfaa3a740753d590f0852f87374976c0a76e931d0184f63fc553f37a4c5547838d6ab1103f658fecdc4cc3c2a7c30502e813f7987e0dad25d3f4e86ac74f
+  data.tar.gz: c1b77f49c5bdb0fee928666a1f9436b37ae2d38f35cc17fc5aa274034cd61a31002d7435caf9d4e308fe49ed871e28987d3a9355a255c00c9ec1c06047d4afbe

data/lib/rubocop/socketry/layout/block_delimiter_spacing.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2025-2026, by Samuel Williams.
+# Copyright, 2025, by Samuel Williams.
 
 require "rubocop"
 
@@ -81,28 +81,30 @@ module RuboCop
 				
 				# Check if the block is part of an expression (not a top-level statement)
 				# Top-level statements are directly inside a :begin node (file/method body)
-				# or inside do...end block bodies, and should have space.
-				# Everything else (expressions, nested arguments, etc.) should not have space.
+				# and should have space. Everything else (expressions, nested blocks) should not.
 				def part_of_expression?(node)
 					parent = node.parent
 					return false unless parent
 					
-					# If parent is a :begin node (sequence of statements), this is top-level
-					return false if parent.type == :begin
-					
-					# If parent is a :block node, check if it's a do...end block
-					# do...end blocks contain statements (no space)
-					# {...} blocks contain expressions (space required)
-					if parent.type == :block
-						# do...end blocks use keywords, {...} blocks use braces
-						return false unless parent.braces?
+					case parent.type
+					when :begin
+						# Sequence of statements — this is a top-level statement.
+						false
+					when :block, :numblock
+						# When a block is the sole body statement of an outer block there is no
+						# :begin wrapper; the outer block node is the direct parent.
+						# Only the body slot counts as a statement context, and only when the
+						# outer block itself spans multiple lines (e.g. a do…end describe/context
+						# block).  Single-line inline blocks (`foo {bar{baz}}`) keep their
+						# compact style.
+						parent.body == node ? !parent.multiline? : true
+					when :def, :defs, :class, :module, :sclass
+						# Same situation for method / class / module bodies with a single
+						# statement — they are always multi-line in practice.
+						parent.body != node
+					else
+						true
 					end
-					
-					# Check if we're in a :kwbegin node (begin...end block body)
-					return false if parent.type == :kwbegin
-					
-					# Otherwise, it's part of an expression (assignment, argument, etc.)
-					true
 				end
 				
 				# Check that there's no space before the opening brace for lambdas

data/lib/rubocop/socketry/layout/consistent_blank_line_indentation.rb

@@ -61,6 +61,7 @@ module RuboCop
 						# Check blank lines for correct indentation:
 						if line.strip.empty?
 							expected_indentation = indentation(current_level)
+							
 							if line != expected_indentation
 								add_offense(
 									source_range(processed_source.buffer, line_number, 0, line.length),
@@ -84,9 +85,13 @@ module RuboCop
 				# This method walks the AST to identify where indentation should increase or decrease.
 				# @returns [Hash(Integer, Integer)] A hash where keys are line numbers and values are deltas.
 				def build_indentation_deltas
-					deltas = Hash.new(0)
-					walk_ast_for_indentation(processed_source.ast, deltas)
-					deltas
+					Hash.new(0).tap do |deltas|
+						walk_ast_for_indentation(processed_source.ast, deltas)
+						
+						# Cap deltas to a maximum of +1 or -1 per line to handle cases where
+						# multiple structures open/close on the same line (e.g., `[..., {`)
+						deltas.transform_values!{|delta| delta.nil? ? nil : delta.clamp(-1, 1)}
+					end
 				end
 				
 				STRUCTURAL_NODES = [:array, :hash, :class, :module, :sclass, :def, :defs, :if, :if, :while, :until, :for, :case, :kwbegin, :regexp]

data/lib/rubocop/socketry/version.rb

@@ -5,6 +5,6 @@
 
 module RuboCop
 	module Socketry
-		VERSION = "0.8.0"
+		VERSION = "0.10.0"
 	end
 end 

data/readme.md

@@ -27,6 +27,16 @@ Layout/ConsistentBlankLineIndentation:
 
 Please see the [project releases](https://socketry.github.io/rubocop-socketry/releases/index) for all releases.
 
+### v0.10.0
+
+  - Fixed `Layout/BlockDelimiterSpacing` to correctly treat a block as a statement (requiring space before `{`) when it is the sole body of a multi-line outer block or method/class/module definition. Previously, the absence of a `:begin` wrapper in the AST caused such blocks (e.g. `Async {foo}` or `let(:bar) {baz}` inside a `describe`/`context` block) to be misclassified as expression-context and have their space incorrectly removed.
+  - Single-line inline outer blocks (e.g. `foo {bar{baz}}`) continue to use compact style with no space before the inner brace.
+
+### v0.9.0
+
+  - Fixed `Layout/ConsistentBlankLineIndentation` to correctly handle files containing multiple blocks.
+  - Expanded `Layout/BlockDelimiterSpacing` test coverage to include method chaining scenarios.
+
 ### v0.8.0
 
   - Fixed `Layout/BlockDelimiterSpacing` to correctly distinguish between statement and expression contexts for blocks inside `do...end` blocks.

data/releases.md

@@ -1,5 +1,15 @@
 # Releases
 
+## v0.10.0
+
+  - Fixed `Layout/BlockDelimiterSpacing` to correctly treat a block as a statement (requiring space before `{`) when it is the sole body of a multi-line outer block or method/class/module definition. Previously, the absence of a `:begin` wrapper in the AST caused such blocks (e.g. `Async {foo}` or `let(:bar) {baz}` inside a `describe`/`context` block) to be misclassified as expression-context and have their space incorrectly removed.
+  - Single-line inline outer blocks (e.g. `foo {bar{baz}}`) continue to use compact style with no space before the inner brace.
+
+## v0.9.0
+
+  - Fixed `Layout/ConsistentBlankLineIndentation` to correctly handle files containing multiple blocks.
+  - Expanded `Layout/BlockDelimiterSpacing` test coverage to include method chaining scenarios.
+
 ## v0.8.0
 
   - Fixed `Layout/BlockDelimiterSpacing` to correctly distinguish between statement and expression contexts for blocks inside `do...end` blocks.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-socketry
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: RuboCop rules for Socketry projects
 test_files: []