5apps/liquor-cabinet
4
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Activity

Refactor the put_request method to have a return value

Browse Source
This commit is contained in:
Greg Karékinian
2018-05-09 16:01:14 +02:00
parent 709f63555d
commit 639c3724f0
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/remote_storage/rest_provider.rb
View File

@@ -141,7 +141,7 @@ module RemoteStorage
server.halt 412, "Precondition Failed" unless existing_metadata.empty? server.halt 412, "Precondition Failed" unless existing_metadata.empty?
end end
etag, timestamp = do_put_request_and_return_etag_and_last_modified(url, data, content_type) etag, timestamp = do_put_request(url, data, content_type)
metadata = { metadata = {
e: etag, e: etag,
@@ -392,16 +392,15 @@ module RemoteStorage
def do_put_request(url, data, content_type) def do_put_request(url, data, content_type)
deal_with_unauthorized_requests do deal_with_unauthorized_requests do
RestClient.put(url, data, default_headers.merge({content_type: content_type})) res = RestClient.put(url, data, default_headers.merge({content_type: content_type}))
return [
res.headers[:etag],
timestamp_for(res.headers[:last_modified])
]
end end
end end
def do_put_request_and_return_etag_and_last_modified(url, data, content_type)
res = do_put_request(url, data, content_type)
return [res.headers[:etag], timestamp_for(res.headers[:last_modified])]
end
def do_get_request(url, &block) def do_get_request(url, &block)
deal_with_unauthorized_requests do deal_with_unauthorized_requests do
RestClient.get(url, default_headers, &block) RestClient.get(url, default_headers, &block)

17
lib/remote_storage/s3.rb
View File

@@ -21,18 +21,17 @@ module RemoteStorage
authorization_headers = authorization_headers_for( authorization_headers = authorization_headers_for(
"PUT", url, md5, content_type "PUT", url, md5, content_type
).merge({ "Content-Type" => content_type, "Content-Md5" => md5 }) ).merge({ "Content-Type" => content_type, "Content-Md5" => md5 })
RestClient.put(url, data, authorization_headers) res = RestClient.put(url, data, authorization_headers)
# S3 does not return a Last-Modified response header on PUTs
head_res = do_head_request(url)
return [
res.headers[:etag].delete('"'),
timestamp_for(head_res.headers[:last_modified])
]
end end
end end
def do_put_request_and_return_etag_and_last_modified(url, data, content_type)
res = do_put_request(url, data, content_type)
# S3 does not return a Last-Modified response header on PUTs
head_res = do_head_request(url)
return [res.headers[:etag].delete('"'), timestamp_for(head_res.headers[:last_modified])]
end
def do_get_request(url, &block) def do_get_request(url, &block)
deal_with_unauthorized_requests do deal_with_unauthorized_requests do
authorization_headers = authorization_headers_for("GET", url) authorization_headers = authorization_headers_for("GET", url)