aws-sdk-core 2.0.2 → 2.0.3

data/lib/aws-sdk-core/elastictranscoder.rb

@@ -2,4 +2,5 @@ Aws.add_service(:ElasticTranscoder, {
   api: File.join(Aws::APIS_DIR, 'ElasticTranscoder.api.json'),
   docs: File.join(Aws::APIS_DIR, 'ElasticTranscoder.docs.json'),
   paginators: File.join(Aws::APIS_DIR, 'ElasticTranscoder.paginators.json'),
+  waiters: File.join(Aws::APIS_DIR, 'ElasticTranscoder.waiters.json'),
 })

data/lib/aws-sdk-core/query/ec2_param_builder.rb

@@ -29,8 +29,10 @@ module Aws
       # @param [String, nil] prefix
       def structure(structure, values, prefix)
         values.each do |name, value|
-          member_shape = structure.member(name)
-          format(member_shape, value, prefix + query_name(member_shape))
+          unless value.nil?
+            member_shape = structure.member(name)
+            format(member_shape, value, prefix + query_name(member_shape))
+          end
         end
       end
 

data/lib/aws-sdk-core/query/param_builder.rb

@@ -29,8 +29,10 @@ module Aws
       # @param [String, nil] prefix
       def structure(structure, values, prefix)
         values.each do |name, value|
-          member_shape = structure.member(name)
-          format(member_shape, value, prefix + query_name(member_shape))
+          unless value.nil?
+            member_shape = structure.member(name)
+            format(member_shape, value, prefix + query_name(member_shape))
+          end
         end
       end
 

data/lib/aws-sdk-core/s3/presigner.rb

@@ -7,8 +7,15 @@ module Aws
     #
     #      signer = Aws::S3::Presigner.new
     #      url = signer.presigned_url(:get_object, bucket: "bucket", key: "key")
+    #
     class Presigner
 
+      # @api private
+      ONE_WEEK = 60 * 60 * 24 * 7
+
+      # @api private
+      FIFTEEN_MINUTES = 60 * 15
+
       # @option options [Client] :client Optionally provide an existing
       #   S3 client
       def initialize(options = {})
@@ -17,13 +24,17 @@ module Aws
 
       # @param [Symbol] method Symbolized method name of the operation you want
       #   to presign.
-      # @option params [Integer] :expires_in (86400) The number of seconds
-      #   before the presigned URL expires. Must be less than 604800 seconds
-      #   (one week).
+      #
+      # @option params [Integer] :expires_in (900) The number of seconds
+      #   before the presigned URL expires. Defaults to 15 minutes.
+      #
+      # @raise [ArgumentError] Raises an ArgumentError if `:expires_in`
+      #   exceeds one week.
+      #
       def presigned_url(method, params = {})
         request = @client.build_request(method, params)
         request.handle(PresignHandler, step: :sign, priority: 99)
-        expires_in = params.delete(:expires_in) || 86400
+        expires_in = params.delete(:expires_in) || FIFTEEN_MINUTES
         validate_expires_in_header(expires_in)
         request.context[:presigned_expires_in] = expires_in
         request.send_request.data
@@ -31,7 +42,7 @@ module Aws
 
       private
       def validate_expires_in_header(expires_in)
-        if(expires_in > 604800)
+        if(expires_in > ONE_WEEK)
           raise ArgumentError.new(
             "expires_in value of #{expires_in} exceeds one-week maximum"
           )

data/lib/aws-sdk-core/version.rb

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

data/lib/seahorse/client/base.rb

@@ -179,11 +179,14 @@ module Seahorse
         # @param [Model::Api, Hash] api
         # @return [Model::Api]
         def set_api(api)
-          if api.is_a?(Hash)
-            @api = Model::Api.new(api)
-          else
-            @api = api
-          end
+          @api =
+            case api
+            when nil then Model::Api.new({})
+            when Model::Api then api
+            when Hash then Model::Api.new(api)
+            when String then Model::Api.new(Util.load_json(api))
+            else raise ArgumentError, "invalid api definition #{api}"
+            end
           define_operation_methods
           @api
         end

data/lib/seahorse/client/net_http/connection_pool.rb

@@ -20,6 +20,7 @@ module Seahorse
       # @attr_reader [Boolean] ssl_verify_peer
       # @attr_reader [String,nil] ssl_ca_bundle
       # @attr_reader [String,nil] ssl_ca_directory
+      # @attr_reader [String,nil] ssl_ca_store
       class ConnectionPool
 
         @pools_mutex = Mutex.new
@@ -36,6 +37,7 @@ module Seahorse
           ssl_verify_peer: true,
           ssl_ca_bundle: nil,
           ssl_ca_directory: nil,
+          ssl_ca_store: nil,
         }
 
         # @api private
@@ -237,6 +239,7 @@ module Seahorse
               :ssl_verify_peer => verify_peer,
               :ssl_ca_bundle => options[:ssl_ca_bundle],
               :ssl_ca_directory => options[:ssl_ca_directory],
+              :ssl_ca_store => options[:ssl_ca_store],
             }
           end
 
@@ -269,6 +272,7 @@ module Seahorse
               http.verify_mode = OpenSSL::SSL::VERIFY_PEER
               http.ca_file = ssl_ca_bundle if ssl_ca_bundle
               http.ca_path = ssl_ca_directory if ssl_ca_directory
+              http.cert_store = ssl_ca_store if ssl_ca_store
             else
               http.verify_mode = OpenSSL::SSL::VERIFY_NONE
             end

data/lib/seahorse/client/plugins/net_http.rb

@@ -12,6 +12,7 @@ module Seahorse
       # @seahorse.client.option [Boolean] :ssl_verify_peer (true)
       # @seahorse.client.option [String] :ssl_ca_bundle
       # @seahorse.client.option [String] :ssl_ca_directory
+      # @seahorse.client.option [String] :ssl_ca_store
       class NetHttp < Plugin
 
         Client::NetHttp::ConnectionPool::OPTIONS.each_pair do |name, default|

data/lib/seahorse/util.rb

@@ -1,4 +1,5 @@
 require 'cgi'
+require 'multi_json'
 
 module Seahorse
   module Util
@@ -24,6 +25,10 @@ module Seahorse
         CGI::escape(string.encode('UTF-8')).gsub('+', '%20').gsub('%7E', '~')
       end
 
+      def load_json(path)
+        MultiJson.load(File.open(path, 'r', encoding: 'UTF-8') { |f| f.read })
+      end
+
     end
 
     @irregular_inflections = {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -82,7 +82,9 @@ files:
 - lib/aws-sdk-core/api/service_customizations.rb
 - lib/aws-sdk-core/autoscaling.rb
 - lib/aws-sdk-core/client.rb
+- lib/aws-sdk-core/client_paging.rb
 - lib/aws-sdk-core/client_stubs.rb
+- lib/aws-sdk-core/client_waiters.rb
 - lib/aws-sdk-core/cloudformation.rb
 - lib/aws-sdk-core/cloudfront.rb
 - lib/aws-sdk-core/cloudsearch.rb
@@ -276,6 +278,7 @@ files:
 - apis/ElasticLoadBalancing.paginators.json
 - apis/ElasticTranscoder.api.json
 - apis/ElasticTranscoder.paginators.json
+- apis/ElasticTranscoder.waiters.json
 - apis/EMR.api.json
 - apis/EMR.paginators.json
 - apis/Glacier.api.json
@@ -349,3 +352,4 @@ signing_key:
 specification_version: 4
 summary: AWS SDK for Ruby - Core
 test_files: []
+has_rdoc: