aws-sdk-resources 2.0.5.pre → 2.0.6.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e1e6e86eb9aa98442dcbab93409180ec65e777b
-  data.tar.gz: 3c8c32a3c19405c47760f70afc003ad57a47aa11
+  metadata.gz: 1836c23ab216964624f76b4e9d5897c005cdb922
+  data.tar.gz: a4c93137ebb9ed5f7a2a5b241e934602f5212a94
 SHA512:
-  metadata.gz: 5e887aa6735dc952bb1f893b1f0cafa82e9e0ed17b0a92833d29c87f9b11c52e40f82e735c384eb9b58ac48a420acb6f5e0e4580172735945c236b34873534d8
-  data.tar.gz: f05ec991a3384228fc0e7bb8bdc711af18c705f937b839d42ed02a8df38c440bb25afd3662e2f2750348486bfc5738b4ab105ce75a421d496f650496026b8ce3
+  metadata.gz: 62c9ab0d1fac25872ddbbc823f8f4c770886fb589c201142a63063e45402eb3b23cce44aea07c082366ce1f5d5175ee2d2ed86a5833b53059b3e326f589cf1c0
+  data.tar.gz: 58b60ec8a12570d5c087e0c7a4bd0593deb7a0dc80cb4a8726aed4ec48fcefd33ea693a3829d47fdb54cf399dbdcfd292dcbccc72b69b3e967e3ec45648ef4b2

data/lib/aws-sdk-resources.rb

@@ -34,7 +34,7 @@ module Aws
       when nil then Resources::Definition.new({})
       when Resources::Definition then definition
       when Hash then Resources::Definition.new(definition)
-      when String then Resources::Definition.new(Aws.load_json(definition), source_path: definition)
+      when String, Pathname then Resources::Definition.new(Aws.load_json(definition), source_path: definition.to_s)
       else raise ArgumentError, "invalid resource definition #{definition}"
       end
     end

data/lib/aws-sdk-resources/builder.rb

@@ -1,5 +1,3 @@
-require 'jamespath'
-
 module Aws
   module Resources
 
@@ -50,9 +48,9 @@ module Aws
       def build_batch(identifier_map, options, &block)
         resources = (0...resource_count(identifier_map)).collect do |n|
           identifiers = @sources.each.with_object({}) do |source, identifiers|
-            identifiers[source.target] = source.plural? ?
-              identifier_map[source.target][n] :
-              identifier_map[source.target]
+            value = identifier_map[source.target]
+            value = value[n] if source.plural?
+            identifiers[source.target] = value
           end
           resource = build_one(identifiers, options)
           yield(resource) if block_given?

data/lib/aws-sdk-resources/builder_sources.rb

@@ -1,4 +1,4 @@
-require 'jamespath'
+require 'jmespath'
 
 module Aws
   module Resources
@@ -82,7 +82,7 @@ module Aws
 
         # @option [required, Resource] :resource
         def extract(options)
-          Jamespath.search(source, resource(options).data)
+          JMESPath.search(source, resource(options).data)
         end
 
         private
@@ -100,7 +100,8 @@ module Aws
 
         # @option [required, Seahorse::Client::Response] :response
         def extract(options)
-          response(options).context.params[source.to_sym]
+          params = response(options).context.params
+          JMESPath.search(source, params)
         end
 
         private
@@ -120,7 +121,7 @@ module Aws
           if source == '$'
             response(options).data
           else
-            Jamespath.search(source, response(options).data)
+            JMESPath.search(source, response(options).data)
           end
         end
 

data/lib/aws-sdk-resources/operations.rb

@@ -1,4 +1,4 @@
-require 'jamespath'
+require 'jmespath'
 
 module Aws
   module Resources
@@ -74,7 +74,7 @@ module Aws
         private
 
         def extract(resp)
-          @path == '$' ? resp.data : Jamespath.search(@path, resp.data)
+          @path == '$' ? resp.data : JMESPath.search(@path, resp.data)
         end
 
       end
@@ -274,7 +274,7 @@ module Aws
           resp = resource.client.wait_until(@waiter_name, params)
 
           resource_opts = resource.identifiers.dup
-          resource_opts[:data] = Jamespath.search(@path, resp.data) if @path
+          resource_opts[:data] = JMESPath.search(@path, resp.data) if @path
           resource_opts[:client] = resource.client
           resource.class.new(resource_opts)
         end

data/lib/aws-sdk-resources/request_params.rb

@@ -26,9 +26,9 @@ module Aws
 
         def computed_params(options)
           params_hash = {}
-          Array(options[:resource]).each do |resource|
+          Array(options[:resource]).each.with_index do |resource, n|
             @params.each do |param|
-              param.apply(params_hash, options.merge(resource: resource))
+              param.apply(params_hash, options.merge(resource: resource, n: n))
             end
           end
           params_hash
@@ -55,9 +55,10 @@ module Aws
         def initialize(target)
           @target = target.to_s
           @steps = []
-          @target.scan(/\w+|\[\]/) do |step|
+          @target.scan(/\w+|\[\]|\[\*\]|\[[0-9]+\]/) do |step|
             case step
-            when /\d+/ then @steps += [:array, step.to_i]
+            when /\[\d+\]/ then @steps += [:array, step[1..-2].to_i]
+            when /\[\*\]/ then @steps += [:array, :n]
             when '[]' then @steps += [:array, -1]
             else @steps += [:hash, step.to_sym]
             end
@@ -72,23 +73,25 @@ module Aws
         # @param [Hash] params
         # @param [Object] value
         # @return [Hash] Returns the modified params hash.
-        def apply(params, value)
+        def apply(params, value, n = nil)
           if @final == -1
-            build_context(params) << value
+            build_context(params, n) << value
           else
-            build_context(params)[@final] = value
+            build_context(params, n)[@final] = value
           end
           params
         end
 
         private
 
-        def build_context(params)
+        def build_context(params, n)
           @steps.each_slice(2).inject(params) do |context, (key, type)|
             entry = type == :array ? [] : {}
             if key == -1
               context << entry
               entry
+            elsif key == :n
+              context[n] ||= entry
             else
               context[key] ||= entry
             end
@@ -113,7 +116,7 @@ module Aws
         # @option [requried, Resource] :resource
         def apply(params_hash, options)
           value = options[:resource].identifiers[identifier_name]
-          super(params_hash, value)
+          super(params_hash, value, options[:n])
         end
 
         # @api private
@@ -139,7 +142,7 @@ module Aws
         # @option [requried, Resource] :resource
         def apply(params_hash, options)
           value = options[:resource].data[member_name.to_sym]
-          super(params_hash, value)
+          super(params_hash, value, options[:n])
         end
 
         # @api private
@@ -163,7 +166,7 @@ module Aws
 
         # @param [Hash] params_hash
         def apply(params_hash, options = {})
-          super(params_hash, value)
+          super(params_hash, value, options[:n])
         end
 
         # @api private
@@ -187,7 +190,7 @@ module Aws
 
         # @param [Hash] params_hash
         def apply(params_hash, options = {})
-          super(params_hash, value)
+          super(params_hash, value, options[:n])
         end
 
         # @api private
@@ -211,7 +214,7 @@ module Aws
 
         # @param [Hash] params_hash
         def apply(params_hash, options = {})
-          super(params_hash, value)
+          super(params_hash, value, options[:n])
         end
 
         # @api private

data/lib/aws-sdk-resources/services/s3.rb

@@ -1,7 +1,9 @@
 module Aws
   module S3
 
+    require 'aws-sdk-resources/services/s3/bucket'
     require 'aws-sdk-resources/services/s3/object'
+    require 'aws-sdk-resources/services/s3/multipart_upload'
 
     autoload :FilePart, 'aws-sdk-resources/services/s3/file_part'
     autoload :FileUploader, 'aws-sdk-resources/services/s3/file_uploader'

data/lib/aws-sdk-resources/services/s3/bucket.rb

@@ -0,0 +1,31 @@
+module Aws
+  module S3
+    class Bucket
+
+      # Deletes all objects and versioned objects from this bucket
+      #
+      # @example
+      #
+      #   bucket.clear!
+      #
+      # @return [void]
+      def clear!
+        object_versions.delete
+      end
+
+      # Deletes all objects and versioned objects from this bucket and
+      # then deletes the bucket.
+      #
+      # @example
+      #
+      #   bucket.delete!
+      #
+      # @return [void]
+      def delete!
+        clear!
+        delete
+      end
+
+    end
+  end
+end

data/lib/aws-sdk-resources/services/s3/multipart_upload.rb

@@ -0,0 +1,40 @@
+module Aws
+  module S3
+    class MultipartUpload
+
+      alias_method :basic_complete, :complete
+
+      # Completes the MultipartUpload.
+      #
+      # To complete a multipart upload, a list of part numbers and their
+      # ETags is required.
+      #
+      #     upload.complete(multipart_upload: { parts: part_list })
+      #
+      # You can pass `:compute_parts => true` and the {Client#list_parts}
+      # method will be called to generate the part list.
+      #
+      #     upload.complete(compute_parts: true)
+      #
+      # @option options [Boolean] :compute_parts (false) When `true`,
+      #   the {Client#list_parts} method will be called to determine
+      #   the list of required part numbers and their ETags.
+      #
+      def complete(options = {})
+        if options.delete(:compute_parts)
+          options[:multipart_upload] = { parts: compute_parts }
+        end
+        basic_complete(options)
+      end
+
+      private
+
+      def compute_parts
+        parts.sort_by(&:part_number).each.with_object([]) do |part, part_list|
+          part_list << { part_number: part.part_number, etag: part.etag }
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-resources
 version: !ruby/object:Gem::Version
-  version: 2.0.5.pre
+  version: 2.0.6.pre
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
 description: Provides resource-oriented abstractions for AWS.
 email: 
 executables: []
@@ -51,9 +51,11 @@ files:
 - lib/aws-sdk-resources/request.rb
 - lib/aws-sdk-resources/request_params.rb
 - lib/aws-sdk-resources/resource.rb
+- lib/aws-sdk-resources/services/s3/bucket.rb
 - lib/aws-sdk-resources/services/s3/file_part.rb
 - lib/aws-sdk-resources/services/s3/file_uploader.rb
 - lib/aws-sdk-resources/services/s3/multipart_file_uploader.rb
+- lib/aws-sdk-resources/services/s3/multipart_upload.rb
 - lib/aws-sdk-resources/services/s3/multipart_upload_error.rb
 - lib/aws-sdk-resources/services/s3/object.rb
 - lib/aws-sdk-resources/services/s3.rb