aws-sdk-core 2.2.10 → 2.2.11

data/apis/events/2014-02-03/examples-1.json

@@ -0,0 +1,5 @@
+{
+  "version":"1.0",
+  "examples":{
+  }
+}

data/lib/aws-sdk-core.rb

@@ -28,6 +28,7 @@ module Aws
     CloudSearchDomain
     CloudTrail
     CloudWatch
+    CloudWatchEvents
     CloudWatchLogs
     CodeCommit
     CodeDeploy

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

@@ -1,7 +1,7 @@
 Aws.add_service(:CloudFront, {
-  api: "#{Aws::API_DIR}/cloudfront/2015-09-17/api-2.json",
-  docs: "#{Aws::API_DIR}/cloudfront/2015-09-17/docs-2.json",
-  examples: "#{Aws::API_DIR}/cloudfront/2015-09-17/examples-1.json",
-  paginators: "#{Aws::API_DIR}/cloudfront/2015-09-17/paginators-1.json",
-  waiters: "#{Aws::API_DIR}/cloudfront/2015-09-17/waiters-2.json",
+  api: "#{Aws::API_DIR}/cloudfront/2016-01-13/api-2.json",
+  docs: "#{Aws::API_DIR}/cloudfront/2016-01-13/docs-2.json",
+  examples: "#{Aws::API_DIR}/cloudfront/2016-01-13/examples-1.json",
+  paginators: "#{Aws::API_DIR}/cloudfront/2016-01-13/paginators-1.json",
+  waiters: "#{Aws::API_DIR}/cloudfront/2016-01-13/waiters-2.json",
 })

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

@@ -0,0 +1,5 @@
+Aws.add_service(:CloudWatchEvents, {
+  api: "#{Aws::API_DIR}/events/2014-02-03/api-2.json",
+  docs: "#{Aws::API_DIR}/events/2014-02-03/docs-2.json",
+  examples: "#{Aws::API_DIR}/events/2014-02-03/examples-1.json",
+})

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

@@ -11,8 +11,11 @@ module Aws
 
           def parse_xml(context)
             if rules = context.operation.output
-              data = Xml::Parser.new(rules).parse(xml(context)) do |h|
-                context.metadata[:request_id] = h['requestId']
+              parser = Xml::Parser.new(rules)
+              data = parser.parse(xml(context)) do |path, value|
+                if path.size == 2 && path.last == 'requestId'
+                  context.metadata[:request_id] = value
+                end
               end
               data
             else

data/lib/aws-sdk-core/rest/request/endpoint.rb

@@ -101,11 +101,6 @@ module Aws
           list
         end
 
-        def querystring_param(key, value)
-          param_name = member.location_name
-          param_value = params[member_name]
-        end
-
         def escape(string)
           Seahorse::Util.uri_escape(string)
         end

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

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.2.10'
+  VERSION = '2.2.11'
 end

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

@@ -20,12 +20,27 @@ module Aws
         @engine = options[:engine] || self.class.engine
       end
 
+      # Parses the XML document, returning a parsed structure.
+      #
+      # If you pass a block, this will yield for XML
+      # elements that are not modeled in the rules given
+      # to the constructor.
+      #
+      #   parser.parse(xml) do |path, value|
+      #     puts "uhandled: #{path.join('/')} - #{value}"
+      #   end
+      #
+      # The purpose of the unhandled callback block is to
+      # allow callers to access values such as the EC2
+      # request ID that are part of the XML body but not
+      # part of the operation result.
+      #
       # @param [String] xml An XML document string to parse.
       # @param [Structure] target (nil)
       # @return [Structure]
-      def parse(xml, target = nil)
+      def parse(xml, target = nil, &unhandled_callback)
         xml = '<xml/>' if xml.nil? or xml.empty?
-        stack = Stack.new(@rules, target)
+        stack = Stack.new(@rules, target, &unhandled_callback)
         @engine.new(stack).parse(xml.to_s)
         stack.result
       end

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

@@ -10,10 +10,10 @@ module Aws
 
         class << self
 
-          def new(parent, ref, result = nil)
+          def new(path, parent, ref, result = nil)
             if self == Frame
               frame = frame_class(ref).allocate
-              frame.send(:initialize, parent, ref, result)
+              frame.send(:initialize, path, parent, ref, result)
               frame
             else
               super
@@ -35,7 +35,8 @@ module Aws
 
         end
 
-        def initialize(parent, ref, result = nil)
+        def initialize(path, parent, ref, result)
+          @path = path
           @parent = parent
           @ref = ref
           @result = result
@@ -53,16 +54,30 @@ module Aws
         end
 
         def child_frame(xml_name)
-          NullFrame.new(self)
+          NullFrame.new(xml_name, self)
         end
 
         def consume_child_frame(child); end
 
+        # @api private
+        def path
+          if Stack === parent
+            [@path]
+          else
+            parent.path + [@path]
+          end
+        end
+
+        # @api private
+        def yield_unhandled_value(path, value)
+          parent.yield_unhandled_value(path, value)
+        end
+
       end
 
       class StructureFrame < Frame
 
-        def initialize(parent, ref, result = nil)
+        def initialize(xml_name, parent, ref, result = nil)
           super
           @result ||= ref[:struct_class].new
           @members = {}
@@ -77,9 +92,9 @@ module Aws
 
         def child_frame(xml_name)
           if @member = @members[xml_name]
-            Frame.new(self, @member[:ref])
+            Frame.new(xml_name, self, @member[:ref])
           else
-            NullFrame.new(self)
+            NullFrame.new(xml_name, self)
           end
         end
 
@@ -128,7 +143,7 @@ module Aws
 
         def child_frame(xml_name)
           if xml_name == @member_xml_name
-            Frame.new(self, @ref.shape.member)
+            Frame.new(xml_name, self, @ref.shape.member)
           else
             raise NotImplementedError
           end
@@ -142,9 +157,9 @@ module Aws
 
       class FlatListFrame < Frame
 
-        def initialize(*args)
+        def initialize(xml_name, *args)
           super
-          @member = Frame.new(self, @ref.shape.member)
+          @member = Frame.new(xml_name, self, @ref.shape.member)
         end
 
         def result
@@ -174,7 +189,7 @@ module Aws
 
         def child_frame(xml_name)
           if xml_name == 'entry'
-            MapEntryFrame.new(self, @ref)
+            MapEntryFrame.new(xml_name, self, @ref)
           else
             raise NotImplementedError
           end
@@ -188,12 +203,12 @@ module Aws
 
       class MapEntryFrame < Frame
 
-        def initialize(*args)
+        def initialize(xml_name, *args)
           super
           @key_name = @ref.shape.key.location_name || 'key'
-          @key = Frame.new(self, @ref.shape.key)
+          @key = Frame.new(xml_name, self, @ref.shape.key)
           @value_name = @ref.shape.value.location_name || 'value'
-          @value = Frame.new(self, @ref.shape.value)
+          @value = Frame.new(xml_name, self, @ref.shape.value)
         end
 
         # @return [StringFrame]
@@ -208,15 +223,20 @@ module Aws
           elsif @value_name == xml_name
             @value
           else
-            NullFrame.new(self)
+            NullFrame.new(xml_name, self)
           end
         end
 
       end
 
       class NullFrame < Frame
-        def self.new(parent)
-          super(parent, nil)
+        def self.new(xml_name, parent)
+          super(xml_name, parent, nil, nil)
+        end
+
+        def set_text(value)
+          yield_unhandled_value(path, value)
+          super
         end
       end
 

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

@@ -3,10 +3,11 @@ module Aws
     class Parser
       class Stack
 
-        def initialize(ref, result = nil)
+        def initialize(ref, result = nil, &unhandled_callback)
           @ref = ref
           @frame = self
           @result = result
+          @unhandled_callback = unhandled_callback
         end
 
         attr_reader :frame
@@ -19,7 +20,7 @@ module Aws
 
         def attr(name, value)
           if name.to_s == 'encoding' && value.to_s == 'base64'
-            @frame = BlobFrame.new(@frame.parent, @frame.ref)
+            @frame = BlobFrame.new(name, @frame.parent, @frame.ref)
           else
             start_element(name)
             text(value)
@@ -45,13 +46,20 @@ module Aws
         end
 
         def child_frame(name)
-          Frame.new(self, @ref, @result)
+          Frame.new(name, self, @ref, @result)
         end
 
         def consume_child_frame(frame)
           @result = frame.result
         end
 
+        # @api private
+        def yield_unhandled_value(path, value)
+          if @unhandled_callback
+            @unhandled_callback.call(path, value)
+          end
+        end
+
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.2.11
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jmespath
@@ -42,10 +42,10 @@ files:
 - apis/cloudformation/2010-05-15/paginators-1.json
 - apis/cloudformation/2010-05-15/resources-1.json
 - apis/cloudformation/2010-05-15/waiters-2.json
-- apis/cloudfront/2015-09-17/api-2.json
-- apis/cloudfront/2015-09-17/examples-1.json
-- apis/cloudfront/2015-09-17/paginators-1.json
-- apis/cloudfront/2015-09-17/waiters-2.json
+- apis/cloudfront/2016-01-13/api-2.json
+- apis/cloudfront/2016-01-13/examples-1.json
+- apis/cloudfront/2016-01-13/paginators-1.json
+- apis/cloudfront/2016-01-13/waiters-2.json
 - apis/cloudhsm/2014-05-30/api-2.json
 - apis/cloudsearch/2013-01-01/api-2.json
 - apis/cloudsearch/2013-01-01/paginators-1.json
@@ -109,6 +109,8 @@ files:
 - apis/email/2010-12-01/paginators-1.json
 - apis/email/2010-12-01/waiters-2.json
 - apis/es/2015-01-01/api-2.json
+- apis/events/2014-02-03/api-2.json
+- apis/events/2014-02-03/examples-1.json
 - apis/firehose/2015-08-04/api-2.json
 - apis/glacier/2012-06-01/api-2.json
 - apis/glacier/2012-06-01/paginators-1.json
@@ -214,6 +216,7 @@ files:
 - lib/aws-sdk-core/cloudsearchdomain.rb
 - lib/aws-sdk-core/cloudtrail.rb
 - lib/aws-sdk-core/cloudwatch.rb
+- lib/aws-sdk-core/cloudwatchevents.rb
 - lib/aws-sdk-core/cloudwatchlogs.rb
 - lib/aws-sdk-core/codecommit.rb
 - lib/aws-sdk-core/codedeploy.rb