chore: Add support for Ruby 4.0 via unbundled gems (#1693)

chore: Rubocop fixes for google-style v1.32.0

Author: aandreassa

Gemfile

@@ -15,9 +15,12 @@
 source "https://rubygems.org"
 
 group :development, :test do
-  gem "google-style", "~> 1.26.1"
+  gem "benchmark", "~> 0.4"
+  gem "google-style", "~> 1.32.0"
   gem "minitest", "~> 5.16"
   gem "minitest-focus", "~> 1.1"
   gem "minitest-junit"
+  gem "ostruct", "~> 0.6.3"
   gem "rake", "~> 13.0"
+  gem "tsort", "~> 0.2.0"
 end

eventarc/generic/Gemfile

@@ -3,6 +3,7 @@ source "https://rubygems.org"
 gem "sinatra", "~>3.1"
 
 group :test do
+  gem "ostruct"
   gem "rack-test"
   gem "rest-client"
   gem "rspec"

eventarc/generic/app.rb

@@ -30,9 +30,9 @@
 
   puts "\nHEADERS:"
   headers = request.env.select { |k, _v| k.start_with? "HTTP_" }
-                   .collect { |key, val| [key.sub(/^HTTP_/, ""), val] }
-                   .collect { |key, val| "#{key}: #{val}" }
-                   .sort
+                       .collect { |key, val| [key.sub(/^HTTP_/, ""), val] }
+                       .collect { |key, val| "#{key}: #{val}" }
+                       .sort
   headers.each do |key, value|
     if key != "Authorization"
       puts "#{key}: #{value}<br>"

functions/Gemfile

@@ -17,6 +17,8 @@ source "https://rubygems.org"
 gem "functions_framework", "~> 1.4", ">= 1.4.1"
 
 group "test" do
+  gem "benchmark", "~> 0.4"
+  gem "cgi", "~> 0.5"
   gem "google-apis-kgsearch_v1", "~> 0.13"
   gem "google-cloud-bigquery", "~> 1.45"
   gem "google-cloud-firestore", "~> 2.13"

functions/helloworld/http/app.rb

@@ -14,15 +14,14 @@
 
 # [START functions_helloworld_http]
 require "functions_framework"
-require "cgi"
+require "cgi/escape"
 require "json"
 
 FunctionsFramework.http "hello_http" do |request|
   # The request parameter is a Rack::Request object.
   # See https://www.rubydoc.info/gems/rack/Rack/Request
   name = request.params["name"] ||
-         (request.body.rewind && JSON.parse(request.body.read)["name"] rescue nil) ||
-         "World"
+         (request.body.rewind && JSON.parse(request.body.read)["name"]) rescue "World"
   # Return the response body as a string.
   # You can also return a Rack::Response object, a Rack response array, or
   # a hash which will be JSON-encoded into a response.

functions/http/content/app.rb

@@ -24,7 +24,7 @@
   case content_type
   # '{"name":"John"}'
   when "application/json"
-    name = (JSON.parse(request.body.read.to_s)["name"] rescue nil)
+    name = JSON.parse(request.body.read.to_s)["name"] rescue nil
   # "John", stored in a Buffer
   when "application/octet-stream"
     name = request.body.read.to_s # Convert buffer to a string
@@ -33,7 +33,7 @@
     name = request.body.read.to_s
   # "name=John" in the body of a POST request (not the URL)
   when "application/x-www-form-urlencoded"
-    name = (request.params["name"] rescue nil)
+    name = request.params["name"] rescue nil
   end
 
   name ||= "World"

functions/slack/app.rb

@@ -97,7 +97,7 @@ def format_slack_message query, response
         { "title"      => name && description ? "#{name}: #{description}" : name,
           "title_link" => details.fetch("url", nil),
           "text"       => details.fetch("articleBody", nil),
-          "image_url"  => result.fetch("image", nil)&.fetch("contentUrl", nil) }
+          "image_url"  => result.dig("image", "contentUrl") }
       else
         { "text" => "No results match your query." }
       end

media_cdn/dualtoken.rb

@@ -34,9 +34,8 @@ def base64_encode value
 #
 # @return [String] the aggregated string
 def header_names headers
-  header_names = []
-  headers.each do |header|
-    header_names.append header[:name]
+  header_names = headers.map do |header|
+    header[:name]
   end
   header_names.join ","
 end
@@ -49,9 +48,8 @@ def header_names headers
 #
 # @return [String] the aggregated string
 def header_pairs headers
-  header_pairs = []
-  headers.each do |header|
-    header_pairs.append "#{header[:name]}=#{header[:value]}"
+  header_pairs = headers.map do |header|
+    "#{header[:name]}=#{header[:value]}"
   end
   header_pairs.join ","
 end
@@ -100,7 +98,6 @@ def sign_token(
   headers: nil,
   ip_ranges: nil
 )
-
   decoded_key = Base64.urlsafe_decode64 base64_key
   algo = signature_algorithm.downcase
 

spanner/database_leader_placement_samples.rb

@@ -81,7 +81,7 @@ def create_database_with_default_leader \
 
   db_admin_client = Google::Cloud::Spanner::Admin::Database.database_admin project_id: project_id
 
-  instance_path = \
+  instance_path =
     db_admin_client.instance_path project: project_id, instance: instance_id
   statements = [
     "CREATE TABLE Singers (

spanner/json_column_type_samples.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative "./utils"
+require_relative "utils"
 
 def add_json_column project_id:, instance_id:, database_id:
   # [START spanner_add_json_column]