rubocop-socketry 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 199a4f2c374f6e452459742724b7ba8ba9b0e9d9859ddf4ae12172a95e033bd9
-  data.tar.gz: ddc2c5a20e4b7181b1cdc0d07c53f85dc7acabb9ea4681616e3000292b45496f
+  metadata.gz: 3bdf0fc2d1db810ae5d2bb5d15895f763062e83a4cff437e17f9707b4f9f7d27
+  data.tar.gz: f615231a3fa949865a21623f160195da22ad401e2198db990a5ebffa9554dea4
 SHA512:
-  metadata.gz: f04815a61b6651a7c4325967a9d193ade2ecb85800cb3ef816afed0a0f51d5849ab8a3aeb758474b93a8927b7fd984826f983749a9ff4824a0cf5beba1d72d95
-  data.tar.gz: 6b255a3e77c44782ea801bc3de112411896f9395ab0b78191998b8a064528a29cbca77bc50be56223f68c1b2df2e1155332f3985fd6e62bc935f5850a7b91553
+  metadata.gz: aa0b76dd902e2bbfc9409a54c242b15912cc850c9c2a3f26618adedc5a6275eb0d2c690eb224b23f0fbe620e777f2f0efbf0c58a3d7c2d7e324e233323e736d7
+  data.tar.gz: 40c8ad00c40ee7619c6f3f9ccf3e22bd5a4a71c1920683c326a21a80cd90620bb4f34acaeabe469c01991e4ee304e38aed89381fb05a2a7b66652e50bee9a0ff

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

@@ -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,18 @@ 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)
+				# 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
+					# Otherwise, it's part of an expression or nested context
+					parent.type != :begin
+				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 +125,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

@@ -5,6 +5,6 @@
 
 module RuboCop
 	module Socketry
-		VERSION = "0.6.1"
+		VERSION = "0.7.0"
 	end
 end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-socketry
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.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: []