Refactor the put_request method to have a return value

lib/remote_storage/rest_provider.rb

@@ -141,7 +141,7 @@ module RemoteStorage
         server.halt 412, "Precondition Failed" unless existing_metadata.empty?
       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 = {
         e: etag,
@@ -392,14 +392,13 @@ module RemoteStorage
 
     def do_put_request(url, data, content_type)
       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}))
-      end
-    end
 
-    def do_put_request_and_return_etag_and_last_modified(url, data, content_type)
+        return [
-      res = do_put_request(url, data, content_type)
+          res.headers[:etag],
-
+          timestamp_for(res.headers[:last_modified])
-      return [res.headers[:etag], timestamp_for(res.headers[:last_modified])]
+        ]
+      end
     end
 
     def do_get_request(url, &block)

lib/remote_storage/s3.rb

@@ -21,16 +21,15 @@ module RemoteStorage
         authorization_headers = authorization_headers_for(
           "PUT", url, md5, content_type
         ).merge({ "Content-Type" => content_type, "Content-Md5" => md5 })
-        RestClient.put(url, data, authorization_headers)
+        res = RestClient.put(url, data, authorization_headers)
-      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])]
+        return [
+          res.headers[:etag].delete('"'),
+          timestamp_for(head_res.headers[:last_modified])
+        ]
+      end
     end
 
     def do_get_request(url, &block)