Skip to content

Commit

Permalink
fixing variable name
Browse files Browse the repository at this point in the history
  • Loading branch information
shubhangi-google committed Sep 19, 2024
1 parent 5241b64 commit 0d18569
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
6 changes: 3 additions & 3 deletions google-cloud-storage/lib/google/cloud/storage/file.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2092,7 +2092,7 @@ def self.gapi_from_attrs gapi, attributes
# file=Google::Cloud::Storage::File
# file.from_gs_url(gs_url)
# =>
# {"bucket_name"=>"my-todo-app", "file_name"=>"avatars/heidi.jpeg"}
# {"bucket_name"=>"my-todo-app", "file_path"=>"avatars/heidi.jpeg"}
#
# @example Fetch bucket_name , file_name and other query params from gs url:
# require "google/cloud/storage"
Expand All @@ -2101,7 +2101,7 @@ def self.gapi_from_attrs gapi, attributes
# file.from_gs_url(gs_url)
# =>{
# "bucket_name"=>"my-todo-app",
# "file_name"=>"test_sub_folder/heidi.jpeg",
# "file_path"=>"test_sub_folder/heidi.jpeg",
# "options" => {
# "params1"=>"test1",
# "params2"=>"test2"
Expand All @@ -2118,7 +2118,7 @@ def self.from_gs_url gs_url
query_params = URI.decode_www_form(query).to_h if query
url_items = {
"bucket_name" => bucket_name,
"file_name" => file_path
"file_path" => file_path
}
# adding url params to output hash
url_items.merge! "options" => query_params if query
Expand Down
19 changes: 9 additions & 10 deletions google-cloud-storage/test/google/cloud/storage/file_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1572,35 +1572,34 @@ def file_user_project.sleep *args
end

describe "fetch details from gs_url" do
let(:bucket_name) { "object-lock-bucket" }
let(:file_name) {"file.jpeg"}
let(:bucket_name) { "my-random-bucket" }
let(:file_path) {"file.jpeg"}
let(:file) {Google::Cloud::Storage::File}
let(:param) {"param1"}
let(:param_val) {"test"}
let(:gs_url) {"gs://#{bucket_name}/#{file_path}"}

it "it returns file_name and bucket_name from given gs url" do
gs_url = "gs://#{bucket_name}/#{file_name}"
url_items = file.from_gs_url gs_url
assert_equal bucket_name, url_items["bucket_name"]
assert_equal file_name, url_items["file_name"]
assert_equal file_path, url_items["file_path"]
end

it "it returns file_name, bucket_name and url params in options hash from given gs url with parameters" do
gs_url= "gs://#{bucket_name}/#{file_name}?#{param}=#{param_val}"
gs_url= "gs://#{bucket_name}/#{file_path}?#{param}=#{param_val}"
url_items = file.from_gs_url gs_url
assert_equal bucket_name, url_items["bucket_name"]
assert_equal file_name, url_items["file_name"]
assert_equal file_path, url_items["file_path"]
expected_params_hash_in_output = {'param1' =>'test'}
assert_equal expected_params_hash_in_output, url_items["options"]
end

it "it returns file_path with subfolder name and file name and bucket_name from given gs url" do
bucket_subfolder_name = "avatars"
gs_url = "gs://#{bucket_name}/#{bucket_subfolder_name}/#{file_name}"
file_path = "avatars/#{file_path}"
gs_url = "gs://#{bucket_name}/#{file_path}"
url_items = file.from_gs_url gs_url
expected_file_name = "#{bucket_subfolder_name}/#{file_name}"
assert_equal bucket_name, url_items["bucket_name"]
assert_equal expected_file_name, url_items["file_name"]
assert_equal file_path, url_items["file_path"]
end

it "raises error if url provided is not a valid gs url" do
Expand Down

0 comments on commit 0d18569

Please sign in to comment.