aws-sdk 1.4.1 → 1.5.0

data/lib/aws/s3/client/xml.rb

@@ -18,69 +18,37 @@ module AWS
       # @private
       module XML
 
-        Error = Core::XmlGrammar.customize { }
+        BaseGrammar = Core::XML::Grammar.new({}, :inflect_rename => true)
 
-        module HasCommonPrefixes
-
-          def self.included(mod)
-            mod.module_eval do
-              element "CommonPrefixes" do
-                collect_values
-                format_value {|value| value.prefix }
-              end
-            end
-          end
-
-        end
-
-        ListBuckets = Core::XmlGrammar.customize do
+        ListBuckets = BaseGrammar.customize do
           element "Buckets" do
-            element "Bucket" do
-              collect_values
-            end
-            format_value { |value| super(value.bucket) }
+            list "Bucket"
           end
         end
 
-        GetBucketAcl = GetObjectAcl = Core::XmlGrammar.customize do
-          wrapper(:acl,
-                  :for => ["Owner",
-                           "AccessControlList"]) do
-            construct_value { AccessControlList.new }
-          end
-
-          element "Owner" do
-            construct_value { AccessControlList::Owner.new }
-          end
-
+        GetBucketAcl = GetObjectAcl = BaseGrammar.customize do
           element "AccessControlList" do
+            ignore
             element "Grant" do
-              collect_values
-              construct_value { AccessControlList::Grant.new }
-
+              rename :grants
+              list
               element "Grantee" do
-                construct_value { AccessControlList::Grantee.new }
                 element "ID" do
                   rename :canonical_user_id
                 end
               end
-
               element "Permission" do
                 symbol_value
               end
             end
-
-            format_value { |value| super(value.grant) }
-            rename :grants
-
           end
         end
 
-        ListObjects = Core::XmlGrammar.customize do
+        ListObjects = BaseGrammar.customize do
 
-          element("Name") { rename "bucket_name" }
+          element("Name") { rename :bucket_name }
           element("MaxKeys") { integer_value }
-          element("IsTruncated") { rename "truncated"; boolean_value }
+          element("IsTruncated") { rename :truncated; boolean_value }
           element("Delimiter") { force }
 
           element("Contents") do
@@ -92,64 +60,66 @@ module AWS
             element("Key") { }
             element("Size") { }
             element("StorageClass") { }
-            element("ETag") { rename "etag" }
+            element("ETag") { rename :etag }
 
-            # DateTime is more general, Time is much faster to construct
             element("LastModified") { time_value }
           end
 
-          include HasCommonPrefixes
+          element "CommonPrefixes" do
+            collect_values
+          end
 
         end
 
-        GetBucketVersioning = Core::XmlGrammar.customize do
+        GetBucketVersioning = BaseGrammar.customize do
+          default_value :status, :unversioned
           element("Status") do
             symbol_value
-            format_value {|value| super(value) || :unversioned }
-            force
           end
         end
 
-        ListObjectVersions = Core::XmlGrammar.customize do
+        ListObjectVersions = BaseGrammar.customize do
 
           element("MaxKeys") { integer_value }
-          element("IsTruncated") { rename "Truncated"; boolean_value }
+          element("IsTruncated") { rename :truncated; boolean_value }
           element("NextKeyMarker") { force }
           element("NextVersionIdMarker") { force }
 
           %w(DeleteMarker Version).each do |element_name|
             element(element_name) do
               collect_values
-              rename("versions")
-              element("IsLatest") { rename "latest"; boolean_value }
+              rename(:versions)
+              element("IsLatest") { rename :latest; boolean_value }
               element("LastModified") { datetime_value }
-              element("ETag") { rename "etag" }
+              element("ETag") { rename :etag }
               element("Size") { integer_value }
               element("StorageClass") { symbol_value }
             end
           end
 
           element "DeleteMarker" do
-            add_method(:delete_marker?) { true }
-            add_method(:version?) { false }
+            default_value(:delete_marker, true)
+            default_value(:version, false)
           end
 
           element "Version" do
-            add_method(:delete_marker?) { false }
-            add_method(:version?) { true }
+            default_value(:delete_marker, false)
+            default_value(:version, true)
           end
 
-          include HasCommonPrefixes
+          element "CommonPrefixes" do
+            collect_values
+          end
 
         end
 
-        # default behavior is good enough
-        InitiateMultipartUpload = Core::XmlGrammar.customize do
+        InitiateMultipartUpload = BaseGrammar.customize do
           element("UploadId") { force }
         end
 
-        ListMultipartUploads = Core::XmlGrammar.customize do
-          element("IsTruncated") { rename "Truncated"; boolean_value }
+        ListMultipartUploads = BaseGrammar.customize do
+
+          element("IsTruncated") { rename :truncated; boolean_value }
           element("MaxUploads") { integer_value }
           element("NextKeyMarker") { force }
           element("NextUploadIdMarker") { force }
@@ -159,23 +129,26 @@ module AWS
             element("StorageClass") { symbol_value }
             element("Initiated") { datetime_value }
           end
-          include HasCommonPrefixes
+
+          element "CommonPrefixes" do
+            collect_values
+          end
+
         end
 
-        DeleteObjects = Core::XmlGrammar.customize do
+        DeleteObjects = BaseGrammar.customize do
           element("Deleted") do
             element("DeleteMarker") { boolean_value }
             list
           end
-          element("Error") { list; rename('errors') }  
+          element("Error") { list; rename(:errors) }  
         end
 
-        # keep default behavior
-        CompleteMultipartUpload = Core::XmlGrammar.customize
+        CompleteMultipartUpload = BaseGrammar.customize
 
-        ListParts = Core::XmlGrammar.customize do
+        ListParts = BaseGrammar.customize do
           element("StorageClass") { symbol_value }
-          element("IsTruncated") { rename "Truncated"; boolean_value }
+          element("IsTruncated") { rename :truncated; boolean_value }
           element("MaxParts") { integer_value }
           element("PartNumberMarker") { integer_value }
           element("NextPartNumberMarker") { integer_value }
@@ -188,10 +161,10 @@ module AWS
           end
         end
 
-        GetBucketLifecycleConfiguration = Core::XmlGrammar.customize do
+        GetBucketLifecycleConfiguration = BaseGrammar.customize do
           element("Rule") do
             list
-            rename("Rules")  
+            rename(:rules)  
             element("Expiration") do
               element("Days") { integer_value }
             end

data/lib/aws/s3/data_options.rb

@@ -15,9 +15,12 @@ require 'pathname'
 
 module AWS
   class S3
+
+    # @private
     module DataOptions
 
       protected
+
       def data_stream_from options, &block
 
         validate_data!(options, block)
@@ -45,7 +48,6 @@ module AWS
 
       end
 
-      protected
       def content_length_from options
         data = options[:data]
         case
@@ -61,7 +63,6 @@ module AWS
         end
       end
 
-      protected
       def validate_data! options, block
 
         data = options[:data]

data/lib/aws/s3/errors.rb

@@ -31,6 +31,11 @@ module AWS
     # @private
     module Errors
 
+      # @private
+      GRAMMAR = Core::XML::Grammar.customize
+
+      extend Core::LazyErrorClasses
+
       class BatchDeleteError < StandardError
 
         def initialize error_counts
@@ -52,10 +57,8 @@ module AWS
 
         include AWS::Errors::ClientError
 
-        def code; "NotModified"; end
-
         def initialize(req, resp)
-          super(req, resp, "Not Modified")
+          super(req, resp, "NotModified", "Not Modified")
         end
 
       end
@@ -67,18 +70,12 @@ module AWS
 
         include AWS::Errors::ClientError
 
-        def code; "NoSuchKey"; end
-
-        def initialize(req, resp)
-          super(req, resp, "No Such Key")
+        def initialize(req, resp, code = nil, message = nil)
+          super(req, resp, "NoSuchKey", "No Such Key")
         end
 
       end
 
-      BASE_ERROR_GRAMMAR = Client::XML::Error
-
-      include Core::LazyErrorClasses
-
     end
   end
 end

data/lib/aws/s3/multipart_upload_collection.rb

@@ -44,6 +44,7 @@ module AWS
       end
 
       protected
+
       def each_member_in_page(page, &block)
         super
         page.uploads.each do |u|
@@ -53,15 +54,12 @@ module AWS
         end
       end
 
-      protected
       def list_request(options)
         client.list_multipart_uploads(options)
       end
 
-      protected
       def limit_param; :max_uploads; end
 
-      protected
       def pagination_markers; super + [:upload_id_marker]; end
 
     end

data/lib/aws/s3/object_collection.rb

@@ -62,7 +62,8 @@ module AWS
       include Enumerable
       include PrefixAndDelimiterCollection
 
-      # @param [Bucket] The S3 bucket this object collection belongs to.
+      # @param [Bucket] bucket The S3 bucket this object collection belongs to.
+      # @param [Hash] options
       def initialize(bucket, options = {})
         @bucket = bucket
         super

data/lib/aws/s3/object_metadata.rb

@@ -19,11 +19,11 @@ module AWS
 
       include Core::Model
 
-      # @param [S3Object]
+      # @param [S3Object] object
       # @param [Hash] options
       # @option options [String] :version_id A specific version of the object
       #   to get metadata for
-      def initialize(object, options = {})
+      def initialize object, options = {}
         @object = object
         @version_id = options[:version_id]
         super

data/lib/aws/s3/paginated_collection.rb

@@ -30,7 +30,7 @@ module AWS
 
         each_member_in_page(response, &block)
       
-        response.truncated? ? next_markers(response) : nil
+        response.data[:truncated] ? next_markers(response) : nil
 
       end
 
@@ -62,7 +62,7 @@ module AWS
       protected
       def next_markers page
         pagination_markers.inject({}) do |markers, marker_name|
-          if marker = page.send("next_#{marker_name}")
+          if marker = page.data[:"next_#{marker_name}"]
             markers[marker_name] = marker if marker
           end
           markers

data/lib/aws/s3/prefix_and_delimiter_collection.rb

@@ -29,7 +29,7 @@ module AWS
       def each_member_in_page(page, &block)
         super
         page.common_prefixes.each do |p|
-          yield(with_prefix(p))
+          yield(with_prefix(p[:prefix]))
         end
       end
 

data/lib/aws/s3/presigned_post.rb

@@ -25,29 +25,30 @@ module AWS
     # stored.
     #
     # @example Form fields for uploading by file name
-    #  form = bucket.presigned_post(:key => "photos/${filename}")
-    #  form.url.to_s        # => "https://mybucket.s3.amazonaws.com/"
-    #  form.fields          # => { "AWSAccessKeyId" => "...", ... }
+    #
+    #   form = bucket.presigned_post(:key => "photos/${filename}")
+    #   form.url.to_s        # => "https://mybucket.s3.amazonaws.com/"
+    #   form.fields          # => { "AWSAccessKeyId" => "...", ... }
     #
     # @example Generating a minimal HTML form
-    #  form = bucket.objects.myobj.presigned_post
-    #  hidden_inputs = form.fields.map do |(name, value)|
-    #    %(<input type="hidden" name="#{name}" value="#{value}" />)
-    #  end
-    #  <<-END
-    #  <form action="#{form.url}"
-    #        method="post"
-    #        enctype="multipart/form-data">
-    #    #{hidden_inputs}
-    #    <input type="file" name="file" />
-    #  </form>
-    #  END
+    #
+    #   form = bucket.objects.myobj.presigned_post
+    #   hidden_inputs = form.fields.map do |(name, value)|
+    #     %(<input type="hidden" name="#{name}" value="#{value}" />)
+    #   end
+    #   <<-END
+    #   <form action="#{form.url}" method="post" enctype="multipart/form-data">
+    #     #{hidden_inputs}
+    #     <input type="file" name="file" />
+    #   </form>
+    #   END
     #
     # @example Restricting the size of the uploaded object
-    #  bucket.presigned_post(:content_length => 1..(10*1024))
+    #   bucket.presigned_post(:content_length => 1..(10*1024))
     #
     # @example Restricting the key prefix
-    #  bucket.presigned_post.where(:key).starts_with("photos/")
+    #   bucket.presigned_post.where(:key).starts_with("photos/")
+    #
     class PresignedPost
 
       include Core::Model

data/lib/aws/s3/request.rb

@@ -22,12 +22,13 @@ module AWS
 
       include Core::UriEscape
 
-      # @param [bucket] S3 bucket name
+      # @return [bucket] S3 bucket name
       attr_accessor :bucket
 
-      # @param [String] S3 object key
+      # @return [String] S3 object key
       attr_accessor :key
 
+      # @private
       attr_accessor :body_stream
 
       def metadata= metadata
@@ -67,7 +68,7 @@ module AWS
         url_encoded_params
       end
 
-      # @param [String, IO] The http request body.  This can be a string or
+      # @param [String, IO] body The http request body.  This can be a string or
       #   any object that responds to #read and #eof? (like an IO object).
       def body= body
         @body_stream = StringIO.new(body)

data/lib/aws/s3/s3_object.rb

@@ -204,17 +204,14 @@ module AWS
       #
       # @overload write(options = {})
       # @overload write(data, options = {})
-      #
-      # @param data The data to upload (see the +:data+
-      #   option).
+      #   @param data The data to upload (see the +:data+ option).
       #
       # @param options [Hash] Additional upload options.
       #
       # @option options :data The data to upload.  Valid values include:
-      #   * A string
       #
+      #   * A string
       #   * A Pathname object
-      #
       #   * Any object responding to +read+ and +eof?+; the object
       #     must support the following access methods:
       #       read                     # all at once
@@ -704,7 +701,7 @@ module AWS
       def read(options = {}, &blk)
         options[:bucket_name] = bucket.name
         options[:key] = key
-        client.get_object(options).data
+        client.get_object(options).data[:data]
       end
 
       # @private
@@ -740,13 +737,14 @@ module AWS
       # @return [AccessControlList]
       #
       def acl
-        acl = client.get_object_acl(
-          :bucket_name => bucket.name,
-          :key => key
-        ).acl
+
+        resp = client.get_object_acl(:bucket_name => bucket.name, :key => key)
+
+        acl = AccessControlList.new(resp.data)
         acl.extend ACLProxy
         acl.object = self
         acl
+
       end
 
       # Sets the object's access control list.  +acl+ can be: