aws-sdk-resources 2.0.41 → 2.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dfdb4bceab421c875e0c974245dc680feeb830e
-  data.tar.gz: 865f2db04f7dfa8fc3493379319ac99a715ffc2a
+  metadata.gz: 2a880bded141118198a6ee6645a59e19e748ecfc
+  data.tar.gz: 845e45de69d9b2870ef07a469096c895bb95216f
 SHA512:
-  metadata.gz: 51e3f3c05ae2fca55fa72b4ff9ab2411a8f14876a06f2160fdeffd8640c522406fafdae0b6269e9abc42edf978a8057083c7637a1d6adf99f5bc4d6c4675adc8
-  data.tar.gz: 418f0c2b6026926c54e7f2a9e675fa780fbbf24c791183dd1a587df328b4e63937426424bbfeb5cf287b4d8f2b9db2e8671d85243b5575eb842aa31d0698219d
+  metadata.gz: cdf8fbdd8adcb5fd0a8e883b16f117e880c1a1117b3a8957a4e51b7b7a979488a0d70f73e9c578820c8555793dec6539e9ca9ce1d0f52d79a127b83f9f41ee6f
+  data.tar.gz: 285af3f02301c43b83431d5f70740f96e7dbd14ca8167b4168dac6228e083be603f9f8cdb20f7b624284ada4308c7ba9c7744612b095ad9a2c89e4d26a613c10

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

@@ -159,7 +159,9 @@ module Aws
         # * `:key_provider`
         # * `:encryption_key`
         #
-        # @option opitons [S3::Client] :client A basic S3 client that is used
+        # You may also pass any other options accepted by {S3::Client.new}.
+        #
+        # @option options [S3::Client] :client A basic S3 client that is used
         #   to make api calls. If a `:client` is not provided, a new {S3::Client}
         #   will be constructed.
         #
@@ -180,7 +182,7 @@ module Aws
         #   instruction file uses the object key with this suffix appended.
         #
         def initialize(options = {})
-          @client = options[:client] || S3::Client.new
+          @client = extract_client(options)
           @key_provider = extract_key_provider(options)
           @envelope_location = extract_location(options)
           @instruction_file_suffix = extract_suffix(options)
@@ -230,7 +232,7 @@ module Aws
         # @return (see S3::Client#get_object)
         # @see S3::Client#get_object
         # @note The `:range` request parameter is not yet supported.
-        def get_object(params = {})
+        def get_object(params = {}, &block)
           if params[:range]
             raise NotImplementedError, '#get_object with :range not supported yet'
           end
@@ -242,11 +244,22 @@ module Aws
             envelope_location: envelope_location,
             instruction_file_suffix: instruction_file_suffix,
           }
-          req.send_request
+          req.send_request(target: block)
         end
 
         private
 
+        def extract_client(options)
+          options[:client] || begin
+            options = options.dup
+            options.delete(:key_provider)
+            options.delete(:encryption_key)
+            options.delete(:envelope_location)
+            options.delete(:instruction_file_suffix)
+            S3::Client.new(options)
+          end
+        end
+
         def envelope_options(params)
           location = params.delete(:envelope_location) || @envelope_location
           suffix = params.delete(:instruction_file_suffix)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-resources
 version: !ruby/object:Gem::Version
-  version: 2.0.41
+  version: 2.0.42
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-07 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.41
+        version: 2.0.42
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.41
+        version: 2.0.42
 description: Provides resource oriented interfaces and other higher-level abstractions
   for many AWS services. This gem is part of the official AWS SDK for Ruby.
 email:
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: AWS SDK for Ruby - Resources