amazon_flex_pay 0.9.9 → 0.9.10

data/lib/amazon_flex_pay.rb

@@ -17,7 +17,7 @@ require 'amazon_flex_pay/api'
 require 'amazon_flex_pay/pipelines'
 
 module AmazonFlexPay
-  VERSION = '0.9.9'
+  VERSION = '0.9.10'
   API_VERSION = '2011-09-20'
   PIPELINE_VERSION = '2009-01-09'
 

data/lib/amazon_flex_pay/api/base_request.rb

@@ -1,33 +1,4 @@
 module AmazonFlexPay::API #:nodoc:
-  class ErrorResponse < StandardError
-    # Re-implements the XML parsing because ErrorResponse does not inherit from BaseResponse.
-    def self.from_xml(xml)
-      new(MultiXml.parse(xml)['Response'])
-    end
-
-    def initialize(hash)
-      self.request_id = hash['RequestID']
-      self.errors     = hash['Errors']
-    end
-
-    attr_accessor :request
-    attr_accessor :request_id
-
-    attr_reader :errors
-    def errors=(val)
-      @errors = [val['Error']].flatten.map{|e| Error.new(e)}
-    end
-
-    def to_s
-      errors.map{|e| "#{e.code}: #{e.message}"}.join(', ')
-    end
-
-    class Error < AmazonFlexPay::Model #:nodoc:
-      attribute :code
-      attribute :message
-    end
-  end
-
   class BaseRequest < AmazonFlexPay::Model
     # This compiles an API request object into a URL, sends it to Amazon, and processes
     # the response.
@@ -39,8 +10,8 @@ module AmazonFlexPay::API #:nodoc:
         response
       rescue RestClient::BadRequest, RestClient::Unauthorized, RestClient::Forbidden => e
         er = ErrorResponse.from_xml(e.response.body)
-        er.request = self
-        raise er
+        klass = AmazonFlexPay::API.const_get(er.errors.first.code)
+        raise klass.new(er.errors.first.code, er.errors.first.message, er.request_id, self)
       end
     end
 
@@ -78,6 +49,25 @@ module AmazonFlexPay::API #:nodoc:
       end
     end
 
+    class ErrorResponse < AmazonFlexPay::Model
+      attribute :request_id
+
+      def self.from_xml(xml)
+        new(MultiXml.parse(xml)['Response'])
+      end
+
+      attr_reader :errors
+      def errors=(val)
+        @errors = [val['Error']].flatten.map{|e| Error.new(e)}
+      end
+
+      class Error < AmazonFlexPay::Model #:nodoc:
+        attribute :code
+        attribute :message
+      end
+    end
+
+
     protected
 
     def action_name #:nodoc:

data/lib/amazon_flex_pay/api/errors.rb

@@ -0,0 +1,55 @@
+module AmazonFlexPay::API
+  class Error < StandardError
+    attr_accessor :request, :request_id, :code, :message
+
+    def initialize(code, message, request_id, request)
+      @request_id, @request, @code, @message = request_id, request, code, message
+    end
+  end
+
+  # generated from http://docs.amazonwebservices.com/AmazonFPS/latest/FPSAPIReference/APIErrorCodesTable.html
+  # 2010-08-28
+  %w(
+    AccessFailure
+    AccountClosed
+    AccountLimitsExceeded
+    AmountOutOfRange
+    ConcurrentModification
+    DuplicateRequest
+    InactiveInstrument
+    InsufficientBalance
+    InternalError
+    InvalidAccountState
+    InvalidAccountState_Caller
+    InvalidAccountState_Recipient
+    InvalidAccountState_Sender
+    InvalidParams
+    InvalidSenderRoleForAccountType
+    InvalidTokenId
+    InvalidTokenId_Recipient
+    InvalidTokenId_Sender
+    InvalidTokenType
+    InvalidTransactionId
+    InvalidTransactionState
+    OriginalTransactionFailed
+    RefundAmountExceeded
+    SenderNotOriginalRecipient
+    SettleAmountGreaterThanDebt
+    SettleAmountGreaterThanReserveAmount
+    TokenAccessDenied
+    TokenNotActive
+    TokenNotActive_Recipient
+    TokenNotActive_Sender
+    TransactionDenied
+    TransactionFullyRefundedAlready
+    TransactionTypeNotRefundable
+    UnverifiedAccount_Recipient
+    UnverifiedAccount_Sender
+    UnverifiedBankAccount
+    UnverifiedEmailAddress_Caller
+    UnverifiedEmailAddress_Recipient
+    UnverifiedEmailAddress_Sender
+  ).each do |name|
+    const_set(name, Class.new(Error))
+  end
+end

data/test/amazon_flex_pay_test.rb

@@ -95,12 +95,12 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
     error = nil
     begin
       TestRequest.new(:foo => 'bar').submit
-    rescue AmazonFlexPay::API::ErrorResponse => e
+    rescue AmazonFlexPay::API::InvalidParams => e
       error = e
     end
     assert error.request_id
-    assert error.errors.first.code
-    assert error.errors.first.message
+    assert_equal 'InvalidParams', error.code
+    assert error.message.match(/has to be a valid/)
   end
 
   should "not allow unknown values for enumerated attributes" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amazon_flex_pay
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: 
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - Lance Ivy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-22 00:00:00 -04:00
+date: 2012-04-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,6 +92,7 @@ files:
 - lib/amazon_flex_pay/api/base_request.rb
 - lib/amazon_flex_pay/api/cancel.rb
 - lib/amazon_flex_pay/api/cancel_token.rb
+- lib/amazon_flex_pay/api/errors.rb
 - lib/amazon_flex_pay/api/get_account_activity.rb
 - lib/amazon_flex_pay/api/get_account_balance.rb
 - lib/amazon_flex_pay/api/get_recipient_verification_status.rb