diff --git a/lib/fog/aws/requests/s3/get_object.rb b/lib/fog/aws/requests/s3/get_object.rb index e804dfb16..cbbe173fd 100644 --- a/lib/fog/aws/requests/s3/get_object.rb +++ b/lib/fog/aws/requests/s3/get_object.rb @@ -3,6 +3,7 @@ module Fog class S3 # Get an object from S3 + # # ==== Parameters # * bucket_name<~String> - Name of bucket to read from # * object_name<~String> - Name of object to read @@ -10,7 +11,12 @@ module Fog # ==== Returns # * response<~Fog::AWS::Response>: # * body<~String> - Contents of object - # FIXME: headers + # * headers<~Hash>: + # * 'Content-Length'<~String> - Size of object contents + # * 'Content-Type'<~String> - MIME type of object + # * 'ETag'<~String> - Etag of object + # * 'Last-Modified'<~String> - Last modified timestamp for object + # FIXME: optional params def get_object(bucket_name, object_name) request({ :expects => 200, diff --git a/lib/fog/aws/requests/s3/head_object.rb b/lib/fog/aws/requests/s3/head_object.rb index 42837476a..82d8da3ac 100644 --- a/lib/fog/aws/requests/s3/head_object.rb +++ b/lib/fog/aws/requests/s3/head_object.rb @@ -3,7 +3,15 @@ module Fog class S3 # Get headers for an object from S3 - # FIXME: docs + # + # ==== Returns + # * response<~Fog::AWS::Response>: + # * body<~String> - Contents of object + # * headers<~Hash>: + # * 'Content-Length'<~String> - Size of object contents + # * 'Content-Type'<~String> - MIME type of object + # * 'ETag'<~String> - Etag of object + # * 'Last-Modified'<~String> - Last modified timestamp for object def head_object(bucket_name, object_name) request({ :expects => 200,