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

[storage] fixes for deprecated implicit block usage to excon requests

Browse source
This commit is contained in:
geemus 2012-03-17 14:28:31 -05:00
parent 73c2035cc1
commit fcd504c30a
3 changed files with 45 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/fog/aws/requests/storage/get_object.rb
View file

@ -35,26 +35,30 @@ module Fog
unless object_name unless object_name
raise ArgumentError.new('object_name is required') raise ArgumentError.new('object_name is required')
end end
params = { :headers => {} }
if version_id = options.delete('versionId') if version_id = options.delete('versionId')
query = {'versionId' => version_id} params[:query] = {'versionId' => version_id}
end end
headers = {} params[:headers].merge!(options)
headers.merge!(options) if options['If-Modified-Since']
if headers['If-Modified-Since'] params[:headers]['If-Modified-Since'] = Fog::Time.at(options['If-Modified-Since'].to_i).to_date_header
headers['If-Modified-Since'] = Fog::Time.at(headers['If-Modified-Since'].to_i).to_date_header
end end
if headers['If-Unmodified-Since'] if options['If-Unmodified-Since']
headers['If-Unmodified-Since'] = Fog::Time.at(headers['If-Unmodified-Since'].to_i).to_date_header params[:headers]['If-Unmodified-Since'] = Fog::Time.at(options['If-Unmodified-Since'].to_i).to_date_header
end end
request({
if block_given?
params[:response_block] = Proc.new
end
request(params.merge!({
:expects => [ 200, 206 ], :expects => [ 200, 206 ],
:headers => headers,
:host => "#{bucket_name}.#{@host}", :host => "#{bucket_name}.#{@host}",
:idempotent => true, :idempotent => true,
:method => 'GET', :method => 'GET',
:path => CGI.escape(object_name), :path => CGI.escape(object_name),
:query => query }))
}, &block)
end end
end end

36
lib/fog/google/requests/storage/get_object.rb
View file

@ -32,22 +32,30 @@ module Fog
unless object_name unless object_name
raise ArgumentError.new('object_name is required') raise ArgumentError.new('object_name is required')
end end
params = { :headers => {} }
if version_id = options.delete('versionId') if version_id = options.delete('versionId')
query = {'versionId' => version_id} params[:query] = {'versionId' => version_id}
end end
headers = {} params[:headers].merge!(options)
headers['If-Modified-Since'] = Fog::Time.at(options['If-Modified-Since'].to_i).to_date_header if options['If-Modified-Since'] if options['If-Modified-Since']
headers['If-Unmodified-Since'] = Fog::Time.at(options['If-Unmodified-Since'].to_i).to_date_header if options['If-Modified-Since'] params[:headers]['If-Modified-Since'] = Fog::Time.at(options['If-Modified-Since'].to_i).to_date_header
headers.merge!(options) end
request({ if options['If-Modified-Since']
:expects => 200, params[:headers]['If-Unmodified-Since'] = Fog::Time.at(options['If-Unmodified-Since'].to_i).to_date_header
:headers => headers, end
:host => "#{bucket_name}.#{@host}",
:idempotent => true, if block_given?
:method => 'GET', params[:response_block] = Proc.new
:path => CGI.escape(object_name), end
:query => query
}, &block) request(params.merge!({
:expects => 200,
:host => "#{bucket_name}.#{@host}",
:idempotent => true,
:method => 'GET',
:path => CGI.escape(object_name),
}))
end end
end end

10
lib/fog/rackspace/requests/storage/get_object.rb
View file

@ -10,12 +10,18 @@ module Fog
# * object<~String> - Name of object to look for # * object<~String> - Name of object to look for
# #
def get_object(container, object, &block) def get_object(container, object, &block)
request({ params = {}
if block_given?
params[:response_block] = Proc.new
end
request(params.merge!({
:block => block, :block => block,
:expects => 200, :expects => 200,
:method => 'GET', :method => 'GET',
:path => "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}" :path => "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}"
}, false, &block) }, false))
end end
end end