mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
remove basic parser from blank body responses, add copyobject parser
This commit is contained in:
parent
0cbafe1d9e
commit
17975f4e96
2 changed files with 14 additions and 5 deletions
|
@ -154,8 +154,7 @@ DATA
|
||||||
request({
|
request({
|
||||||
:headers => {},
|
:headers => {},
|
||||||
:host => "#{bucket_name}.#{@host}",
|
:host => "#{bucket_name}.#{@host}",
|
||||||
:method => 'DELETE',
|
:method => 'DELETE'
|
||||||
:parser => Fog::Parsers::AWS::S3::BasicParser.new
|
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -167,7 +166,6 @@ DATA
|
||||||
:headers => options.merge!(file[:headers]),
|
:headers => options.merge!(file[:headers]),
|
||||||
:host => "#{bucket_name}.#{@host}",
|
:host => "#{bucket_name}.#{@host}",
|
||||||
:method => 'PUT',
|
:method => 'PUT',
|
||||||
:parser => Fog::Parsers::AWS::S3::BasicParser.new,
|
|
||||||
:path => object_name
|
:path => object_name
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
@ -178,7 +176,7 @@ DATA
|
||||||
:headers => { 'x-amz-copy-source' => "/#{source_bucket_name}/#{source_object_name}" },
|
:headers => { 'x-amz-copy-source' => "/#{source_bucket_name}/#{source_object_name}" },
|
||||||
:host => "#{destination_bucket_name}.#{@host}",
|
:host => "#{destination_bucket_name}.#{@host}",
|
||||||
:method => 'PUT',
|
:method => 'PUT',
|
||||||
:parser => Fog::Parsers::AWS::S3::BasicParser.new,
|
:parser => Fog::Parsers::AWS::S3::CopyObject.new,
|
||||||
:path => destination_object_name
|
:path => destination_object_name
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
@ -209,7 +207,6 @@ DATA
|
||||||
:headers => {},
|
:headers => {},
|
||||||
:host => "#{bucket_name}.#{@host}",
|
:host => "#{bucket_name}.#{@host}",
|
||||||
:method => 'DELETE',
|
:method => 'DELETE',
|
||||||
:parser => Fog::Parsers::AWS::S3::BasicParser.new,
|
|
||||||
:path => object_name
|
:path => object_name
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
|
@ -119,6 +119,18 @@ module Fog
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
class CopyObject < Fog::Parsers::AWS::S3::BasicParser
|
||||||
|
|
||||||
|
def end_element(name)
|
||||||
|
case name
|
||||||
|
when 'ETag'
|
||||||
|
@response[:etag] = @value
|
||||||
|
when 'LastModified'
|
||||||
|
@response[:last_modified] = Time.parse(@value)
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue