lib/fog/aliyun/requests/storage/put_object.rb in fog-aliyun-0.3.1 vs lib/fog/aliyun/requests/storage/put_object.rb in fog-aliyun-0.3.2
- old
+ new
@@ -20,11 +20,11 @@
return put_multipart_object(bucket, object, file) if file.size > 104_857_600
body = file.read
resource = bucket + '/' + object
- ret = request(
+ request(
expects: [200, 203],
method: 'PUT',
path: object,
bucket: bucket,
resource: resource,
@@ -38,29 +38,29 @@
bucket ||= @aliyun_oss_bucket
location = get_bucket_location(bucket)
endpoint = 'http://' + location + '.aliyuncs.com'
resource = bucket + '/' + object
- ret = request(
+ request(
expects: [200, 203],
method: 'PUT',
path: object,
bucket: bucket,
resource: resource,
body: body,
endpoint: endpoint
)
- end
+ end
def put_folder(bucket, folder, endpoint)
if endpoint.nil?
location = get_bucket_location(bucket)
endpoint = 'http://' + location + '.aliyuncs.com'
end
path = folder + '/'
resource = bucket + '/' + folder + '/'
- ret = request(
+ request(
expects: [200, 203],
method: 'PUT',
path: path,
bucket: bucket,
resource: resource,
@@ -74,11 +74,10 @@
# find the right uploadid
uploads = list_multipart_uploads(bucket, endpoint)
upload = (uploads&.find { |tmpupload| tmpupload['Key'][0] == object })
- parts = nil
uploadedSize = 0
start_partNumber = 1
if !upload.nil?
uploadId = upload['UploadId'][0]
parts = list_parts(bucket, object, endpoint, uploadId)
@@ -125,21 +124,21 @@
path: path,
bucket: bucket,
resource: resource,
endpoint: endpoint
)
- uploadid = XmlSimple.xml_in(ret.data[:body])['UploadId'][0]
+ XmlSimple.xml_in(ret.data[:body])['UploadId'][0]
end
def upload_part(bucket, object, endpoint, partNumber, uploadId, body)
if endpoint.nil?
location = get_bucket_location(bucket)
endpoint = 'http://' + location + '.aliyuncs.com'
end
path = object + '?partNumber=' + partNumber + '&uploadId=' + uploadId
resource = bucket + '/' + path
- ret = request(
+ request(
expects: [200, 203],
method: 'PUT',
path: path,
bucket: bucket,
resource: resource,
@@ -162,23 +161,19 @@
end
body = XmlSimple.xml_out({ 'Part' => request_part }, 'RootName' => 'CompleteMultipartUpload')
path = object + '?uploadId=' + uploadId
resource = bucket + '/' + path
- ret = request(
+ request(
expects: 200,
method: 'POST',
path: path,
bucket: bucket,
resource: resource,
endpoint: endpoint,
body: body
)
end
- end
-
- class Mock
- def put_object(object, file = nil, options = {}); end
end
end
end
end