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

Merge remote branch 'minter/fix_rackspace_escaping'

This commit is contained in:
geemus 2011-03-24 11:11:57 -07:00
commit b7b73e5c8f
9 changed files with 9 additions and 8 deletions

View file

@ -8,6 +8,7 @@ $LOAD_PATH.unshift __LIB_DIR__ unless
require 'rubygems'
require 'base64'
require 'cgi'
require 'uri'
require 'excon'
require 'fileutils'
require 'formatador'

View file

@ -12,7 +12,7 @@ module Fog
response = request(
:expects => 204,
:method => 'DELETE',
:path => CGI.escape(name)
:path => URI.escape(name)
)
response
end

View file

@ -13,7 +13,7 @@ module Fog
response = request(
:expects => 204,
:method => 'DELETE',
:path => "#{CGI.escape(container)}/#{CGI.escape(object)}"
:path => "#{URI.escape(container)}/#{URI.escape(object)}"
)
response
end

View file

@ -33,7 +33,7 @@ module Fog
response = request(
:expects => 200,
:method => 'GET',
:path => container,
:path => URI.escape(container),
:query => {'format' => 'json'}.merge!(options)
)
response

View file

@ -14,7 +14,7 @@ module Fog
:block => block,
:expects => 200,
:method => 'GET',
:path => "#{CGI.escape(container)}/#{CGI.escape(object)}"
:path => "#{URI.escape(container)}/#{URI.escape(object)}"
}, false, &block)
response
end

View file

@ -17,7 +17,7 @@ module Fog
response = request(
:expects => 204,
:method => 'HEAD',
:path => container,
:path => URI.escape(container),
:query => {'format' => 'json'}
)
response

View file

@ -13,7 +13,7 @@ module Fog
response = request({
:expects => 200,
:method => 'GET',
:path => "#{CGI.escape(container)}/#{CGI.escape(object)}"
:path => "#{URI.escape(container)}/#{URI.escape(object)}"
}, false)
response
end

View file

@ -12,7 +12,7 @@ module Fog
response = request(
:expects => [201, 202],
:method => 'PUT',
:path => CGI.escape(name)
:path => URI.escape(name)
)
response
end

View file

@ -16,7 +16,7 @@ module Fog
:expects => 201,
:headers => headers,
:method => 'PUT',
:path => "#{CGI.escape(container)}/#{CGI.escape(object)}"
:path => "#{URI.escape(container)}/#{URI.escape(object)}"
)
response
end