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

minor fixes after yesterday's internetless refactoring

Browse source
This commit is contained in:
Wesley Beary 2009-06-07 13:43:22 -07:00
parent 4941d15424
commit ad522e5f2f
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/fog/aws.rb
View file

@ -53,10 +53,10 @@ module Fog
@response.headers[data[1]] = data[2] @response.headers[data[1]] = data[2]
end end
end end
if @parser if @parser && @data
Nokogiri::XML::SAX::Parser.new(@parser).parse(data.split(/<\?xml.*\?>/)[1]) Nokogiri::XML::SAX::Parser.new(@parser).parse(@data.split(/<\?xml.*\?>/)[1])
@response.body = @parser.response @response.body = @parser.response
else elsif @data
@response.body = @data @response.body = @data
end end
set_deferred_status(:succeeded, self) set_deferred_status(:succeeded, self)

10
lib/fog/aws/s3.rb
View file

@ -103,7 +103,6 @@ module Fog
# value and the first occurence of delimiter to be rolled up # value and the first occurence of delimiter to be rolled up
def get_bucket(bucket_name, options = {}) def get_bucket(bucket_name, options = {})
options['max-keys'] = options.delete(:maxkeys) if options[:maxkeys] options['max-keys'] = options.delete(:maxkeys) if options[:maxkeys]
params.delete_if {}
query = '?' query = '?'
options.each do |key, value| options.each do |key, value|
query << "#{key}=#{value};" query << "#{key}=#{value};"
@ -186,7 +185,7 @@ module Fog
private private
def url(bucket_name = nil, path = nil) def url(bucket_name = nil, path = nil)
url = "#{scheme}://" url = "#{@scheme}://"
url << "#{bucket_name}." if bucket_name url << "#{bucket_name}." if bucket_name
url << "#{@host}:#{@port}/" url << "#{@host}:#{@port}/"
url << path if path url << path if path
@ -194,12 +193,13 @@ module Fog
end end
def canonicalize_amz_headers(headers) def canonicalize_amz_headers(headers)
headers.select {|key,value| key.match(/^x-amz-/)}.sort {|x,y| x[0] <=> y[0]}.collect {|header| header.join(':')}.join("\n") headers = headers.select {|key,value| key.match(/^x-amz-/)}.sort {|x,y| x[0] <=> y[0]}.collect {|header| header.join(':')}.join("\n")
headers.empty? ? nil : headers
end end
def request(method, url, parser, headers = {}, data = nil) def request(method, url, parser, headers = {}, data = nil)
uri = URI.parse(url) uri = URI.parse(url)
headers['Date'] => Time.now.utc.strftime("%a, %d %b %Y %H:%M:%S +0000") headers['Date'] = Time.now.utc.strftime("%a, %d %b %Y %H:%M:%S +0000")
params = [ params = [
method, method,
content_md5 = '', content_md5 = '',
@ -208,7 +208,7 @@ module Fog
canonicalized_amz_headers = canonicalize_amz_headers(headers), canonicalized_amz_headers = canonicalize_amz_headers(headers),
canonicalized_resource = "/#{'s3.amazonaws.com' == uri.host ? "" : "#{uri.host.split('.s3.amazonaws.com')[0]}/"}" canonicalized_resource = "/#{'s3.amazonaws.com' == uri.host ? "" : "#{uri.host.split('.s3.amazonaws.com')[0]}/"}"
] ]
string_to_sign = params.delete_if {|value| value.nil? || value.empty?}.join("\n") string_to_sign = params.delete_if {|value| value.nil?}.join("\n")
hmac = @hmac.update(string_to_sign) hmac = @hmac.update(string_to_sign)
signature = Base64.encode64(hmac.digest).strip signature = Base64.encode64(hmac.digest).strip
headers['Authorization'] = "AWS #{@aws_access_key_id}:#{signature}" headers['Authorization'] = "AWS #{@aws_access_key_id}:#{signature}"