fingertips-adyen 0.3.8.20100924 → 0.3.8.20100929

data/TODO

@@ -8,3 +8,7 @@
   * adyen-soap
   * adyen-railtie
   * adyen-activemerchant
+
+= API
+
+* Add Response#errors which returns validation errors from the SOAP API

data/adyen.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name    = 'fingertips-adyen'
-  s.version = "0.3.8.20100924"
-  s.date    = "2010-09-23"
+  s.version = "0.3.8.20100929"
+  s.date    = "2010-09-29"
 
   s.summary = "Integrate Adyen payment services in your Ruby on Rails application."
   s.description = <<-EOS

data/lib/adyen/api.rb

@@ -54,7 +54,7 @@ module Adyen
         @params = API.default_params.merge(params)
       end
 
-      def call_webservice_action(action, data)
+      def call_webservice_action(action, data, response_class)
         endpoint = self.class.endpoint
 
         post = Net::HTTP::Post.new(endpoint.path, 'Accept' => 'text/xml', 'Content-Type' => 'text/xml; charset=utf-8', 'SOAPAction' => action)
@@ -67,146 +67,46 @@ module Adyen
         request.verify_mode = OpenSSL::SSL::VERIFY_PEER
 
         request.start do |http|
-          response = http.request(post)
-          # TODO: handle not 2xx responses
-          #p response
-          XMLQuerier.new(response.body)
+          response_class.new(http.request(post))
         end
       end
     end
 
-    class PaymentService < SimpleSOAPClient
-      ENDPOINT_URI = 'https://pal-%s.adyen.com/pal/servlet/soap/Payment'
-
-      def authorise_payment
-        make_payment_request(authorise_payment_request_body)
-      end
-
-      def authorise_recurring_payment
-        make_payment_request(authorise_recurring_payment_request_body)
-      end
-
-      private
-
-      def make_payment_request(data)
-        response = call_webservice_action('authorise', data)
-        response.xpath('//payment:authoriseResponse/payment:paymentResult') do |result|
-          {
-            :psp_reference  => result.text('./payment:pspReference'),
-            :result_code    => result.text('./payment:resultCode'),
-            :auth_code      => result.text('./payment:authCode'),
-            :refusal_reason => result.text('./payment:refusalReason')
-          }
-        end
-      end
-
-      def authorise_payment_request_body
-        content = card_partial
-        content << RECURRING_PARTIAL if @params[:recurring]
-        payment_request_body(content)
-      end
-
-      def authorise_recurring_payment_request_body
-        content = RECURRING_PAYMENT_BODY_PARTIAL % (@params[:recurring_detail_reference] || 'LATEST')
-        payment_request_body(content)
-      end
-
-      def payment_request_body(content)
-        content << amount_partial
-        content << shopper_partial if @params[:shopper]
-        LAYOUT % [@params[:merchant_account], @params[:reference], content]
-      end
-
-      def amount_partial
-        AMOUNT_PARTIAL % @params[:amount].values_at(:currency, :value)
-      end
-
-      def card_partial
-        card  = @params[:card].values_at(:holder_name, :number, :cvc, :expiry_year)
-        card << @params[:card][:expiry_month].to_i
-        CARD_PARTIAL % card
-      end
-
-      def shopper_partial
-        @params[:shopper].map { |k, v| SHOPPER_PARTIALS[k] % v }.join("\n")
-      end
-    end
-
-    class RecurringService < SimpleSOAPClient
-      ENDPOINT_URI = 'https://pal-%s.adyen.com/pal/servlet/soap/Recurring'
-
-      # TODO: rename to list_details and make shortcut method take the only necessary param
-      def list
-        response = call_webservice_action('listRecurringDetails', list_request_body)
-        response.xpath('//recurring:listRecurringDetailsResponse/recurring:result') do |result|
-          {
-            :creation_date            => DateTime.parse(result.text('./recurring:creationDate')),
-            :details                  => result.xpath('.//recurring:RecurringDetail').map { |node| parse_recurring_detail(node) },
-            :last_known_shopper_email => result.text('./recurring:lastKnownShopperEmail'),
-            :shopper_reference        => result.text('./recurring:shopperReference')
-          }
+    class Response
+      def self.response_attrs(*attrs)
+        attrs.each do |attr|
+          define_method(attr) { params[attr] }
         end
       end
 
-      def disable
-        response = call_webservice_action('disable', disable_request_body)
-        { :response => response.text('//recurring:disableResponse/recurring:result/recurring:response') }
-      end
-
-      private
+      attr_reader :http_response
 
-      def list_request_body
-        LIST_LAYOUT % [@params[:merchant_account], @params[:shopper][:reference]]
+      def initialize(http_response)
+        @http_response = http_response
       end
 
-      def disable_request_body
-        if reference = @params[:recurring_detail_reference]
-          reference = RECURRING_DETAIL_PARTIAL % reference
-        end
-        DISABLE_LAYOUT % [@params[:merchant_account], @params[:shopper][:reference], reference || '']
+      # @return [Boolean] Whether or not the request was successful.
+      def success?
+        !http_failure?
       end
 
-      # @todo add support for elv
-      def parse_recurring_detail(node)
-        result = {
-          :recurring_detail_reference => node.text('./recurring:recurringDetailReference'),
-          :variant                    => node.text('./recurring:variant'),
-          :creation_date              => DateTime.parse(node.text('./recurring:creationDate'))
-        }
-
-        card = node.xpath('./recurring:card')
-        if card.children.empty?
-          result[:bank] = parse_bank_details(node.xpath('./recurring:bank'))
-        else
-          result[:card] = parse_card_details(card)
-        end
-
-        result
+      # @return [Boolean] Whether or not the HTTP request was a success.
+      def http_failure?
+        !@http_response.is_a?(Net::HTTPSuccess)
       end
 
-      def parse_card_details(card)
-        {
-          :expiry_date => Date.new(card.text('./payment:expiryYear').to_i, card.text('./payment:expiryMonth').to_i, -1),
-          :holder_name => card.text('./payment:holderName'),
-          :number      => card.text('./payment:number')
-        }
+      def xml_querier
+        @xml_querier ||= XMLQuerier.new(@http_response.body)
       end
 
-      def parse_bank_details(bank)
-        {
-          :bank_account_number => bank.text('./payment:bankAccountNumber'),
-          :bank_location_id    => bank.text('./payment:bankLocationId'),
-          :bank_name           => bank.text('./payment:bankName'),
-          :bic                 => bank.text('./payment:bic'),
-          :country_code        => bank.text('./payment:countryCode'),
-          :iban                => bank.text('./payment:iban'),
-          :owner_name          => bank.text('./payment:ownerName')
-        }
+      def params
+        raise "The Adyen::API::Response#params method should be overriden in a subclass."
       end
     end
 
     class XMLQuerier
       NS = {
+        'soap'      => 'http://schemas.xmlsoap.org/soap/envelope/',
         'payment'   => 'http://payment.services.adyen.com',
         'recurring' => 'http://recurring.services.adyen.com',
         'common'    => 'http://common.services.adyen.com'
@@ -275,6 +175,197 @@ module Adyen
         @node.map { |n| self.class.new(n) }.map(&block)
       end
     end
+
+    class PaymentService < SimpleSOAPClient
+      ENDPOINT_URI = 'https://pal-%s.adyen.com/pal/servlet/soap/Payment'
+
+      def authorise_payment
+        make_payment_request(authorise_payment_request_body)
+      end
+
+      def authorise_recurring_payment
+        make_payment_request(authorise_recurring_payment_request_body)
+      end
+
+      private
+
+      def make_payment_request(data)
+        call_webservice_action('authorise', data, AuthorizationResponse)
+      end
+
+      def authorise_payment_request_body
+        content = card_partial
+        content << RECURRING_PARTIAL if @params[:recurring]
+        payment_request_body(content)
+      end
+
+      def authorise_recurring_payment_request_body
+        content = RECURRING_PAYMENT_BODY_PARTIAL % (@params[:recurring_detail_reference] || 'LATEST')
+        payment_request_body(content)
+      end
+
+      def payment_request_body(content)
+        content << amount_partial
+        content << shopper_partial if @params[:shopper]
+        LAYOUT % [@params[:merchant_account], @params[:reference], content]
+      end
+
+      def amount_partial
+        AMOUNT_PARTIAL % @params[:amount].values_at(:currency, :value)
+      end
+
+      def card_partial
+        card  = @params[:card].values_at(:holder_name, :number, :cvc, :expiry_year)
+        card << @params[:card][:expiry_month].to_i
+        CARD_PARTIAL % card
+      end
+
+      def shopper_partial
+        @params[:shopper].map { |k, v| SHOPPER_PARTIALS[k] % v }.join("\n")
+      end
+
+      class AuthorizationResponse < Response
+        ERRORS = {
+          "validation 101 Invalid card number"                           => [:number,       'is not a valid creditcard number'],
+          "validation 103 CVC is not the right length"                   => [:cvc,          'is not the right length'],
+          "validation 128 Card Holder Missing"                           => [:holder_name,  'can’t be blank'],
+          "validation Couldn't parse expiry year"                        => [:expiry_year,  'could not be recognized'],
+          "validation Expiry month should be between 1 and 12 inclusive" => [:expiry_month, 'could not be recognized'],
+        }
+
+        AUTHORISED = 'Authorised'
+
+        def self.original_fault_message_for(attribute, message)
+          if error = ERRORS.find { |_, (a, m)| a == attribute && m == message }
+            error.first
+          else
+            message
+          end
+        end
+
+        response_attrs :result_code, :auth_code, :refusal_reason, :psp_reference
+
+        def success?
+          super && params[:result_code] == AUTHORISED
+        end
+
+        alias authorized? success?
+
+        def invalid_request?
+          !fault_message.nil?
+        end
+
+        def error
+          ERRORS[fault_message] || [:base, fault_message]
+        end
+
+        def params
+          @params ||= xml_querier.xpath('//payment:authoriseResponse/payment:paymentResult') do |result|
+            {
+              :psp_reference  => result.text('./payment:pspReference'),
+              :result_code    => result.text('./payment:resultCode'),
+              :auth_code      => result.text('./payment:authCode'),
+              :refusal_reason => result.text('./payment:refusalReason')
+            }
+          end
+        end
+
+        private
+
+        def fault_message
+          @fault_message ||= xml_querier.text('//soap:Fault/faultstring')
+        end
+      end
+    end
+
+    class RecurringService < SimpleSOAPClient
+      ENDPOINT_URI = 'https://pal-%s.adyen.com/pal/servlet/soap/Recurring'
+
+      # TODO: rename to list_details and make shortcut method take the only necessary param
+      def list
+        call_webservice_action('listRecurringDetails', list_request_body, ListResponse)
+      end
+
+      def disable
+        call_webservice_action('disable', disable_request_body, DisableResponse)
+      end
+
+      private
+
+      def list_request_body
+        LIST_LAYOUT % [@params[:merchant_account], @params[:shopper][:reference]]
+      end
+
+      def disable_request_body
+        if reference = @params[:recurring_detail_reference]
+          reference = RECURRING_DETAIL_PARTIAL % reference
+        end
+        DISABLE_LAYOUT % [@params[:merchant_account], @params[:shopper][:reference], reference || '']
+      end
+
+      class DisableResponse < Response
+        response_attrs :response
+
+        def params
+          @params ||= { :response => xml_querier.text('//recurring:disableResponse/recurring:result/recurring:response') }
+        end
+      end
+
+      class ListResponse < Response
+        response_attrs :details, :last_known_shopper_email, :shopper_reference, :creation_date
+
+        def params
+          @params ||= xml_querier.xpath('//recurring:listRecurringDetailsResponse/recurring:result') do |result|
+            {
+              :creation_date            => DateTime.parse(result.text('./recurring:creationDate')),
+              :details                  => result.xpath('.//recurring:RecurringDetail').map { |node| parse_recurring_detail(node) },
+              :last_known_shopper_email => result.text('./recurring:lastKnownShopperEmail'),
+              :shopper_reference        => result.text('./recurring:shopperReference')
+            }
+          end
+        end
+
+        private
+
+        # @todo add support for elv
+        def parse_recurring_detail(node)
+          result = {
+            :recurring_detail_reference => node.text('./recurring:recurringDetailReference'),
+            :variant                    => node.text('./recurring:variant'),
+            :creation_date              => DateTime.parse(node.text('./recurring:creationDate'))
+          }
+
+          card = node.xpath('./recurring:card')
+          if card.children.empty?
+            result[:bank] = parse_bank_details(node.xpath('./recurring:bank'))
+          else
+            result[:card] = parse_card_details(card)
+          end
+
+          result
+        end
+
+        def parse_card_details(card)
+          {
+            :expiry_date => Date.new(card.text('./payment:expiryYear').to_i, card.text('./payment:expiryMonth').to_i, -1),
+            :holder_name => card.text('./payment:holderName'),
+            :number      => card.text('./payment:number')
+          }
+        end
+
+        def parse_bank_details(bank)
+          {
+            :bank_account_number => bank.text('./payment:bankAccountNumber'),
+            :bank_location_id    => bank.text('./payment:bankLocationId'),
+            :bank_name           => bank.text('./payment:bankName'),
+            :bic                 => bank.text('./payment:bic'),
+            :country_code        => bank.text('./payment:countryCode'),
+            :iban                => bank.text('./payment:iban'),
+            :owner_name          => bank.text('./payment:ownerName')
+          }
+        end
+      end
+    end
   end
 end
 
@@ -291,49 +382,52 @@ module Adyen
 <?xml version="1.0"?>
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <soap:Body>
-    <ns1:authorise xmlns:ns1="http://payment.services.adyen.com">
-      <ns1:paymentRequest>
-        <merchantAccount xmlns="http://payment.services.adyen.com">%s</merchantAccount>
-        <reference xmlns="http://payment.services.adyen.com">%s</reference>
+    <payment:authorise xmlns:payment="http://payment.services.adyen.com" xmlns:recurring="http://recurring.services.adyen.com" xmlns:common="http://common.services.adyen.com">
+      <payment:paymentRequest>
+        <payment:merchantAccount>%s</payment:merchantAccount>
+        <payment:reference>%s</payment:reference>
 %s
-      </ns1:paymentRequest>
-    </ns1:authorise>
+      </payment:paymentRequest>
+    </payment:authorise>
   </soap:Body>
 </soap:Envelope>
 EOS
 
       AMOUNT_PARTIAL = <<EOS
-        <amount xmlns="http://payment.services.adyen.com">
-          <currency xmlns="http://common.services.adyen.com">%s</currency>
-          <value xmlns="http://common.services.adyen.com">%s</value>
-        </amount>
+        <payment:amount>
+          <common:currency>%s</common:currency>
+          <common:value>%s</common:value>
+        </payment:amount>
 EOS
 
       CARD_PARTIAL = <<EOS
-        <card xmlns="http://payment.services.adyen.com">
-          <holderName>%s</holderName>
-          <number>%s</number>
-          <cvc>%s</cvc>
-          <expiryYear>%s</expiryYear>
-          <expiryMonth>%02d</expiryMonth>
-        </card>
+        <payment:card>
+          <payment:holderName>%s</payment:holderName>
+          <payment:number>%s</payment:number>
+          <payment:cvc>%s</payment:cvc>
+          <payment:expiryYear>%s</payment:expiryYear>
+          <payment:expiryMonth>%02d</payment:expiryMonth>
+        </payment:card>
 EOS
 
       RECURRING_PARTIAL = <<EOS
-        <recurring xmlns="http://recurring.services.adyen.com">
-          <contract xmlns="http://payment.services.adyen.com">RECURRING</contract>
-        </recurring>
+        <payment:recurring>
+          <payment:contract>RECURRING</payment:contract>
+        </payment:recurring>
 EOS
 
-      RECURRING_PAYMENT_BODY_PARTIAL = RECURRING_PARTIAL + <<EOS
-        <ns1:selectedRecurringDetailReference>%s</ns1:selectedRecurringDetailReference>
-        <ns1:shopperInteraction>ContAuth</ns1:shopperInteraction>
+      RECURRING_PAYMENT_BODY_PARTIAL = <<EOS
+        <payment:recurring>
+          <payment:contract>RECURRING</payment:contract>
+        </payment:recurring>
+        <payment:selectedRecurringDetailReference>%s</payment:selectedRecurringDetailReference>
+        <payment:shopperInteraction>ContAuth</payment:shopperInteraction>
 EOS
 
       SHOPPER_PARTIALS = {
-        :reference => '        <shopperReference xmlns="http://payment.services.adyen.com">%s</shopperReference>',
-        :email     => '        <shopperEmail xmlns="http://payment.services.adyen.com">%s</shopperEmail>',
-        :ip        => '        <shopperIP xmlns="http://payment.services.adyen.com">%s</shopperIP>',
+        :reference => '        <payment:shopperReference>%s</payment:shopperReference>',
+        :email     => '        <payment:shopperEmail>%s</payment:shopperEmail>',
+        :ip        => '        <payment:shopperIP>%s</payment:shopperIP>',
       }
     end
 
@@ -342,15 +436,15 @@ EOS
 <?xml version="1.0"?>
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <soap:Body>
-    <ns1:listRecurringDetails xmlns:ns1="http://recurring.services.adyen.com">
-      <ns1:request>
-        <ns1:recurring>
-          <ns1:contract>RECURRING</ns1:contract>
-        </ns1:recurring>
-        <ns1:merchantAccount>%s</ns1:merchantAccount>
-        <ns1:shopperReference>%s</ns1:shopperReference>
-      </ns1:request>
-    </ns1:listRecurringDetails>
+    <recurring:listRecurringDetails xmlns:recurring="http://recurring.services.adyen.com">
+      <recurring:request>
+        <recurring:recurring>
+          <recurring:contract>RECURRING</recurring:contract>
+        </recurring:recurring>
+        <recurring:merchantAccount>%s</recurring:merchantAccount>
+        <recurring:shopperReference>%s</recurring:shopperReference>
+      </recurring:request>
+    </recurring:listRecurringDetails>
   </soap:Body>
 </soap:Envelope>
 EOS
@@ -359,19 +453,19 @@ EOS
 <?xml version="1.0"?>
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <soap:Body>
-    <ns1:disable xmlns:ns1="http://recurring.services.adyen.com">
-      <ns1:request>
-        <ns1:merchantAccount>%s</ns1:merchantAccount>
-        <ns1:shopperReference>%s</ns1:shopperReference>
+    <recurring:disable xmlns:recurring="http://recurring.services.adyen.com">
+      <recurring:request>
+        <recurring:merchantAccount>%s</recurring:merchantAccount>
+        <recurring:shopperReference>%s</recurring:shopperReference>
         %s
-      </ns1:request>
-    </ns1:disable>
+      </recurring:request>
+    </recurring:disable>
   </soap:Body>
 </soap:Envelope>
 EOS
 
       RECURRING_DETAIL_PARTIAL = <<EOS
-        <ns1:recurringDetailReference>%s</ns1:recurringDetailReference>
+        <recurring:recurringDetailReference>%s</recurring:recurringDetailReference>
 EOS
     end
   end

data/lib/adyen.rb

@@ -13,7 +13,7 @@ module Adyen
   # Version constant for the Adyen plugin.
   # DO NOT CHANGE THIS VALUE BY HAND. It will be updated automatically by
   # the gem:release rake task.
-  VERSION = "0.3.8.20100924"
+  VERSION = "0.3.8.20100929"
 
   # Loads configuration settings from a Hash.
   #

data/spec/api_spec.rb

@@ -105,6 +105,14 @@ module APISpecHelper
         end
       end
     end
+
+    def it_should_have_shortcut_methods_for_params_on_the_response
+      it "provides shortcut methods, on the response object, for all entries in the #params hash" do
+        @response.params.each do |key, value|
+          @response.send(key).should == value
+        end
+      end
+    end
   end
 
   class SOAPClient < Adyen::API::SimpleSOAPClient
@@ -160,6 +168,39 @@ describe Adyen::API do
     Adyen::API.password = 'secret'
   end
 
+  describe Adyen::API::Response do
+    before do
+      http_response = Net::HTTPOK.new('1.1', '200', 'OK')
+      http_response.add_field('Content-type', 'text/xml')
+      http_response.stub!(:body).and_return(AUTHORISE_RESPONSE)
+      @response = Adyen::API::Response.new(http_response)
+    end
+
+    it "returns a XMLQuerier instance with the response body" do
+      @response.xml_querier.should be_instance_of(Adyen::API::XMLQuerier)
+      @response.xml_querier.to_s.should == AUTHORISE_RESPONSE
+    end
+
+    describe "with a successful HTTP response" do
+      it "returns that the (HTTP) request was a success" do
+        @response.should_not be_a_http_failure
+        @response.should be_a_success
+      end
+    end
+
+    describe "with a failed HTTP response" do
+      before do
+        http_response = Net::HTTPBadRequest.new('1.1', '400', 'Bad request')
+        @response = Adyen::API::Response.new(http_response)
+      end
+
+      it "returns that the (HTTP) request was not a success" do
+        @response.should be_a_http_failure
+        @response.should_not be_a_success
+      end
+    end
+  end
+
   describe Adyen::API::SimpleSOAPClient do
     before do
       @client = APISpecHelper::SOAPClient.new(:reference => 'order-id')
@@ -183,7 +224,7 @@ describe Adyen::API do
     describe "call_webservice_action" do
       before do
         stub_net_http(AUTHORISE_RESPONSE)
-        @client.call_webservice_action('Action', '<bananas>Yes, please</bananas>')
+        @response = @client.call_webservice_action('Action', '<bananas>Yes, please</bananas>', Adyen::API::Response)
         @request, @post = Net::HTTP.posted
       end
 
@@ -221,6 +262,11 @@ describe Adyen::API do
           'soapaction'   => ['Action']
         }
       end
+
+      it "returns an Adyen::API::Response instance" do
+        @response.should be_instance_of(Adyen::API::Response)
+        @response.xml_querier.to_s.should == AUTHORISE_RESPONSE
+      end
     end
   end
 
@@ -300,16 +346,16 @@ describe Adyen::API do
         end
 
         it "includes the necessary recurring contract info if the `:recurring' param is truthful" do
-          xpath('./recurring:recurring/payment:contract').should be_empty
+          xpath('./payment:recurring/payment:contract').should be_empty
           @payment.params[:recurring] = true
-          text('./recurring:recurring/payment:contract').should == 'RECURRING'
+          text('./payment:recurring/payment:contract').should == 'RECURRING'
         end
       end
 
       describe "authorise_payment" do
         before do
           stub_net_http(AUTHORISE_RESPONSE)
-          @payment.authorise_payment
+          @response = @payment.authorise_payment
           @request, @post = Net::HTTP.posted
         end
 
@@ -327,7 +373,7 @@ describe Adyen::API do
 
         for_each_xml_backend do
           it "returns a hash with parsed response details" do
-            @payment.authorise_payment.should == {
+            @payment.authorise_payment.params.should == {
               :psp_reference => '9876543210987654',
               :result_code => 'Authorised',
               :auth_code => '1234',
@@ -335,6 +381,80 @@ describe Adyen::API do
             }
           end
         end
+
+        it_should_have_shortcut_methods_for_params_on_the_response
+
+        describe "with a authorized response" do
+          it "returns that the request was authorised" do
+            @response.should be_success
+            @response.should be_authorized
+          end
+        end
+
+        describe "with a `declined' response" do
+          before do
+            stub_net_http(AUTHORISATION_DECLINED_RESPONSE)
+            @response = @payment.authorise_payment
+          end
+
+          it "returns that the request was not authorised" do
+            @response.should_not be_success
+            @response.should_not be_authorized
+          end
+        end
+
+        describe "with a `invalid' response" do
+          before do
+            stub_net_http(AUTHORISE_REQUEST_INVALID_RESPONSE % 'validation 101 Invalid card number')
+            @response = @payment.authorise_payment
+          end
+
+          it "returns that the request was not authorised" do
+            @response.should_not be_success
+            @response.should_not be_authorized
+          end
+
+          it "it returns that the request was invalid" do
+            @response.should be_invalid_request
+          end
+
+          it "returns creditcard validation errors" do
+            [
+              ["validation 101 Invalid card number",                           [:number,       'is not a valid creditcard number']],
+              ["validation 103 CVC is not the right length",                   [:cvc,          'is not the right length']],
+              ["validation 128 Card Holder Missing",                           [:holder_name,  'can’t be blank']],
+              ["validation Couldn't parse expiry year",                        [:expiry_year,  'could not be recognized']],
+              ["validation Expiry month should be between 1 and 12 inclusive", [:expiry_month, 'could not be recognized']],
+            ].each do |message, error|
+              response_with_fault_message(message).error.should == error
+            end
+          end
+
+          it "returns any other fault messages on `base'" do
+            message = "validation 130 Reference Missing"
+            response_with_fault_message(message).error.should == [:base, message]
+          end
+
+          it "returns the original message corresponding to the given attribute and message" do
+            [
+              ["validation 101 Invalid card number",                           [:number,       'is not a valid creditcard number']],
+              ["validation 103 CVC is not the right length",                   [:cvc,          'is not the right length']],
+              ["validation 128 Card Holder Missing",                           [:holder_name,  'can’t be blank']],
+              ["validation Couldn't parse expiry year",                        [:expiry_year,  'could not be recognized']],
+              ["validation Expiry month should be between 1 and 12 inclusive", [:expiry_month, 'could not be recognized']],
+              ["validation 130 Reference Missing",                             [:base,         'validation 130 Reference Missing']],
+            ].each do |expected, attr_and_message|
+              Adyen::API::PaymentService::AuthorizationResponse.original_fault_message_for(*attr_and_message).should == expected
+            end
+          end
+
+          private
+
+          def response_with_fault_message(message)
+            stub_net_http(AUTHORISE_REQUEST_INVALID_RESPONSE % message)
+            @response = @payment.authorise_payment
+          end
+        end
       end
 
       describe "authorise_recurring_payment_request_body" do
@@ -349,7 +469,7 @@ describe Adyen::API do
         end
 
         it "includes the contract type, which is always `RECURRING'" do
-          text('./recurring:recurring/payment:contract').should == 'RECURRING'
+          text('./payment:recurring/payment:contract').should == 'RECURRING'
         end
 
         it "obviously includes the obligatory self-‘describing’ nonsense parameters" do
@@ -369,7 +489,7 @@ describe Adyen::API do
       describe "authorise_recurring_payment" do
         before do
           stub_net_http(AUTHORISE_RESPONSE)
-          @payment.authorise_recurring_payment
+          @response = @payment.authorise_recurring_payment
           @request, @post = Net::HTTP.posted
         end
 
@@ -387,7 +507,7 @@ describe Adyen::API do
 
         for_each_xml_backend do
           it "returns a hash with parsed response details" do
-            @payment.authorise_recurring_payment.should == {
+            @payment.authorise_recurring_payment.params.should == {
               :psp_reference => '9876543210987654',
               :result_code => 'Authorised',
               :auth_code => '1234',
@@ -395,6 +515,8 @@ describe Adyen::API do
             }
           end
         end
+
+        it_should_have_shortcut_methods_for_params_on_the_response
       end
     end
 
@@ -438,7 +560,7 @@ describe Adyen::API do
     describe "list" do
       before do
         stub_net_http(LIST_RESPONSE)
-        @recurring.list
+        @response = @recurring.list
         @request, @post = Net::HTTP.posted
       end
 
@@ -456,7 +578,7 @@ describe Adyen::API do
 
       for_each_xml_backend do
         it "returns a hash with parsed response details" do
-          @recurring.list.should == {
+          @recurring.list.params.should == {
             :creation_date => DateTime.parse('2009-10-27T11:26:22.203+01:00'),
             :last_known_shopper_email => 's.hopper@example.com',
             :shopper_reference => 'user-id',
@@ -488,6 +610,8 @@ describe Adyen::API do
             ],
           }
         end
+
+        it_should_have_shortcut_methods_for_params_on_the_response
       end
 
       describe "disable_request_body" do
@@ -519,7 +643,7 @@ describe Adyen::API do
       describe "disable" do
         before do
           stub_net_http(DISABLE_RESPONSE)
-          @recurring.disable
+          @response = @recurring.disable
           @request, @post = Net::HTTP.posted
         end
 
@@ -537,9 +661,11 @@ describe Adyen::API do
 
         for_each_xml_backend do
           it "returns a hash with parsed response details" do
-            @recurring.disable.should == { :response => '[detail-successfully-disabled]' }
+            @recurring.disable.params.should == { :response => '[detail-successfully-disabled]' }
           end
         end
+
+        it_should_have_shortcut_methods_for_params_on_the_response
       end
     end
   end
@@ -568,6 +694,40 @@ AUTHORISE_RESPONSE = <<EOS
 </soap:Envelope>
 EOS
 
+AUTHORISATION_DECLINED_RESPONSE = <<EOS
+<?xml version="1.0" encoding="UTF-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <soap:Body>
+    <ns1:authoriseResponse xmlns:ns1="http://payment.services.adyen.com">
+      <ns1:paymentResult>
+        <additionalData xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
+        <authCode xmlns="http://payment.services.adyen.com">1234</authCode>
+        <dccAmount xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
+        <dccSignature xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
+        <fraudResult xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
+        <issuerUrl xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
+        <md xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
+        <paRequest xmlns="http://payment.services.adyen.com" xsi:nil="true"/>
+        <pspReference xmlns="http://payment.services.adyen.com">9876543210987654</pspReference>
+        <refusalReason xmlns="http://payment.services.adyen.com">You need to actually own money.</refusalReason>
+        <resultCode xmlns="http://payment.services.adyen.com">Refused</resultCode>
+      </ns1:paymentResult>
+    </ns1:authoriseResponse>
+  </soap:Body>
+</soap:Envelope>
+EOS
+
+AUTHORISE_REQUEST_INVALID_RESPONSE = <<EOS
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <soap:Body>
+    <soap:Fault>
+      <faultcode>soap:Server</faultcode>
+      <faultstring>%s</faultstring>
+    </soap:Fault>
+  </soap:Body>
+</soap:Envelope>
+EOS
+
 LIST_RESPONSE = <<EOS
 <?xml version="1.0"?>
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: fingertips-adyen
 version: !ruby/object:Gem::Version 
-  hash: 40201743
+  hash: 40201973
   prerelease: false
   segments: 
   - 0
   - 3
   - 8
-  - 20100924
-  version: 0.3.8.20100924
+  - 20100929
+  version: 0.3.8.20100929
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 +02:00
+date: 2010-09-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency