kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Merge pull request #2085 from snoopie/content_disposition_openstack

Browse source 
[openstack | storage] Allow passing Content-Disposition header when saving file
This commit is contained in:
Wesley Beary 2013-08-23 15:45:22 -07:00
commit 6e265ce397
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/fog/openstack/models/storage/file.rb
View file

@ -10,6 +10,7 @@ module Fog
attribute :content_length, :aliases => ['bytes', 'Content-Length'], :type => :integer
attribute :content_type, :aliases => ['content_type', 'Content-Type']
attribute :content_disposition, :aliases => ['content_disposition', 'Content-Disposition']
attribute :etag, :aliases => ['hash', 'Etag']
attribute :last_modified, :aliases => ['last_modified', 'Last-Modified'], :type => :time
attribute :access_control_allow_origin, :aliases => ['Access-Control-Allow-Origin']
@ -72,6 +73,7 @@ module Fog
def save(options = {})
requires :body, :directory, :key
options['Content-Type'] = content_type if content_type
options['Content-Disposition'] = content_disposition if content_disposition
options['Access-Control-Allow-Origin'] = access_control_allow_origin if access_control_allow_origin
options['Origin'] = origin if origin
options.merge!(metadata_to_headers)

21
tests/openstack/models/storage/file_tests.rb
View file

@ -2,6 +2,10 @@ Shindo.tests('Fog::OpenStack::Storage | file', ['openstack']) do
pending if Fog.mocking?
def object_attributes(file=@instance)
@instance.service.head_object(@directory.key, file.key).headers
end
def object_meta_attributes
@instance.service.head_object(@directory.key, @instance.key).headers.reject {|k, v| !(k =~ /X-Object-Meta-/)}
end
@ -67,7 +71,22 @@ Shindo.tests('Fog::OpenStack::Storage | file', ['openstack']) do
end
end
tests('#content_disposition') do
before do
@instance = @directory.files.create :key => 'meta-test', :body => lorem_file, :content_disposition => 'ho-ho-ho'
end
after do
clear_metadata
@instance.save
end
tests("sets Content-Disposition on create").returns("ho-ho-ho") do
object_attributes(@instance)["Content-Disposition"]
end
end
tests('#metadata keys') do
after do