aws-sdk-core 2.0.48 → 2.1.0

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

@@ -15,7 +15,12 @@ module Aws
 
       def error(context)
         body = context.http_response.body_contents
-        code, message = extract_error(body, context)
+        if body.empty?
+          code = http_status_error_code(context)
+          message = ''
+        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.error_class(code).new(context, message)
@@ -50,7 +55,7 @@ module Aws
       end
 
       def remove_prefix(error_code, context)
-        if prefix = context.config.api.metadata('errorPrefix')
+        if prefix = context.config.api.metadata['errorPrefix']
           error_code.sub(/^#{prefix}/, '')
         else
           error_code

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

@@ -13,9 +13,9 @@ module Aws
       autoload :OxEngine, 'aws-sdk-core/xml/parser/engines/ox'
       autoload :RexmlEngine, 'aws-sdk-core/xml/parser/engines/rexml'
 
-      # @param [Seahorse::Model::Shapes::Structure] shape
-      def initialize(shape, options = {})
-        @shape = shape
+      # @param [Seahorse::Model::ShapeRef] rules
+      def initialize(rules, options = {})
+        @rules = rules
         @engine = options[:engine] || self.class.engine
       end
 
@@ -24,7 +24,7 @@ module Aws
       # @return [Structure]
       def parse(xml, target = nil)
         xml = '<xml/>' if xml.nil? or xml.empty?
-        stack = Stack.new(@shape, target)
+        stack = Stack.new(@rules, target)
         @engine.new(stack).parse(xml.to_s)
         stack.result
       end

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

@@ -6,16 +6,45 @@ module Aws
     class Parser
       class Frame
 
-        def initialize(parent, shape, result = nil)
+        include Seahorse::Model::Shapes
+
+        class << self
+
+          def new(parent, ref, result = nil)
+            if self == Frame
+              frame = frame_class(ref && ref.shape).allocate
+              frame.send(:initialize, parent, ref, result)
+              frame
+            else
+              super
+            end
+          end
+
+          private
+
+          def frame_class(shape)
+            klass = FRAME_CLASSES[shape.class]
+            if ListFrame == klass && shape[:flattened]
+              FlatListFrame
+            elsif MapFrame == klass && shape[:flattened]
+              MapEntryFrame
+            else
+              klass
+            end
+          end
+
+        end
+
+        def initialize(parent, ref, result = nil)
           @parent = parent
-          @shape = shape
+          @ref = ref
           @result = result
           @text = []
         end
 
         attr_reader :parent
 
-        attr_reader :shape
+        attr_reader :ref
 
         attr_reader :result
 
@@ -29,70 +58,26 @@ module Aws
 
         def consume_child_frame(child); end
 
-        private
-
-        class << self
-
-          def new(parent, shape, result = nil)
-            if self == Frame
-              frame = frame_class(shape).allocate
-              frame.send(:initialize, parent, shape, result)
-              frame
-            else
-              super
-            end
-          end
-
-          private
-
-          def frame_class(shape)
-            @classes ||= {
-              'blob' => BlobFrame,
-              'boolean' => BooleanFrame,
-              'byte' => BlobFrame,
-              'character' => StringFrame,
-              'double' => FloatFrame,
-              'float' => FloatFrame,
-              'integer' => IntegerFrame,
-              'list' => ListFrame,
-              'list:flat' => FlatListFrame,
-              'long' => IntegerFrame,
-              'map' => MapFrame,
-              'map:flat' => MapEntryFrame,
-              'string' => StringFrame,
-              'structure' => StructureFrame,
-              'timestamp' => TimestampFrame,
-            }
-            if shape
-              type = shape.type
-              type += ':flat' if shape.definition['flattened']
-              @classes[type]
-            else
-              NullFrame
-            end
-          end
-
-        end
       end
 
       class StructureFrame < Frame
 
-        def initialize(parent, shape, result = nil)
+        def initialize(parent, ref, result = nil)
           super
-          @result ||= Structure.new(shape.member_names)
+          @result ||= ref[:struct_class].new
           @members = {}
-          shape.members.each do |member_name, member_shape|
-            apply_default_value(member_name, member_shape)
-            @members[xml_name(member_shape)] = {
+          ref.shape.members.each do |member_name, member_ref|
+            apply_default_value(member_name, member_ref)
+            @members[xml_name(member_ref)] = {
               name: member_name,
-              shape: member_shape,
+              ref: member_ref,
             }
           end
         end
 
         def child_frame(xml_name)
           if @member = @members[xml_name]
-            Frame.new(self, @member[:shape])
+            Frame.new(self, @member[:ref])
           else
             NullFrame.new(self)
           end
@@ -112,21 +97,25 @@ module Aws
 
         private
 
-        def apply_default_value(name, shape)
-          case shape
-          when Seahorse::Model::Shapes::List then @result[name] = DefaultList.new
-          when Seahorse::Model::Shapes::Map then @result[name] = {}
+        def apply_default_value(name, ref)
+          case ref.shape
+          when ListShape then @result[name] = DefaultList.new
+          when MapShape then @result[name] = DefaultMap.new
           end
         end
 
-        def xml_name(member_shape)
-          if member_shape.type == 'list' && member_shape.definition['flattened']
-            member_shape.member.location_name || member_shape.location_name
+        def xml_name(ref)
+          if flattened_list?(ref.shape)
+            ref.shape.member.location_name || ref.location_name
           else
-            member_shape.location_name
+            ref.location_name
           end
         end
 
+        def flattened_list?(shape)
+          ListShape === shape && shape['flattened']
+        end
+
       end
 
       class ListFrame < Frame
@@ -134,12 +123,12 @@ module Aws
         def initialize(*args)
           super
           @result = []
-          @member_xml_name = @shape.member.location_name || 'member'
+          @member_xml_name = @ref.shape.member.location_name || 'member'
         end
 
         def child_frame(xml_name)
           if xml_name == @member_xml_name
-            Frame.new(self, @shape.member)
+            Frame.new(self, @ref.shape.member)
           else
             raise NotImplementedError
           end
@@ -155,7 +144,7 @@ module Aws
 
         def initialize(*args)
           super
-          @member = Frame.new(self, @shape.member)
+          @member = Frame.new(self, @ref.shape.member)
         end
 
         def result
@@ -185,7 +174,7 @@ module Aws
 
         def child_frame(xml_name)
           if xml_name == 'entry'
-            MapEntryFrame.new(self, @shape)
+            MapEntryFrame.new(self, @ref)
           else
             raise NotImplementedError
           end
@@ -201,10 +190,10 @@ module Aws
 
         def initialize(*args)
           super
-          @key_name = @shape.key.location_name || 'key'
-          @key = Frame.new(self, @shape.key)
-          @value_name = @shape.value.location_name || 'value'
-          @value = Frame.new(self, @shape.value)
+          @key_name = @ref.shape.key.location_name || 'key'
+          @key = Frame.new(self, @ref.shape.key)
+          @value_name = @ref.shape.value.location_name || 'value'
+          @value = Frame.new(self, @ref.shape.value)
         end
 
         # @return [StringFrame]
@@ -278,6 +267,22 @@ module Aws
           end
         end
       end
+
+      include Seahorse::Model::Shapes
+
+      FRAME_CLASSES = {
+        NilClass => NullFrame,
+        BlobShape => BlobFrame,
+        BooleanShape => BooleanFrame,
+        FloatShape => FloatFrame,
+        IntegerShape => IntegerFrame,
+        ListShape => ListFrame,
+        MapShape => MapFrame,
+        StringShape => StringFrame,
+        StructureShape => StructureFrame,
+        TimestampShape => TimestampFrame,
+      }
+
     end
   end
 end

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

@@ -3,8 +3,8 @@ module Aws
     class Parser
       class Stack
 
-        def initialize(shape, result = nil)
-          @shape = shape
+        def initialize(ref, result = nil)
+          @ref = ref
           @frame = self
           @result = result
         end
@@ -19,7 +19,7 @@ module Aws
 
         def attr(name, value)
           if name.to_s == 'encoding' && value.to_s == 'base64'
-            @frame = BlobFrame.new(@frame.parent, @frame.shape)
+            @frame = BlobFrame.new(@frame.parent, @frame.ref)
           else
             start_element(name)
             text(value)
@@ -45,7 +45,7 @@ module Aws
         end
 
         def child_frame(name)
-          Frame.new(self, @shape, @result)
+          Frame.new(self, @ref, @result)
         end
 
         def consume_child_frame(frame)

data/lib/seahorse.rb

@@ -13,8 +13,6 @@ module Seahorse
     autoload :HandlerListEntry, 'seahorse/client/handler_list_entry'
     autoload :ManagedFile, 'seahorse/client/managed_file'
     autoload :NetworkingError, 'seahorse/client/networking_error'
-    autoload :ParamConverter, 'seahorse/client/param_converter'
-    autoload :ParamValidator, 'seahorse/client/param_validator'
     autoload :Plugin, 'seahorse/client/plugin'
     autoload :PluginList, 'seahorse/client/plugin_list'
     autoload :Request, 'seahorse/client/request'
@@ -42,27 +40,18 @@ module Seahorse
     module Plugins
       autoload :ContentLength, 'seahorse/client/plugins/content_length'
       autoload :Endpoint, 'seahorse/client/plugins/endpoint'
-      autoload :JsonSimple, 'seahorse/client/plugins/json_simple'
       autoload :Logging, 'seahorse/client/plugins/logging'
       autoload :NetHttp, 'seahorse/client/plugins/net_http'
-      autoload :ParamConversion, 'seahorse/client/plugins/param_conversion'
-      autoload :ParamValidation, 'seahorse/client/plugins/param_validation'
       autoload :RaiseResponseErrors, 'seahorse/client/plugins/raise_response_errors'
       autoload :ResponseTarget, 'seahorse/client/plugins/response_target'
       autoload :RestfulBindings, 'seahorse/client/plugins/restful_bindings'
     end
 
-    # @api private
-    module Xml
-      autoload :Builder, 'seahorse/client/xml/builder'
-    end
-
   end
 
   module Model
     autoload :Api, 'seahorse/model/api'
     autoload :Operation, 'seahorse/model/operation'
-    autoload :ShapeMap, 'seahorse/model/shape_map'
     autoload :Shapes, 'seahorse/model/shapes'
   end
 

data/lib/seahorse/client/base.rb

@@ -10,8 +10,6 @@ module Seahorse
       @plugins = PluginList.new([
         Plugins::Endpoint,
         Plugins::NetHttp,
-        Plugins::ParamConversion,
-        Plugins::ParamValidation,
         Plugins::RaiseResponseErrors,
         Plugins::ResponseTarget,
       ])
@@ -90,7 +88,7 @@ module Seahorse
       # @return [RequestContext]
       def context_for(operation_name, params)
         RequestContext.new(
-          operation_name: operation_name.to_s,
+          operation_name: operation_name,
           operation: operation(operation_name),
           client: self,
           params: params,
@@ -177,17 +175,10 @@ module Seahorse
           @api ||= Model::Api.new
         end
 
-        # @param [Model::Api, Hash] api
+        # @param [Model::Api] api
         # @return [Model::Api]
         def set_api(api)
-          @api =
-            case api
-            when nil then Model::Api.new({})
-            when Model::Api then api
-            when Hash then Model::Api.new(api)
-            when String, Pathname then Model::Api.new(Util.load_json(api))
-            else raise ArgumentError, "invalid api definition #{api}"
-            end
+          @api = api
           define_operation_methods
           @api
         end

data/lib/seahorse/client/http/request.rb

@@ -17,17 +17,16 @@ module Seahorse
           self.body = options[:body]
         end
 
-        # @return [URI::HTTP, URI::HTTPS, nil]
-        attr_accessor :endpoint
-
         # @return [String] The HTTP request method, e.g. `GET`, `PUT`, etc.
         attr_accessor :http_method
 
         # @return [Headers] The hash of request headers.
         attr_accessor :headers
 
-        # @return [IO]
-        attr_reader :body
+        # @return [URI::HTTP, URI::HTTPS, nil]
+        def endpoint
+          @endpoint
+        end
 
         # @param [String, URI::HTTP, URI::HTTPS, nil] endpoint
         def endpoint=(endpoint)
@@ -41,6 +40,11 @@ module Seahorse
           end
         end
 
+        # @return [IO]
+        def body
+          @body
+        end
+
         # @return [String]
         def body_contents
           body.rewind

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

@@ -1,7 +1,6 @@
 module Seahorse
   module Client
     module Plugins
-
       # @seahorse.client.option [String] :endpoint
       #    The HTTP or HTTPS endpoint to send requests to.
       #    For example:
@@ -14,6 +13,10 @@ module Seahorse
 
         option(:endpoint)
 
+        def add_handlers(handlers, config)
+          handlers.add(Handler, priority: 90)
+        end
+
         def after_initialize(client)
           endpoint = URI.parse(client.config.endpoint.to_s)
           if URI::HTTPS === endpoint or URI::HTTP === endpoint
@@ -27,65 +30,11 @@ module Seahorse
         class Handler < Client::Handler
 
           def call(context)
-            context.http_request.endpoint = build_endpoint(context)
+            context.http_request.endpoint = URI.parse(context.config.endpoint.to_s)
             @handler.call(context)
           end
 
-          private
-
-          def build_endpoint(context)
-            uri = URI.parse(context.config.endpoint.to_s)
-            apply_path_params(uri, context)
-            apply_querystring_params(uri, context)
-            uri
-          end
-
-          def apply_path_params(uri, context)
-            path = uri.path.sub(/\/$/, '')
-            path += context.operation.http_request_uri.split('?')[0]
-            input = context.operation.input
-            uri.path = path.gsub(/{\w+\+?}/) do |placeholder|
-              if placeholder.include?('+')
-                placeholder = placeholder[1..-3]
-                greedy = true
-              else
-                placeholder = placeholder[1..-2]
-              end
-              name, shape = input.member_by_location_name(placeholder)
-              param = context.params[name]
-              if greedy
-                param = param.gsub(/[^\/]+/) { |v| escape(v) }
-              else
-                escape(param)
-              end
-            end
-          end
-
-          def apply_querystring_params(uri, context)
-            parts = []
-            parts << context.operation.http_request_uri.split('?')[1]
-            parts.compact!
-            if input = context.operation.input
-              params = context.params
-              input.members.each do |member_name, member|
-                if member.location == 'querystring' && !params[member_name].nil?
-                  param_name = member.location_name
-                  param_value = params[member_name]
-                  parts << "#{param_name}=#{escape(param_value.to_s)}"
-                end
-              end
-            end
-            uri.query = parts.empty? ? nil : parts.join('&')
-          end
-
-          def escape(string)
-            Util.uri_escape(string)
-          end
-
         end
-
-        handle(Handler, priority: 90)
-
       end
     end
   end