From 83a4ddb33449d784f33fcd9791e26cf97a273a94 Mon Sep 17 00:00:00 2001 From: Seth Boyles Date: Mon, 11 Jul 2022 21:53:39 +0000 Subject: [PATCH] Ruby 3 does not support Proc.new without arguments Co-authored-by: Seth Boyles Co-authored-by: Merric de Launey --- .fog.example | 2 +- lib/fog/storage/google_xml/requests/get_object.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.fog.example b/.fog.example index f2f8d97df1..d20d07ee5f 100644 --- a/.fog.example +++ b/.fog.example @@ -22,4 +22,4 @@ my_google_credentials: #google_storage_access_key_id: GOOGXXXXXXXXXXXXXXXX #google_storage_secret_access_key: XXXX+XXX/XXXXXXXX+XXXXXXXXXXXXXXXXXXXXX # /END GOOGLE CONFIG -################################################################# \ No newline at end of file +################################################################# diff --git a/lib/fog/storage/google_xml/requests/get_object.rb b/lib/fog/storage/google_xml/requests/get_object.rb index 1e2f5427ca..e4c419c810 100644 --- a/lib/fog/storage/google_xml/requests/get_object.rb +++ b/lib/fog/storage/google_xml/requests/get_object.rb @@ -24,7 +24,7 @@ class Real # * 'ETag'<~String> - Etag of object # * 'Last-Modified'<~String> - Last modified timestamp for object # - def get_object(bucket_name, object_name, options = {}, &_block) + def get_object(bucket_name, object_name, options = {}, &block) raise ArgumentError.new("bucket_name is required") unless bucket_name raise ArgumentError.new("object_name is required") unless object_name @@ -40,7 +40,7 @@ def get_object(bucket_name, object_name, options = {}, &_block) params[:headers]["If-Unmodified-Since"] = Fog::Time.at(options["If-Unmodified-Since"].to_i).to_date_header end - params[:response_block] = Proc.new if block_given? + params[:response_block] = block if block_given? request(params.merge!(:expects => [200, 206], :host => "#{bucket_name}.#{@host}",