Modernize code.

ioquatix · ioquatix · commit 3729f8259cac · 2025-07-13T15:37:45.000+12:00
diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -21,7 +21,6 @@ jobs:
           - macos
         
         ruby:
-          - "3.1"
           - "3.2"
           - "3.3"
           - "3.4"
diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml
@@ -52,4 +52,4 @@ jobs:
     #   env:
     #     IO_EVENT_SELECTOR: Select
     #   timeout-minutes: 10
-    #   run: bundle exec bake build test:external
+    #   run: bundle exec bake build test:external
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -22,7 +22,6 @@ jobs:
           - windows
         
         ruby:
-          - "3.1"
           - "3.2"
           - "3.3"
           - "3.4"
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-/.bundle/
-/pkg/
+/.bundle
+/pkg
 /gems.locked
 /.covered.db
 /external
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -48,6 +48,15 @@ Layout/EmptyLinesAroundModuleBody:
 Layout/EmptyLineAfterMagicComment:
    Enabled: true
 
+Layout/SpaceInsideBlockBraces:
+  Enabled: true
+  EnforcedStyle: no_space
+  SpaceBeforeBlockParameters: false
+
+Layout/SpaceAroundBlockParameters:
+  Enabled: true
+  EnforcedStyleInsidePipes: no_space
+
 Style/FrozenStringLiteralComment:
   Enabled: true
 
diff --git a/fixtures/io/event/test_scheduler.rb b/fixtures/io/event/test_scheduler.rb
@@ -160,4 +160,4 @@ def wakeup
 			@selector.wakeup
 		end
 	end
-end 
+end 
diff --git a/io-event.gemspec b/io-event.gemspec
@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
 	spec.version = IO::Event::VERSION
 	
 	spec.summary = "An event loop."
-	spec.authors = ["Samuel Williams", "Math Ieu", "Wander Hillen", "Jean Boussier", "Benoit Daloze", "Bruno Sutic", "Alex Matchneer", "Anthony Ross", "Delton Ding", "Pavel Rosický", "Shizuo Fujita", "Stanislav (Stas) Katkov"]
+	spec.authors = ["Samuel Williams", "Math Ieu", "Wander Hillen", "Jean Boussier", "Benoit Daloze", "Bruno Sutic", "Shizuo Fujita", "Alex Matchneer", "Anthony Ross", "Delton Ding", "Pavel Rosický", "Stanislav (Stas) Katkov"]
 	spec.license = "MIT"
 	
 	spec.cert_chain  = ["release.cert"]
@@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
 		"source_code_uri" => "https://github.com/socketry/io-event.git",
 	}
 	
-	spec.files = Dir["ext/extconf.rb", "ext/io/**/*.{c,h}", "{lib}/**/*", "*.md", base: __dir__]
+	spec.files = Dir["{ext,lib}/**/*", "*.md", base: __dir__]
 	spec.require_paths = ["lib"]
 	
 	spec.extensions = ["ext/extconf.rb"]
 	
-	spec.required_ruby_version = ">= 3.1"
+	spec.required_ruby_version = ">= 3.2"
 end
diff --git a/lib/io/event/priority_heap.rb b/lib/io/event/priority_heap.rb
@@ -82,7 +82,7 @@ def clear!
 			# Validate the heap invariant. Every element except the root must not be smaller than its parent element. Note that it MAY be equal.
 			def valid?
 				# Notice we skip index 0 on purpose, because it has no parent
-				(1..(@contents.size - 1)).all? { |e| @contents[e] >= @contents[(e - 1) / 2] }
+				(1..(@contents.size - 1)).all? {|index| @contents[index] >= @contents[(index - 1) / 2]}
 			end
 			
 			private
diff --git a/lib/io/event/selector/select.rb b/lib/io/event/selector/select.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2021-2024, by Samuel Williams.
+# Copyright, 2021-2025, by Samuel Williams.
 # Copyright, 2023, by Math Ieu.
 
 require_relative "../interrupt"
diff --git a/license.md b/license.md
@@ -9,7 +9,7 @@ Copyright, 2022, by Bruno Sutic.
 Copyright, 2023, by Math Ieu.  
 Copyright, 2024, by Pavel Rosický.  
 Copyright, 2024, by Anthony Ross.  
-Copyright, 2024, by Shizuo Fujita.  
+Copyright, 2024-2025, by Shizuo Fujita.  
 Copyright, 2024, by Jean Boussier.  
 Copyright, 2025, by Stanislav (Stas) Katkov.  
 
diff --git a/test/io/event/priority_heap.rb b/test/io/event/priority_heap.rb
@@ -46,38 +46,39 @@
 		expect(priority_heap.size).to be(:zero?)
 		expect(result.sort).to be == result
 	end
-
+	
 	with "maintaining the heap invariant" do
 		it "for empty heaps" do
 			expect(priority_heap).to be(:valid?)
 		end
-
+		
 		it "for heap of size 1" do
 			priority_heap.push(123)
 			expect(priority_heap).to be(:valid?)
 		end
+		
 		# Exhaustive testing of all permutations of [1..6]
 		it "for all permutations of size 6" do
-			[1,2,3,4,5,6].permutation do |arr|
+			[1,2,3,4,5,6].permutation do |permutation|
 				priority_heap.clear!
-				arr.each { |e| priority_heap.push(e) }
+				permutation.each {|element| priority_heap.push(element)}
 				expect(priority_heap).to be(:valid?)
 			end
 		end
-
+		
 		# A few examples with more elements (but not ALL permutations)
 		it "for larger amounts of values" do
 			5.times do
 				priority_heap.clear!
-				(1..1000).to_a.shuffle.each { |e| priority_heap.push(e) }
+				(1..1000).to_a.shuffle.each {|element| priority_heap.push(element)}
 				expect(priority_heap).to be(:valid?)
 			end
 		end
-
+		
 		# What if we insert several of the same item along with others?
 		it "with several elements of the same value" do
 			test_values = (1..10).to_a + [4] * 5
-			test_values.each { |e| priority_heap.push(e) }
+			test_values.each {|element| priority_heap.push(element)}
 			expect(priority_heap).to be(:valid?)
 		end
 	end
diff --git a/test/io/event/selector.rb b/test/io/event/selector.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2021-2024, by Samuel Williams.
+# Copyright, 2021-2025, by Samuel Williams.
 # Copyright, 2023, by Math Ieu.
 
 require "io/event"
@@ -350,7 +350,6 @@ def transfer
 			]
 		end
 		
-		
 		it "can have two fibers reading from the same io" do
 			fiber1 = Fiber.new do
 				events << :wait_readable1
@@ -458,7 +457,7 @@ def transfer
 			expect(events).to be == [
 				:transfer, :wait_readable, :close_io, :select
 			]
-
+			
 			# io_uring will raise an EBADF error if the IO is closed while waiting.
 			# But other selectors are not capable of detecting this.
 			# expect(error).to be_nil
@@ -476,7 +475,7 @@ def transfer
 		
 		it "can read a single message" do
 			return unless selector.respond_to?(:io_read)
-
+			
 			fiber = Fiber.new do
 				events << :io_read
 				offset = selector.io_read(Fiber.current, local, buffer, message.bytesize)
@@ -703,7 +702,7 @@ def transfer
 				selectors.each(&:close)
 			end
 		end
-
+		
 		with "an instance" do
 			before do
 				@loop = Fiber.current
diff --git a/test/io/event/selector/buffered_io.rb b/test/io/event/selector/buffered_io.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2021-2024, by Samuel Williams.
+# Copyright, 2021-2025, by Samuel Williams.
 # Copyright, 2023, by Math Ieu.
 
 require "io/event"
diff --git a/test/io/event/worker_pool.rb b/test/io/event/worker_pool.rb
@@ -93,7 +93,7 @@
 			
 			# Confirm that the copy worked:
 			expect(destination.get_string(0, 10)).to be == "AAAAAAAAAA"
-
+			
 			expect(worker_pool.statistics[:call_count]).to be > 0
 			expect(worker_pool.statistics[:completed_count]).to be > 0
 			inform worker_pool.statistics

-Original file line number
+Diff line change
           - macos
         ruby:
 -          - "3.1"
           - "3.2"
           - "3.3"
           - "3.4"