rubocop-socketry 0.6.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 199a4f2c374f6e452459742724b7ba8ba9b0e9d9859ddf4ae12172a95e033bd9
-  data.tar.gz: ddc2c5a20e4b7181b1cdc0d07c53f85dc7acabb9ea4681616e3000292b45496f
+  metadata.gz: 0dacbb6af420eedc76cec483085c0bac470416faf318a2ddaee52980c3a43f59
+  data.tar.gz: 4f128fdca62a037f273ee0ab534446e08df7b97bd578b6ca50f287f3f63e8d43
 SHA512:
-  metadata.gz: f04815a61b6651a7c4325967a9d193ade2ecb85800cb3ef816afed0a0f51d5849ab8a3aeb758474b93a8927b7fd984826f983749a9ff4824a0cf5beba1d72d95
-  data.tar.gz: 6b255a3e77c44782ea801bc3de112411896f9395ab0b78191998b8a064528a29cbca77bc50be56223f68c1b2df2e1155332f3985fd6e62bc935f5850a7b91553
+  metadata.gz: b87895050fdfd00301e6f3f33bd742f87f6ffcc46963f33f33df285e7f8d3e9079b24fb6be8aee2352c697df1d36d7fddf9cca90e9453da047b3fad2cd5208ab
+  data.tar.gz: 0b21c56b058e9a97716e37846c52238afb798d5b584f6920820706aa93e11b41a5f1e5258b5171d7842c943916d9b93b53b9674e4c4a0f1e9fd016f2d7ba9839

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2025, by Samuel Williams.
+# Copyright, 2025-2026, by Samuel Williams.
 
 require "rubocop"
 
@@ -11,19 +11,21 @@ module RuboCop
 			# A RuboCop cop that enforces consistent spacing before block delimiters.
 			# 
 			# This cop enforces the following style:
-			# - `foo {bar}` - space when method has no parentheses and is not chained
-			# - `foo(1, 2) {bar}` - space after closing paren for standalone methods
-			# - `array.each{|x| x*2}.reverse` - no space for method chains (even with parens)
-			# - `->(foo){foo}` - no space for lambdas (stabby lambda syntax)
-			# - `lambda{foo}` - no space for lambda keyword
-			# - `proc{foo}` - no space for proc keyword
-			# - `Proc.new{foo}` - no space for Proc.new
+			# - `foo {bar}` - space for top-level statements without parentheses.
+			# - `x = foo{bar}` - no space when part of an expression (assignment, argument, etc).
+			# - `foo(1, 2) {bar}` - space after closing paren for top-level statements.
+			# - `array.each{|x| x*2}.reverse` - no space for method chains.
+			# - `->(foo){foo}` - no space for lambdas (stabby lambda syntax).
+			# - `lambda{foo}` - no space for lambda keyword.
+			# - `proc{foo}` - no space for proc keyword.
+			# - `Proc.new{foo}` - no space for `Proc.new`.
 			class BlockDelimiterSpacing < RuboCop::Cop::Base
 				extend Cop::AutoCorrector
 				
 				MSG_ADD_SPACE = "Add a space before the opening brace."
 				MSG_REMOVE_SPACE = "Remove space before the opening brace for method chains."
 				MSG_REMOVE_SPACE_LAMBDA = "Remove space before the opening brace for lambdas/procs."
+				MSG_REMOVE_SPACE_EXPRESSION = "Remove space before the opening brace for expressions."
 				
 				def on_block(node)
 					return unless node.braces?
@@ -44,6 +46,12 @@ module RuboCop
 						# array.each{|x| x*2}.reverse - no space
 						# obj.method(1, 2){|x| x}.other - also no space
 						check_no_space_before_brace(node, send_node)
+					# Priority 3: Check if it's part of an expression (not top-level)
+					# Blocks within expressions should have no space
+					elsif part_of_expression?(node)
+						# x = Async{server.run} - no space (part of assignment)
+						# foo(bar{baz}) - no space (part of argument)
+						check_no_space_for_expression(node, send_node)
 					elsif has_parentheses?(send_node)
 						# foo(1, 2) {bar} - space after ) for standalone methods
 						check_space_after_parentheses(node, send_node)
@@ -71,6 +79,32 @@ module RuboCop
 					false
 				end
 				
+				# 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.
+				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?
+					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
 				def check_no_space_for_lambda(block_node, send_node)
 					brace_begin = block_node.loc.begin
@@ -105,6 +139,40 @@ module RuboCop
 					end
 				end
 				
+				# Check that there's no space before the opening brace for expressions
+				def check_no_space_for_expression(block_node, send_node)
+					brace_begin = block_node.loc.begin
+					
+					# Find the position just before the brace
+					char_before_pos = brace_begin.begin_pos - 1
+					
+					return if char_before_pos < 0
+					
+					char_before = processed_source.buffer.source[char_before_pos]
+					
+					# If there's no space before the brace, we're good
+					return unless char_before == " "
+					
+					# Find the extent of whitespace before the brace
+					start_pos = char_before_pos
+					while start_pos > 0 && processed_source.buffer.source[start_pos - 1] =~ /\s/
+						start_pos -= 1
+					end
+					
+					space_range = Parser::Source::Range.new(
+						processed_source.buffer,
+						start_pos,
+						brace_begin.begin_pos
+					)
+					
+					add_offense(
+						space_range,
+						message: MSG_REMOVE_SPACE_EXPRESSION
+					) do |corrector|
+						corrector.remove(space_range)
+					end
+				end
+				
 				# Check if the block is part of a method chain (e.g., foo{}.bar or foo.bar{}.baz)
 				def part_of_method_chain?(block_node)
 					send_node = block_node.send_node

data/lib/rubocop/socketry/version.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2025, by Samuel Williams.
+# Copyright, 2025-2026, by Samuel Williams.
 
 module RuboCop
 	module Socketry
-		VERSION = "0.6.1"
+		VERSION = "0.8.0"
 	end
 end 

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright, 2025, by Samuel Williams.  
+Copyright, 2025-2026, by Samuel Williams.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/readme.md

@@ -27,6 +27,26 @@ Layout/ConsistentBlankLineIndentation:
 
 Please see the [project releases](https://socketry.github.io/rubocop-socketry/releases/index) for all releases.
 
+### v0.8.0
+
+  - Fixed `Layout/BlockDelimiterSpacing` to correctly distinguish between statement and expression contexts for blocks inside `do...end` blocks.
+
+### v0.7.0
+
+  - Fixed `Layout/BlockDelimiterSpacing` to correctly handle blocks inside `do...end` blocks (statements should have space before braces).
+
+### v0.6.1
+
+  - Refined `Style/GlobalExceptionVariables` to allow global exception variables in safe contexts:
+      - Inside rescue blocks (well-defined scope).
+      - In rescue modifiers (`expression rescue $!`).
+      - In method parameter defaults (`def foo(error = $!)`).
+  - Added specific warning for using global exception variables in ensure blocks (extremely unsafe).
+
+### v0.6.0
+
+  - Extended `Layout/BlockDelimiterSpacing` to handle lambda and proc constructs (`->`, `lambda`, `proc`, `Proc.new`).
+
 ### v0.5.0
 
   - Added `Style/GlobalExceptionVariables` cop to warn against using global exception variables (`$!`, `$@`, `$ERROR_INFO`, `$ERROR_POSITION`).

data/releases.md

@@ -1,5 +1,25 @@
 # Releases
 
+## v0.8.0
+
+  - Fixed `Layout/BlockDelimiterSpacing` to correctly distinguish between statement and expression contexts for blocks inside `do...end` blocks.
+
+## v0.7.0
+
+  - Fixed `Layout/BlockDelimiterSpacing` to correctly handle blocks inside `do...end` blocks (statements should have space before braces).
+
+## v0.6.1
+
+  - Refined `Style/GlobalExceptionVariables` to allow global exception variables in safe contexts:
+      - Inside rescue blocks (well-defined scope).
+      - In rescue modifiers (`expression rescue $!`).
+      - In method parameter defaults (`def foo(error = $!)`).
+  - Added specific warning for using global exception variables in ensure blocks (extremely unsafe).
+
+## v0.6.0
+
+  - Extended `Layout/BlockDelimiterSpacing` to handle lambda and proc constructs (`->`, `lambda`, `proc`, `Proc.new`).
+
 ## v0.5.0
 
   - Added `Style/GlobalExceptionVariables` cop to warn against using global exception variables (`$!`, `$@`, `$ERROR_INFO`, `$ERROR_POSITION`).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-socketry
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.8.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: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: RuboCop rules for Socketry projects
 test_files: []