aws-sdk-resources 2.0.15.pre → 2.0.16.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f052a7ea17d6dae941c7488668075d7faecf9767
-  data.tar.gz: cae90c630414ec0552c9b8e4df95449222d048e7
+  metadata.gz: 0e220113a1956aa99dfbe792083ce5a837401a28
+  data.tar.gz: 04d6bb70744e607ee5b3f7fafbfaffc083775efb
 SHA512:
-  metadata.gz: bc04753ba36090c1c4f521b2c2648d1bfd0f8cfa3071c15cd2ae21ec828cda120aa31c08dfd72941a20e71c12140773ce15fd8b124eb32e2b8e5f1e049a69212
-  data.tar.gz: 901efaa0baa5c3f8e52871c4ec57c963400c0cf1ebed22ec8f59d34f2cc2fe2d5d4cbfde9fc34af7da5639656e0da834a78723ce3efca06a8c5c16484c71c824
+  metadata.gz: 036276e67b40d3da28dbe8e088f3f839141a7bd255131e2e2aa106f4c13d073733610c41fdeac979c6314ff3334ef5845238d8b0f41ab54429b7f42ddf9609df
+  data.tar.gz: c4bdd9e7e8b48d495e5360fa4474598c6249367e668d0ae97c613a2bdd4a684ee83903b73c6d57e33bff95ced31ce05714f11ca0c94ea557e312936be5ba7aea

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

@@ -200,11 +200,14 @@ module Aws
         #   by this string.
         attr_reader :instruction_file_suffix
 
-        # Calls {S3::Client#put_object}. The `:body` option will be encrypted
-        # client-side before sending data to Amazon S3.
+        # Uploads an object to Amazon S3, encrypting data client-side.
+        # See {S3::Client#put_object} for documentation on accepted
+        # request parameters.
+        # @option (see S3::Client#put_object)
+        # @return (see S3::Client#put_object)
         # @see S3::Client#put_object
-        def put_object(options = {})
-          req = @client.build_request(:put_object, options)
+        def put_object(params = {})
+          req = @client.build_request(:put_object, params)
           req.handlers.add(EncryptHandler, priority: 95)
           req.context[:encryption] = {
             materials: @key_provider.encryption_materials,
@@ -214,30 +217,46 @@ module Aws
           req.send_request
         end
 
-        # Performs an `#get_object` request on the `#config.client`. The
-        # response body is decrypted as it is read from the HTTP response
-        # socket. See {Client#get_object} for documentation on valid
-        # options.
-        def get_object(options = {})
-          if options[:range]
+        # Gets an object from Amazon S3, decrypting  data locally.
+        # See {S3::Client#get_object} for documentation on accepted
+        # request parameters.
+        # @option params [String] :instruction_file_suffix The suffix
+        #   used to find the instruction file containing the encryption
+        #   envelope. You should not set this option when the envelope
+        #   is stored in the object metadata. Defaults to
+        #   {#instruction_file_suffix}.
+        # @option params [String] :instruction_file_suffix
+        # @option (see S3::Client#get_object)
+        # @return (see S3::Client#get_object)
+        # @see S3::Client#get_object
+        # @note The `:range` request parameter is not yet supported.
+        def get_object(params = {})
+          if params[:range]
             raise NotImplementedError, '#get_object with :range not supported yet'
           end
-
-          location = options.delete(:envelope_location) || @envelope_location
-          suffix = options.delete(:instruction_file_suffix) || @instruction_file_suffix
-
-          req = @client.build_request(:get_object, options)
+          envelope_location, instruction_file_suffix = envelope_options(params)
+          req = @client.build_request(:get_object, params)
           req.handlers.add(DecryptHandler)
           req.context[:encryption] = {
             key_provider: @key_provider,
-            envelope_location: location,
-            instruction_file_suffix: suffix,
+            envelope_location: envelope_location,
+            instruction_file_suffix: instruction_file_suffix,
           }
           req.send_request
         end
 
         private
 
+        def envelope_options(params)
+          location = params.delete(:envelope_location) || @envelope_location
+          suffix = params.delete(:instruction_file_suffix)
+          if suffix
+            [:instruction_file, suffix]
+          else
+            [location, @instruction_file_suffix]
+          end
+        end
+
         def extract_key_provider(options)
           if options[:key_provider]
             options[:key_provider]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-resources
 version: !ruby/object:Gem::Version
-  version: 2.0.15.pre
+  version: 2.0.16.pre
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2014-12-18 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.15
+        version: 2.0.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.15
+        version: 2.0.16
 description: Provides resource-oriented abstractions for AWS.
 email: 
 executables: []