aws-sdk-core 2.11.632 → 3.0.0.rc1

data/lib/aws-sdk-core/stubbing/empty_stub.rb

@@ -11,7 +11,11 @@ module Aws
 
       # @return [Structure]
       def stub
-        stub_ref(@rules)
+        if @rules
+          stub_ref(@rules)
+        else
+          EmptyStructure.new
+        end
       end
 
       private
@@ -31,7 +35,7 @@ module Aws
       end
 
       def stub_structure(ref, visited)
-        ref.shape.members.inject(ref[:struct_class].new) do |struct, (mname, mref)|
+        ref.shape.members.inject(ref.shape.struct_class.new) do |struct, (mname, mref)|
           struct[mname] = stub_ref(mref, visited)
           struct
         end

data/lib/aws-sdk-core/stubbing/protocols/ec2.rb

@@ -6,7 +6,7 @@ module Aws
         def stub_data(api, operation, data)
           resp = Seahorse::Client::Http::Response.new
           resp.status_code = 200
-          resp.body = build_body(api, operation, data)
+          resp.body = build_body(api, operation, data) if operation.output
           resp.headers['Content-Length'] = resp.body.size
           resp.headers['Content-Type'] = 'text/xml;charset=UTF-8'
           resp.headers['Server'] = 'AmazonEC2'

data/lib/aws-sdk-core/stubbing/protocols/rest.rb

@@ -40,9 +40,7 @@ module Aws
 
         def build_body(api, operation, data)
           rules = operation.output
-          if head_operation(operation)
-            ""
-          elsif streaming?(rules)
+          if streaming?(rules)
             data[rules[:payload]]
           elsif rules[:payload]
             body_for(api, operation, rules[:payload_member], data[rules[:payload]])
@@ -70,10 +68,6 @@ module Aws
           end
         end
 
-        def head_operation(operation)
-          operation.http_method == "HEAD"
-        end
-
       end
     end
   end

data/lib/aws-sdk-core/stubbing/stub_data.rb

@@ -1,4 +1,5 @@
 module Aws
+  # @api private
   module Stubbing
     class StubData
 
@@ -22,6 +23,9 @@ module Aws
             key = path.split(/\b/)[0]
             stub[key] = nil
           end
+          if more_results = @pager.instance_variable_get('@more_results')
+            stub[more_results] = nil
+          end
         end
       end
 

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

@@ -0,0 +1,39 @@
+require 'cgi'
+
+module Aws
+  # @api private
+  module Util
+    class << self
+
+      def deep_merge(left, right)
+        case left
+        when Hash then left.merge(right) { |key, v1, v2| deep_merge(v1, v2) }
+        when Array then right + left
+        else right
+        end
+      end
+
+      def copy_hash(hash)
+        if Hash === hash
+          deep_copy(hash)
+        else
+          raise ArgumentError, "expected hash, got `#{hash.class}`"
+        end
+      end
+
+      def deep_copy(obj)
+        case obj
+        when Hash
+          obj.inject({}) do |h, (k,v)|
+            h[k] = deep_copy(v)
+            h
+          end
+        when Array
+          obj.map { |v| deep_copy(v) }
+        else
+          v
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.11.632'
+  VERSION = '2.6.28'
 end

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

@@ -0,0 +1,3 @@
+require_relative 'waiters/errors'
+require_relative 'waiters/poller'
+require_relative 'waiters/waiter'

data/lib/aws-sdk-core/waiters/poller.rb

@@ -9,10 +9,12 @@ module Aws
       # @api private
       RAISE_HANDLER = Seahorse::Client::Plugins::RaiseResponseErrors::Handler
 
+      # @option options [required, String] :operation_name
+      # @option options [required, Array<Hash>] :acceptors
       # @api private
       def initialize(options = {})
-        @operation_name = underscore(options['operation']).to_sym
-        @acceptors = options['acceptors'] || []
+        @operation_name = options.fetch(:operation_name)
+        @acceptors = options.fetch(:acceptors)
       end
 
       # @return [Symbol]
@@ -95,9 +97,7 @@ module Aws
       end
 
       def path(acceptor)
-        acceptor['argument'].gsub(/(?<![`'])\b\w+\b(?![`'])/) do |str|
-          Seahorse::Util.underscore(str)
-        end
+        acceptor['argument']
       end
 
       def non_empty_array(acceptor, response, &block)
@@ -109,10 +109,6 @@ module Aws
         end
       end
 
-      def underscore(str)
-        Seahorse::Util.underscore(str)
-      end
-
     end
   end
 end

data/lib/aws-sdk-core/waiters/waiter.rb

@@ -1,5 +1,6 @@
 module Aws
   module Waiters
+    # @api private
     class Waiter
 
       # @api private
@@ -49,7 +50,7 @@ module Aws
       #
       # @yieldparam [Integer] attempts The number of attempts made.
       def before_attempt(&block)
-        @before_attempt << block if block_given?
+        @before_attempt << Proc.new
       end
 
       # Register a callback that is invoked after an attempt but before
@@ -80,7 +81,7 @@ module Aws
       # @yieldparam [Seahorse::Client::Response] response The response from
       #   the previous polling attempts.
       def before_wait(&block)
-        @before_wait << block if block_given?
+        @before_wait << Proc.new
       end
 
       # @option options [Client] :client

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

@@ -0,0 +1,9 @@
+require_relative 'xml/builder'
+require_relative 'xml/default_list'
+require_relative 'xml/default_map'
+require_relative 'xml/doc_builder'
+require_relative 'xml/error_handler'
+require_relative 'xml/parser'
+require_relative 'xml/parser/stack'
+require_relative 'xml/parser/frame'
+require_relative 'xml/parser/parsing_error'

data/lib/aws-sdk-core/xml/builder.rb

@@ -46,7 +46,7 @@ module Aws
       end
 
       def list(name, ref, values)
-        if ref['flattened']
+        if ref.shape.flattened
           values.each do |value|
             member(ref.shape.member.location_name || name, ref.shape.member, value)
           end
@@ -63,7 +63,7 @@ module Aws
       def map(name, ref, hash)
         key_ref = ref.shape.key
         value_ref = ref.shape.value
-        if ref['flattened']
+        if ref.shape.flattened
           hash.each do |key, value|
             node(name, ref) do
               member(key_ref.location_name || 'key', key_ref, key)

data/lib/aws-sdk-core/xml/error_handler.rb

@@ -21,8 +21,7 @@ module Aws
         else
           code, message = extract_error(body, context)
         end
-        svc = context.client.class.name.split('::')[1]
-        errors_module = Aws.const_get(svc).const_get(:Errors)
+        errors_module = context.client.class.errors_module
         errors_module.error_class(code).new(context, message)
       end
 

data/lib/aws-sdk-core/xml/parser.rb

@@ -1,19 +1,9 @@
 module Aws
+  # @api private
   module Xml
-
     # A SAX-style XML parser that uses a shape context to handle types.
     class Parser
 
-      autoload :Stack, 'aws-sdk-core/xml/parser/stack'
-      autoload :Frame, 'aws-sdk-core/xml/parser/frame'
-      autoload :ParsingError, 'aws-sdk-core/xml/parser/parsing_error'
-
-      autoload :LibxmlEngine, 'aws-sdk-core/xml/parser/engines/libxml'
-      autoload :NokogiriEngine, 'aws-sdk-core/xml/parser/engines/nokogiri'
-      autoload :OgaEngine, 'aws-sdk-core/xml/parser/engines/oga'
-      autoload :OxEngine, 'aws-sdk-core/xml/parser/engines/ox'
-      autoload :RexmlEngine, 'aws-sdk-core/xml/parser/engines/rexml'
-
       # @param [Seahorse::Model::ShapeRef] rules
       def initialize(rules, options = {})
         @rules = rules

data/lib/aws-sdk-core/xml/parser/engines/ox.rb

@@ -11,11 +11,7 @@ module Aws
         end
 
         def parse(xml)
-          Ox.sax_parse(
-            @stack, StringIO.new(xml),
-            :convert_special => true,
-            :skip => :skip_white
-          )
+          Ox.sax_parse(@stack, StringIO.new(xml), :convert_special => true)
         end
 
       end

data/lib/aws-sdk-core/xml/parser/frame.rb

@@ -24,9 +24,9 @@ module Aws
 
           def frame_class(ref)
             klass = FRAME_CLASSES[ref.shape.class]
-            if ListFrame == klass && ref[:flattened]
+            if ListFrame == klass && ref.shape.flattened
               FlatListFrame
-            elsif MapFrame == klass && ref[:flattened]
+            elsif MapFrame == klass && ref.shape.flattened
               MapEntryFrame
             else
               klass
@@ -79,7 +79,7 @@ module Aws
 
         def initialize(xml_name, parent, ref, result = nil)
           super
-          @result ||= ref[:struct_class].new
+          @result ||= ref.shape.struct_class.new
 83