Modernize code.

ioquatix · ioquatix · commit 077624af29c1 · 2025-01-24T12:19:14.000+13:00
diff --git a/.github/workflows/documentation-coverage.yaml b/.github/workflows/documentation-coverage.yaml
@@ -17,7 +17,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.3"
+        ruby-version: "3.4"
         bundler-cache: true
     
     - name: Validate coverage
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -29,7 +29,7 @@ jobs:
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.3"
+        ruby-version: "3.4"
         bundler-cache: true
     
     - name: Installing packages
diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -21,7 +21,7 @@ jobs:
           - macos
         
         ruby:
-          - "3.3"
+          - "3.4"
     
     steps:
     - uses: actions/checkout@v4
@@ -34,8 +34,10 @@ jobs:
       timeout-minutes: 5
       run: bundle exec bake test
     
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
+        include-hidden-files: true
+        if-no-files-found: error
         name: coverage-${{matrix.os}}-${{matrix.ruby}}
         path: .covered.db
   
@@ -47,10 +49,10 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.3"
+        ruby-version: "3.4"
         bundler-cache: true
     
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
     
     - name: Validate coverage
       timeout-minutes: 5
diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml
@@ -23,6 +23,7 @@ jobs:
           - "3.1"
           - "3.2"
           - "3.3"
+          - "3.4"
     
     steps:
     - uses: actions/checkout@v4
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -24,6 +24,7 @@ jobs:
           - "3.1"
           - "3.2"
           - "3.3"
+          - "3.4"
         
         experimental: [false]
         
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -47,3 +47,7 @@ Layout/EmptyLinesAroundModuleBody:
 
 Style/FrozenStringLiteralComment:
   Enabled: true
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
diff --git a/async-http-faraday.gemspec b/async-http-faraday.gemspec
@@ -7,11 +7,11 @@ Gem::Specification.new do |spec|
 	spec.version = Async::HTTP::Faraday::VERSION
 	
 	spec.summary = "Provides an adaptor between async-http and faraday."
-	spec.authors = ["Samuel Williams", "Igor Sidorov", "Andreas Garnaes", "Genki Takiuchi", "Olle Jonsson", "Benoit Daloze", "Denis Talakevich", "Flavio Fernandes", "Jacob Frautschi"]
+	spec.authors = ["Samuel Williams", "Igor Sidorov", "Andreas Garnaes", "Genki Takiuchi", "Nikolaos Anastopoulos", "Olle Jonsson", "Benoit Daloze", "Denis Talakevich", "Flavio Fernandes", "Jacob Frautschi"]
 	spec.license = "MIT"
 	
-	spec.cert_chain  = ['release.cert']
-	spec.signing_key = File.expand_path('~/.gem/release.pem')
+	spec.cert_chain  = ["release.cert"]
+	spec.signing_key = File.expand_path("~/.gem/release.pem")
 	
 	spec.homepage = "https://github.com/socketry/async-http-faraday"
 	
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 		"source_code_uri" => "https://github.com/socketry/async-http.git",
 	}
 	
-	spec.files = Dir.glob(['{examples,lib}/**/*', '*.md'], File::FNM_DOTMATCH, base: __dir__)
+	spec.files = Dir.glob(["{examples,lib}/**/*", "*.md"], File::FNM_DOTMATCH, base: __dir__)
 	
 	spec.required_ruby_version = ">= 3.1"
 	
diff --git a/bake.rb b/bake.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2025, by Samuel Williams.
+# Copyright, 2024-2025, by Samuel Williams.
 
 # Update the project documentation with the new version number.
 #
diff --git a/config/sus.rb b/config/sus.rb
@@ -3,5 +3,5 @@
 # Released under the MIT License.
 # Copyright, 2024, by Samuel Williams.
 
-require 'covered/sus'
+require "covered/sus"
 include Covered::Sus
diff --git a/examples/topics.rb b/examples/topics.rb
@@ -6,14 +6,14 @@
 
 $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 
-require 'async'
-require 'faraday'
-require 'async/http/faraday'
+require "async"
+require "faraday"
+require "async/http/faraday"
 
 # Async.logger.debug!
 
 module TestAsync
-	URL = 'https://www.google.com/search'
+	URL = "https://www.google.com/search"
 	TOPICS = %W{ruby python lisp javascript cobol}
 	
 	def self.fetch_topics_async
diff --git a/gems.rb b/gems.rb
@@ -3,7 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2018-2024, by Samuel Williams.
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
diff --git a/lib/async/http/faraday/adapter.rb b/lib/async/http/faraday/adapter.rb
@@ -8,17 +8,18 @@
 # Copyright, 2023, by Genki Takiuchi.
 # Copyright, 2023, by Flavio Fernandes.
 # Copyright, 2024, by Jacob Frautschi.
+# Copyright, 2025, by Nikolaos Anastopoulos.
 
-require 'faraday'
-require 'faraday/adapter'
+require "faraday"
+require "faraday/adapter"
 
-require 'async/barrier'
-require 'kernel/sync'
+require "async/barrier"
+require "kernel/sync"
 
-require 'async/http/client'
-require 'async/http/proxy'
+require "async/http/client"
+require "async/http/proxy"
 
-require_relative 'clients'
+require_relative "clients"
 
 module Async
 	module HTTP
@@ -136,7 +137,7 @@ def call(env)
 					super
 					
 					# For compatibility with the default adapter:
-					env.url.path = '/' if env.url.path.empty?
+					env.url.path = "/" if env.url.path.empty?
 					
 					if parallel_manager = env.parallel_manager
 						parallel_manager.async do
@@ -234,11 +235,11 @@ def with_timeout(task: Async::Task.current)
 				
 				def encoded_body(response)
 					body = response.read
-					return +'' if body.nil?
-					content_type = response.headers['content-type']
+					return +"" if body.nil?
+					content_type = response.headers["content-type"]
 					return body unless content_type
 					params = extract_type_parameters(content_type)
-					if charset = params['charset']
+					if charset = params["charset"]
 						body = body.dup if body.frozen?
 						body.force_encoding(charset)
 					end
@@ -249,10 +250,10 @@ def encoded_body(response)
 				
 				def extract_type_parameters(content_type)
 					result = {}
-					list = content_type.split(';')
+					list = content_type.split(";")
 					list.shift
 					list.each do |param|
-						key, value = *param.split('=', 2)
+						key, value = *param.split("=", 2)
 						result[key.strip] = value.strip
 					end
 					result
diff --git a/lib/async/http/faraday/clients.rb b/lib/async/http/faraday/clients.rb
@@ -3,12 +3,12 @@
 # Released under the MIT License.
 # Copyright, 2024, by Samuel Williams.
 
-require 'faraday'
-require 'faraday/adapter'
-require 'kernel/sync'
+require "faraday"
+require "faraday/adapter"
+require "kernel/sync"
 
-require 'async/http/client'
-require 'async/http/proxy'
+require "async/http/client"
+require "async/http/proxy"
 
 module Async
 	module HTTP
diff --git a/lib/async/http/faraday/default.rb b/lib/async/http/faraday/default.rb
@@ -3,7 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2020-2024, by Samuel Williams.
 
-require_relative 'adapter'
+require_relative "adapter"
 
 # Set the default adapter to use Async::HTTP.
 ::Faraday.default_adapter = :async_http
diff --git a/license.md b/license.md
@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright, 2018-2024, by Samuel Williams.  
+Copyright, 2018-2025, by Samuel Williams.  
 Copyright, 2018, by Andreas Garnaes.  
 Copyright, 2019, by Denis Talakevich.  
 Copyright, 2019-2020, by Igor Sidorov.  
@@ -9,6 +9,7 @@ Copyright, 2020, by Benoit Daloze.
 Copyright, 2023, by Genki Takiuchi.  
 Copyright, 2023, by Flavio Fernandes.  
 Copyright, 2024, by Jacob Frautschi.  
+Copyright, 2025, by Nikolaos Anastopoulos.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/test/async/http/faraday/adapter.rb b/test/async/http/faraday/adapter.rb
diff --git a/test/async/http/faraday/adapter/parallel.rb b/test/async/http/faraday/adapter/parallel.rb
diff --git a/test/async/http/faraday/adapter/proxy.rb b/test/async/http/faraday/adapter/proxy.rb
diff --git a/test/async/http/faraday/clients.rb b/test/async/http/faraday/clients.rb

-Original file line number
+Diff line change
           - "3.1"
           - "3.2"
           - "3.3"
 +          - "3.4"
     steps:
     - uses: actions/checkout@v4
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`# frozen_string_literal: true`
`2`	`2`
`3`	`3`	`# Released under the MIT License.`
`4`		`-# Copyright, 2025, by Samuel Williams.`
	`4`	`+# Copyright, 2024-2025, by Samuel Williams.`
`5`	`5`
`6`	`6`	`# Update the project documentation with the new version number.`
`7`	`7`	`#`