From 5f1262cef7920a9246731e6473ead0eb3406aa31 Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 26 Jan 2011 17:11:54 -0800 Subject: [PATCH] [aws|ses] cleanup output formats --- lib/fog/aws/parsers/ses/delete_verified_email_address.rb | 2 +- lib/fog/aws/parsers/ses/get_send_quota.rb | 4 ++-- lib/fog/aws/parsers/ses/get_send_statistics.rb | 6 +++--- lib/fog/aws/parsers/ses/list_verified_email_addresses.rb | 4 ++-- lib/fog/aws/parsers/ses/send_email.rb | 4 ++-- lib/fog/aws/parsers/ses/send_raw_email.rb | 4 ++-- lib/fog/aws/parsers/ses/verify_email_address.rb | 2 +- lib/fog/aws/requests/ses/delete_verified_email_address.rb | 1 - lib/fog/aws/requests/ses/list_verified_email_addresses.rb | 3 +-- lib/fog/aws/requests/ses/send_email.rb | 2 +- lib/fog/aws/requests/ses/send_raw_email.rb | 2 +- lib/fog/aws/requests/ses/verify_email_address.rb | 1 - 12 files changed, 16 insertions(+), 19 deletions(-) diff --git a/lib/fog/aws/parsers/ses/delete_verified_email_address.rb b/lib/fog/aws/parsers/ses/delete_verified_email_address.rb index 055ca6532..ad69ef043 100644 --- a/lib/fog/aws/parsers/ses/delete_verified_email_address.rb +++ b/lib/fog/aws/parsers/ses/delete_verified_email_address.rb @@ -6,7 +6,7 @@ module Fog class DeleteVerifiedEmailAddress < Fog::Parsers::Base def reset - @response = { 'DeleteVerfiedEmailAddressResult' => nil, 'ResponseMetadata' => {} } + @response = { 'ResponseMetadata' => {} } end def end_element(name) diff --git a/lib/fog/aws/parsers/ses/get_send_quota.rb b/lib/fog/aws/parsers/ses/get_send_quota.rb index 76d4f1f52..c063f4336 100644 --- a/lib/fog/aws/parsers/ses/get_send_quota.rb +++ b/lib/fog/aws/parsers/ses/get_send_quota.rb @@ -6,13 +6,13 @@ module Fog class GetSendQuota < Fog::Parsers::Base def reset - @response = { 'GetSendQuotaResult' => {}, 'ResponseMetadata' => {} } + @response = { 'ResponseMetadata' => {} } end def end_element(name) case name when "Max24HourSend", "MaxSendRate", "SentLast24Hours" - @response['GetSendQuotaResult'][name] = @value + @response[name] = @value when 'RequestId' @response['ResponseMetadata'][name] = @value end diff --git a/lib/fog/aws/parsers/ses/get_send_statistics.rb b/lib/fog/aws/parsers/ses/get_send_statistics.rb index 7c86e2341..a4176397c 100644 --- a/lib/fog/aws/parsers/ses/get_send_statistics.rb +++ b/lib/fog/aws/parsers/ses/get_send_statistics.rb @@ -6,7 +6,7 @@ module Fog class GetSendStatistics < Fog::Parsers::Base def reset - @response = { 'GetSendStatisticsResult' => { 'SendDataPoints' => [] }, 'ResponseMetadata' => {} } + @response = { 'SendDataPoints' => [], 'ResponseMetadata' => {} } @send_data_point = {} end @@ -15,8 +15,8 @@ module Fog when "Bounces", "Complaints", "DeliveryAttempts", "Rejects", "Timestamp" @send_data_point[name] = @value when 'member' - @response['GetSendStatisticsResult']['SendDataPoints'] << @send_data_point - @instance_state = {} + @response['SendDataPoints'] << @send_data_point + @send_data_point = {} when 'RequestId' @response['ResponseMetadata'][name] = @value end diff --git a/lib/fog/aws/parsers/ses/list_verified_email_addresses.rb b/lib/fog/aws/parsers/ses/list_verified_email_addresses.rb index 9d9b197a3..f8b8397a2 100644 --- a/lib/fog/aws/parsers/ses/list_verified_email_addresses.rb +++ b/lib/fog/aws/parsers/ses/list_verified_email_addresses.rb @@ -6,13 +6,13 @@ module Fog class ListVerifiedEmailAddresses < Fog::Parsers::Base def reset - @response = { 'ListVerifiedEmailAddressesResult' => { 'VerifiedEmailAddresses' => [] }, 'ResponseMetadata' => {} } + @response = { 'VerifiedEmailAddresses' => [], 'ResponseMetadata' => {} } end def end_element(name) case name when 'member' - @response['ListVerifiedEmailAddressesResult']['VerifiedEmailAddresses'] << @value + @response['VerifiedEmailAddresses'] << @value when 'RequestId' @response['ResponseMetadata'][name] = @value end diff --git a/lib/fog/aws/parsers/ses/send_email.rb b/lib/fog/aws/parsers/ses/send_email.rb index 08ca98641..4a78dcf1a 100644 --- a/lib/fog/aws/parsers/ses/send_email.rb +++ b/lib/fog/aws/parsers/ses/send_email.rb @@ -6,13 +6,13 @@ module Fog class SendEmail < Fog::Parsers::Base def reset - @response = { 'SendEmailResult' => {}, 'ResponseMetadata' => {} } + @response = { 'ResponseMetadata' => {} } end def end_element(name) case name when 'MessageId' - @response['SendEmailResult'][name] = @value + @response[name] = @value when 'RequestId' @response['ResponseMetadata'][name] = @value end diff --git a/lib/fog/aws/parsers/ses/send_raw_email.rb b/lib/fog/aws/parsers/ses/send_raw_email.rb index 80e00ca40..f513d7a34 100644 --- a/lib/fog/aws/parsers/ses/send_raw_email.rb +++ b/lib/fog/aws/parsers/ses/send_raw_email.rb @@ -6,13 +6,13 @@ module Fog class SendRawEmail < Fog::Parsers::Base def reset - @response = { 'SendRawEmailResult' => {}, 'ResponseMetadata' => {} } + @response = { 'ResponseMetadata' => {} } end def end_element(name) case name when 'MessageId' - @response['SendRawEmailResult'][name] = @value + @response[name] = @value when 'RequestId' @response['ResponseMetadata'][name] = @value end diff --git a/lib/fog/aws/parsers/ses/verify_email_address.rb b/lib/fog/aws/parsers/ses/verify_email_address.rb index d238b98b2..b0d0fbe19 100644 --- a/lib/fog/aws/parsers/ses/verify_email_address.rb +++ b/lib/fog/aws/parsers/ses/verify_email_address.rb @@ -6,7 +6,7 @@ module Fog class VerifyEmailAddress < Fog::Parsers::Base def reset - @response = { 'VerifyEmailAddressResult' => nil, 'ResponseMetadata' => {} } + @response = { 'ResponseMetadata' => {} } end def end_element(name) diff --git a/lib/fog/aws/requests/ses/delete_verified_email_address.rb b/lib/fog/aws/requests/ses/delete_verified_email_address.rb index 262165865..e32345632 100644 --- a/lib/fog/aws/requests/ses/delete_verified_email_address.rb +++ b/lib/fog/aws/requests/ses/delete_verified_email_address.rb @@ -12,7 +12,6 @@ module Fog # ==== Returns # * response<~Excon::Response>: # * body<~Hash>: - # * 'DeleteVerfiedEmailAddressResponse'<~nil> # * 'ResponseMetadata'<~Hash>: # * 'RequestId'<~String> - Id of request def delete_verified_email_address(email_address) diff --git a/lib/fog/aws/requests/ses/list_verified_email_addresses.rb b/lib/fog/aws/requests/ses/list_verified_email_addresses.rb index 7c935dc1f..9dd9a2994 100644 --- a/lib/fog/aws/requests/ses/list_verified_email_addresses.rb +++ b/lib/fog/aws/requests/ses/list_verified_email_addresses.rb @@ -12,8 +12,7 @@ module Fog # ==== Returns # * response<~Excon::Response>: # * body<~Hash>: - # * 'ListVerifiedEmailAddressesResult'<~Hash> - # * 'VerifiedEmailAddresses' <~Array> + # * 'VerifiedEmailAddresses' <~Array> # * 'ResponseMetadata'<~Hash>: # * 'RequestId'<~String> - Id of request def list_verified_email_addresses diff --git a/lib/fog/aws/requests/ses/send_email.rb b/lib/fog/aws/requests/ses/send_email.rb index e595c73a3..18096d168 100644 --- a/lib/fog/aws/requests/ses/send_email.rb +++ b/lib/fog/aws/requests/ses/send_email.rb @@ -31,7 +31,7 @@ module Fog # ==== Returns # * response<~Excon::Response>: # * body<~Hash>: - # * 'DeleteVerfiedEmailAddressResponse'<~nil> + # * 'MessageId'<~String> - Id of message # * 'ResponseMetadata'<~Hash>: # * 'RequestId'<~String> - Id of request def send_email(source, destination, message, options = {}) diff --git a/lib/fog/aws/requests/ses/send_raw_email.rb b/lib/fog/aws/requests/ses/send_raw_email.rb index 11e4d8a9d..bb022ec62 100644 --- a/lib/fog/aws/requests/ses/send_raw_email.rb +++ b/lib/fog/aws/requests/ses/send_raw_email.rb @@ -16,7 +16,7 @@ module Fog # ==== Returns # * response<~Excon::Response>: # * body<~Hash>: - # * 'DeleteVerfiedEmailAddressResponse'<~nil> + # * 'MessageId'<~String> - Id of message # * 'ResponseMetadata'<~Hash>: # * 'RequestId'<~String> - Id of request def send_raw_email(raw_message, options = {}) diff --git a/lib/fog/aws/requests/ses/verify_email_address.rb b/lib/fog/aws/requests/ses/verify_email_address.rb index 98e9d6bb2..e68a0c841 100644 --- a/lib/fog/aws/requests/ses/verify_email_address.rb +++ b/lib/fog/aws/requests/ses/verify_email_address.rb @@ -12,7 +12,6 @@ module Fog # ==== Returns # * response<~Excon::Response>: # * body<~Hash>: - # * 'VerifyEmailAddressResult'<~nil> # * 'ResponseMetadata'<~Hash>: # * 'RequestId'<~String> - Id of request def verify_email_address(email_address)