aws-sdk-core 2.0.0.rc5 → 2.0.0.rc6

data/apis/source/route53-2013-04-01.paginators.json

@@ -0,0 +1,33 @@
+{
+  "pagination": {
+    "ListHealthChecks": {
+      "input_token": "Marker",
+      "output_token": "NextMarker",
+      "more_results": "IsTruncated",
+      "limit_key": "MaxItems",
+      "result_key": "HealthChecks"
+    },
+    "ListHostedZones": {
+      "input_token": "Marker",
+      "output_token": "NextMarker",
+      "more_results": "IsTruncated",
+      "limit_key": "MaxItems",
+      "result_key": "HostedZones"
+    },
+    "ListResourceRecordSets": {
+      "more_results": "IsTruncated",
+      "limit_key": "MaxItems",
+      "result_key": "ResourceRecordSets",
+      "input_token": [
+        "StartRecordName",
+        "StartRecordType",
+        "StartRecordIdentifier"
+      ],
+      "output_token": [
+        "NextRecordName",
+        "NextRecordType",
+        "NextRecordIdentifier"
+      ]
+    }
+  }
+}

data/lib/aws/error_handler.rb

@@ -10,8 +10,8 @@ module Aws
 
     def call(context)
       @handler.call(context).on(300..599) do |response|
-        if empty_body?(response)
-          error_code = error_code_for_empty_response(response)
+        if empty_body?(context.http_response)
+          error_code = error_code_for_empty_response(context.http_response)
           error_message = ''
         else
           error_code, error_message = @parser.extract_error(response)
@@ -29,19 +29,19 @@ module Aws
       errors_module.error_class(code).new(context, message)
     end
 
-    def empty_body?(response)
-      response.http_response.body_contents.empty?
+    def empty_body?(http_resp)
+      http_resp.body_contents.empty?
     end
 
-    def error_code_for_empty_response(response)
-      error_code = response.http_response.status_code
+    def error_code_for_empty_response(http_resp)
+      status_code = http_resp.status_code
       {
         302 => 'MovedTemporarily',
         304 => 'NotModified',
         400 => 'BadRequest',
         403 => 'Forbidden',
         404 => 'NotFound',
-      }[error_code] || "#{error_code}Error"
+      }[status_code] || "#{status_code}Error"
     end
 
   end

data/lib/aws/json/error_parser.rb

@@ -3,9 +3,10 @@ module Aws
     class ErrorParser
 
       def extract_error(response)
-        json = MultiJson.load(response.http_response.body_contents)
+        context = response.context
+        json = MultiJson.load(context.http_response.body_contents)
         error_code = json['code'] || json['__type'] 
-        error_code ||= response.http_response.headers['x-amzn-errortype']
+        error_code ||= context.http_response.headers['x-amzn-errortype']
         error_code = error_code.split('#').last
         if error_code == 'RequestEntityTooLarge'
           error_message = 'Request body must be less than 1 MB'

data/lib/aws/plugins/retry_errors.rb

@@ -96,7 +96,8 @@ module Aws
         end
 
         def error_for(response)
-          ErrorInspector.new(response.error, response.http_response.status_code)
+          status_code = response.context.http_response.status_code
+          ErrorInspector.new(response.error, status_code)
         end
 
         def retry_request(context, error)

data/lib/aws/plugins/s3_complete_multipart_upload_fix.rb

@@ -8,20 +8,20 @@ module Aws
 
         def call(context)
           @handler.call(context).on(200) do |response|
-            if error = check_for_error(response)
-              response.http_response.status_code = 500
+            if error = check_for_error(context)
+              context.http_response.status_code = 500
               response.data = nil
               response.error = error
             end
           end
         end
 
-        def check_for_error(response)
-          xml = MultiXml.parse(response.http_response.body_contents)
+        def check_for_error(context)
+          xml = MultiXml.parse(context.http_response.body_contents)
           if xml['Error']
             error_code = xml['Error']['Code']
             error_message = xml['Error']['Message']
-            S3::Errors.error_class(error_code).new(response.context, error_message)
+            S3::Errors.error_class(error_code).new(context, error_message)
           end
         end
 

data/lib/aws/plugins/s3_get_bucket_location_fix.rb

@@ -6,7 +6,7 @@ module Aws
 
         def call(context)
           @handler.call(context).on(200) do |response|
-            xml = MultiXml.parse(response.http_response.body_contents)
+            xml = MultiXml.parse(context.http_response.body_contents)
             if xml.key?('LocationConstraint')
               constraint = xml['LocationConstraint']
               response.data[:location_constraint] =

data/lib/aws/plugins/s3_redirects.rb

@@ -13,8 +13,8 @@ module Aws
 
         def call(context)
           response = @handler.call(context)
-          if response.http_response.status_code == 307
-            endpoint = response.http_response.headers['location']
+          if context.http_response.status_code == 307
+            endpoint = context.http_response.headers['location']
             endpoint = Seahorse::Client::Http::Endpoint.new(endpoint)
             context.http_request.endpoint = endpoint
             context.http_response.body.truncate(0)

data/lib/aws/version.rb

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.0.0.rc5'
+  VERSION = '2.0.0.rc6'
 end

data/lib/aws/xml/error_parser.rb

@@ -3,7 +3,7 @@ module Aws
     class ErrorParser
 
       def extract_error(response)
-        error = MultiXml.parse(response.http_response.body_contents)
+        error = MultiXml.parse(response.context.http_response.body_contents)
         %w(Response ErrorResponse Errors Error).each do |wrapper|
           error = error[wrapper] if error[wrapper]
         end

data/spec/aws/operations_spec.rb

@@ -134,7 +134,7 @@ module Aws
             # send the request
             resp = req.send_request
 
-            request_assertions(f, resp.http_request)
+            request_assertions(f, resp.context.http_request)
             response_assertions(f, resp)
 
           end

data/spec/aws/plugins/sqs_queue_urls_spec.rb

@@ -19,7 +19,7 @@ module Aws
 
       it 'moves the queue url param to the http request endpoint' do
         resp = send_request
-        expect(resp.http_request.endpoint).to eq('http://foo.com/')
+        expect(resp.context.http_request.endpoint).to eq('http://foo.com/')
       end
 
       it 'resets the configured region based on the queue url' do

data/spec/fixtures/operations/route53/change_resource_record_sets.yml

@@ -8,9 +8,9 @@ params:
   :change_batch:
     :changes: []
 request:
-  path: '/2012-12-12/hostedzone/ZONE-ID/rrset/'
+  path: '/2013-04-01/hostedzone/ZONE-ID/rrset/'
   body: |
-    <ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/2012-12-12/">
+    <ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/2013-04-01/">
       <ChangeBatch>
         <Changes>
         </Changes>

data/vendor/seahorse/lib/seahorse/client/handler_builder.rb

@@ -16,7 +16,7 @@ module Seahorse
       def handle_response(*args, &block)
         handler(*args) do |context|
           resp = @handler.call(context)
-          block.call(resp) if resp.http_response.status_code > 0
+          block.call(resp) if resp.context.http_response.status_code > 0
           resp
         end
       end

data/vendor/seahorse/lib/seahorse/client/logging/formatter.rb

@@ -155,11 +155,11 @@ module Seahorse
         end
 
         def _http_request_headers(response)
-          response.http_request.headers.inspect
+          response.context.http_request.headers.inspect
         end
 
         def _http_request_body(response)
-          summarize_value(response.http_request.body_contents)
+          summarize_value(response.context.http_request.body_contents)
         end
 
         def _http_response_status_code(response)

data/vendor/seahorse/lib/seahorse/client/plugins/json_simple.rb

@@ -20,7 +20,7 @@ module Seahorse
           def call(context)
             context.http_request.body = MultiJson.dump(context.params)
             @handler.call(context).on(200..299) do |resp|
-              resp.data = MultiJson.load(resp.http_response.body_contents)
+              resp.data = MultiJson.load(context.http_response.body_contents)
             end
           end
 

data/vendor/seahorse/lib/seahorse/client/plugins/restful_bindings.rb

@@ -78,13 +78,13 @@ module Seahorse
 
           def extract_status_code(response)
             if member = response.context.operation.output.status_code_member
-              status_code = response.http_response.status_code
+              status_code = response.context.http_response.status_code
               response.data[member.member_name] = status_code
             end
           end
 
           def extract_headers(response)
-            headers = response.http_response.headers
+            headers = response.context.http_response.headers
             rules = response.context.operation.output.header_members
             rules.each do |member_name, member|
               response.data[member_name] = header_value(member, headers)
@@ -125,7 +125,7 @@ module Seahorse
           def extract_body(response)
             output = response.context.operation.output
             if output.raw_payload?
-              response.data[output.payload] = response.http_response.body
+              response.data[output.payload] = response.context.http_response.body
             end
           end
 

data/vendor/seahorse/lib/seahorse/client/response.rb

@@ -19,12 +19,6 @@ module Seahorse
       # @return [RequestContext]
       attr_reader :context
 
-      # @return [Http::Request]
-      attr_reader :http_request
-
-      # @return [Http::Response]
-      attr_reader :http_response
-
       # @return The response data.  This may be `nil` if the response contains
       #   an {#error}.
       attr_accessor :data

data/vendor/seahorse/spec/seahorse/client/handler_builder_spec.rb

@@ -101,7 +101,7 @@ module Seahorse
         it 'is called when the response is signaled complete' do
           called = false
           handler = obj.handle_response { |response| called = true }
-          handler.new(->(_) { Response.new.tap {|r| r.http_response.status_code = 200 } }).call(nil)
+          handler.new(->(_) { Response.new.tap {|r| r.context.http_response.status_code = 200 } }).call(nil)
           expect(called).to be(true)
         end
 

data/vendor/seahorse/spec/seahorse/client/net_http/handler_spec.rb

@@ -210,17 +210,19 @@ module Seahorse
 
             it 'populates the status code' do
               stub_request(:any, endpoint).to_return(status: 200)
-              expect(make_request.http_response.status_code).to eq(200)
+              resp = make_request
+              expect(resp.context.http_response.status_code).to eq(200)
             end
 
             it 'populates the headers' do
               stub_request(:any, endpoint).to_return(headers: { foo: 'bar' })
-              expect(make_request.http_response.headers['foo']).to eq('bar')
+              resp = make_request
+              expect(resp.context.http_response.headers['foo']).to eq('bar')
             end
 
             it 'populates the response body' do
               stub_request(:any, endpoint).to_return(body: 'response-body')
-              resp_body = make_request.http_response.body
+              resp_body = make_request.context.http_response.body
               resp_body.rewind
               expect(resp_body.read).to eq('response-body')
             end

data/vendor/seahorse/spec/seahorse/client/request_spec.rb

@@ -135,12 +135,12 @@ module Seahorse
 
           it 'counts the bytes yielded' do
             resp = request.send_request { |chunk| }
-            expect(resp.http_response.body.size).to eq(15)
+            expect(resp.context.http_response.body.size).to eq(15)
           end
 
           it 'does not buffer the response chunks' do
             response = request.send_request { |chunk| }
-            body = response.http_response.body
+            body = response.context.http_response.body
             expect(body.read).to eq('')
             expect(body).not_to respond_to(:truncate)
           end

data/vendor/seahorse/spec/seahorse/client/response_spec.rb

@@ -57,28 +57,6 @@ module Seahorse
 
       end
 
-      describe '#http_request' do
-
-        it 'returns the context #http_request' do
-          http_request = Http::Request.new
-          context = RequestContext.new(http_request: http_request)
-          resp = Response.new(context: context)
-          expect(resp.http_request).to be(http_request)
-        end
-
-      end
-
-      describe '#http_response' do
-
-        it 'returns the context #http_response' do
-          http_response = Http::Response.new
-          context = RequestContext.new(http_response: http_response)
-          resp = Response.new(context: context)
-          expect(resp.http_response).to be(http_response)
-        end
-
-      end
-
       describe 'callbacks' do
 
         let(:http_resp) { Http::Response.new }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc5
+  version: 2.0.0.rc6
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -113,6 +113,7 @@ files:
 - apis/RDS-2013-09-09.json
 - apis/Redshift-2012-12-01.json
 - apis/Route53-2012-12-12.json
+- apis/Route53-2013-04-01.json
 - apis/S3-2006-03-01.json
 - apis/SDB-2009-04-15.json
 - apis/SES-2010-12-01.json
@@ -199,6 +200,8 @@ files:
 - apis/source/redshift-2012-12-01.waiters.json
 - apis/source/route53-2012-12-12.json
 - apis/source/route53-2012-12-12.paginators.json
+- apis/source/route53-2013-04-01.json
+- apis/source/route53-2013-04-01.paginators.json
 - apis/source/s3-2006-03-01.json
 - apis/source/s3-2006-03-01.paginators.json
 - apis/source/s3-2006-03-01.waiters.json