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 branch 'master' of git@github.com:geemus/fog

Browse source
This commit is contained in:
Wesley Beary 2009-10-04 15:37:22 -07:00
commit 27deaf7a94
6 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/fog/aws/requests/s3/copy_object.rb
View file

@ -33,7 +33,7 @@ unless Fog.mocking?
:host => "#{target_bucket_name}.#{@host}",
:method => 'PUT',
:parser => Fog::Parsers::AWS::S3::CopyObject.new,
:path => target_object_name
:path => CGI.escape(target_object_name)
})
end

2
lib/fog/aws/requests/s3/delete_object.rb
View file

@ -19,7 +19,7 @@ unless Fog.mocking?
:headers => {},
:host => "#{bucket_name}.#{@host}",
:method => 'DELETE',
:path => object_name
:path => CGI.escape(object_name)
})
end

2
lib/fog/aws/requests/s3/get_object.rb
View file

@ -39,7 +39,7 @@ unless Fog.mocking?
:headers => headers,
:host => "#{bucket_name}.#{@host}",
:method => 'GET',
:path => object_name,
:path => CGI.escape(object_name),
:block => block
})
end

2
lib/fog/aws/requests/s3/head_object.rb
View file

@ -34,7 +34,7 @@ unless Fog.mocking?
:headers => headers,
:host => "#{bucket_name}.#{@host}",
:method => 'HEAD',
:path => object_name
:path => CGI.escape(object_name)
})
end

2
lib/fog/aws/requests/s3/put_object.rb
View file

@ -33,7 +33,7 @@ unless Fog.mocking?
:headers => headers,
:host => "#{bucket_name}.#{@host}",
:method => 'PUT',
:path => object_name
:path => CGI.escape(object_name)
})
end

37
lib/fog/connection.rb
View file

@ -17,13 +17,20 @@ unless Fog.mocking?
def initialize(url)
@uri = URI.parse(url)
@connection = TCPSocket.open(@uri.host, @uri.port)
if @uri.scheme == 'https'
@ssl_context = OpenSSL::SSL::SSLContext.new
@ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
@connection = OpenSSL::SSL::SSLSocket.new(@connection, @ssl_context)
@connection.sync_close = true
@connection.connect
end
def connection
if @connection && !@connection.closed?
@connection
else
@connection = TCPSocket.open(@uri.host, @uri.port)
if @uri.scheme == 'https'
@ssl_context = OpenSSL::SSL::SSLContext.new
@ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
@connection = OpenSSL::SSL::SSLSocket.new(@connection, @ssl_context)
@connection.sync_close = true
@connection.connect
end
end
end
@ -45,7 +52,7 @@ unless Fog.mocking?
request << "#{key}: #{value}\r\n"
end
request << "\r\n"
@connection.write(request)
connection.write(request)
if params[:body]
if params[:body].is_a?(String)
@ -54,18 +61,18 @@ unless Fog.mocking?
body = params[:body]
end
while chunk = body.read(CHUNK_SIZE)
@connection.write(chunk)
connection.write(chunk)
end
end
response = Fog::Response.new
response.request = params
response.status = @connection.readline[9..11].to_i
response.status = connection.readline[9..11].to_i
if params[:expects] && params[:expects] != response.status
error = true
end
while true
data = @connection.readline.chomp!
data = connection.readline.chomp!
if data == ""
break
end
@ -89,19 +96,19 @@ unless Fog.mocking?
if response.headers['Content-Length']
if error || !params[:block]
body << @connection.read(response.headers['Content-Length'].to_i)
body << connection.read(response.headers['Content-Length'].to_i)
else
remaining = response.headers['Content-Length'].to_i
while remaining > 0
params[:block].call(@connection.read([CHUNK_SIZE, remaining].min))
params[:block].call(connection.read([CHUNK_SIZE, remaining].min))
remaining -= CHUNK_SIZE;
end
end
elsif response.headers['Transfer-Encoding'] == 'chunked'
while true
# 2 == "/r/n".length
chunk_size = @connection.readline.chomp!.to_i(16) + 2
chunk = @connection.read(chunk_size)[0...-2]
chunk_size = connection.readline.chomp!.to_i(16) + 2
chunk = connection.read(chunk_size)[0...-2]
if error || !params[:block]
body << chunk
else