adyen 1.2.0 → 1.3.0

data/.gitignore

@@ -8,3 +8,4 @@ adyen-*.gem
 .DS_Store
 t.rb
 spec/functional/initializer.rb
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ruby-head
+  - ree
+  - rbx
+  - rbx-2.0
+  - jruby

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/README.rdoc

@@ -2,6 +2,8 @@
 
 Package to simplify including the Adyen payments services into a Ruby on Rails application.
 
+Visit the wiki for documentation: https://github.com/wvanbergen/adyen/wiki.
+
 Adyen integration relies on three modes of communication between Adyen, your server and
 your client/customer:
 
@@ -13,30 +15,9 @@ This library aims to ease the implementation of all these modes into your applic
 Moreover, it provides matchers, assertions and mocks to make it easier to implement an
 automated test suite to assert the integration is working correctly.
 
-== Installation
-
-<b>Bundler / Rails 3</b>: Add the following line to your <tt>Gemfile</tt>:
-
-  gem 'adyen'
-
-<b>Rails 2.x</b>: Add the following line to your <tt>environment.rb</tt> and run <tt>rake gems:install</tt>
-to make the Adyen functionality available in your Rails project:
-
-  config.gem 'adyen'
-
-The Adyen gem will happily use REXML for communication with Adyen’s SOAP API, however, if
-you have the Nokogiri gem installed and required the gem will use that for performance.
-
-== Generators
-
-The gem ships with a generator for Rails 3. To create an ActiveRecord migration, mode, and
-ActionController for the notifications send by Adyen, run the following:
-
-  $ rails generate adyen:notification
-
 == Usage
 
-See the project wiki on http://wiki.github.com/wvanbergen/adyen to get started. Complete
+See the project wiki on https://github.com/wvanbergen/adyen/wiki to get started. Complete
 RDoc documentation for the project can be found on http://rdoc.info/projects/wvanbergen/adyen.
 
 * For more information about Adyen, see http://www.adyen.com
@@ -49,3 +30,13 @@ This package is written by Michel Barbosa and Willem van Bergen for Floorplanner
 made public under the MIT license (see LICENSE). Its is currently maintained by Willem van
 Bergen, Stefan Borsje and Eloy Duran. We are not affiliated with Adyen B.V. The software 
 comes without warranty of any kind, so use at your own risk.
+
+Contributions are welcomed; this is very much a scratch your own itch project. Some notes:
+
+* Fork the project, implement your stuff and issue a pull request. Topic branches not necessary.
+* All functionality must include tests and preferably documentation.
+* New SOAP API calls should include functional tests that actually test if the call is working. 
+  Adyen has a nasty tendency to switch things up every now and then, so this is vital.
+
+Please visit the changelog at https://github.com/wvanbergen/adyen/wiki/Changelog to see the 
+changes in the different releases.

data/adyen.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name    = 'adyen'
-  s.version = "1.2.0"
-  s.date    = "2011-05-12"
+  s.version = "1.3.0"
+  s.date    = "2011-10-10"
 
   s.summary = "Integrate Adyen payment services in your Ruby on Rails application."
   s.description = <<-EOS
@@ -16,15 +16,22 @@ Gem::Specification.new do |s|
   s.homepage = 'http://github.com/wvanbergen/adyen/wiki'
 
   s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '~> 2.0')
-  s.add_development_dependency('nokogiri')
+  s.add_development_dependency('rspec', '~> 2')
   s.add_development_dependency('rails', '>= 2.3')
   
+  if RUBY_PLATFORM == 'java'
+    s.add_development_dependency('nokogiri', '~> 1.4.6')
+  else
+    s.add_development_dependency('nokogiri')
+  end
+  
+  s.add_runtime_dependency('jruby-openssl') if RUBY_PLATFORM == 'java'
+  
   s.requirements << 'Having Nokogiri installed will speed up XML handling when using the SOAP API.'
 
   s.rdoc_options << '--title' << s.name << '--main' << 'README.rdoc' << '--line-numbers' << '--inline-source'
   s.extra_rdoc_files = ['README.rdoc']
 
-  s.files = %w(.gitignore .kick LICENSE README.rdoc Rakefile TODO adyen.gemspec lib/adyen.rb lib/adyen/api.rb lib/adyen/api/cacert.pem lib/adyen/api/payment_service.rb lib/adyen/api/recurring_service.rb lib/adyen/api/response.rb lib/adyen/api/simple_soap_client.rb lib/adyen/api/templates/payment_service.rb lib/adyen/api/templates/recurring_service.rb lib/adyen/api/test_helpers.rb lib/adyen/api/xml_querier.rb lib/adyen/configuration.rb lib/adyen/encoding.rb lib/adyen/form.rb lib/adyen/formatter.rb lib/adyen/matchers.rb lib/adyen/notification_generator.rb lib/adyen/railtie.rb lib/adyen/templates/notification_migration.rb lib/adyen/templates/notification_model.rb spec/adyen_spec.rb spec/api/api_spec.rb spec/api/payment_service_spec.rb spec/api/recurring_service_spec.rb spec/api/response_spec.rb spec/api/simple_soap_client_spec.rb spec/api/spec_helper.rb spec/api/test_helpers_spec.rb spec/form_spec.rb spec/functional/api_spec.rb spec/functional/initializer.rb.sample spec/spec_helper.rb tasks/github-gem.rake yard_extensions.rb)
+  s.files = %w(.gitignore .kick .travis.yml Gemfile LICENSE README.rdoc Rakefile TODO adyen.gemspec lib/adyen.rb lib/adyen/api.rb lib/adyen/api/cacert.pem lib/adyen/api/payment_service.rb lib/adyen/api/recurring_service.rb lib/adyen/api/response.rb lib/adyen/api/simple_soap_client.rb lib/adyen/api/templates/payment_service.rb lib/adyen/api/templates/recurring_service.rb lib/adyen/api/test_helpers.rb lib/adyen/api/xml_querier.rb lib/adyen/configuration.rb lib/adyen/encoding.rb lib/adyen/form.rb lib/adyen/formatter.rb lib/adyen/matchers.rb lib/adyen/notification_generator.rb lib/adyen/railtie.rb lib/adyen/templates/notification_migration.rb lib/adyen/templates/notification_model.rb spec/adyen_spec.rb spec/api/api_spec.rb spec/api/payment_service_spec.rb spec/api/recurring_service_spec.rb spec/api/response_spec.rb spec/api/simple_soap_client_spec.rb spec/api/spec_helper.rb spec/api/test_helpers_spec.rb spec/form_spec.rb spec/functional/api_spec.rb spec/functional/initializer.rb.sample spec/spec_helper.rb tasks/github-gem.rake yard_extensions.rb)
   s.test_files = %w(spec/adyen_spec.rb spec/api/api_spec.rb spec/api/payment_service_spec.rb spec/api/recurring_service_spec.rb spec/api/response_spec.rb spec/api/simple_soap_client_spec.rb spec/api/test_helpers_spec.rb spec/form_spec.rb spec/functional/api_spec.rb)
 end

data/lib/adyen.rb

@@ -12,7 +12,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 = "1.2.0"
+  VERSION = "1.3.0"
 
   # @return [Configuration] The configuration singleton.
   def self.configuration
@@ -24,5 +24,6 @@ require 'adyen/configuration'
 require 'adyen/encoding'
 require 'adyen/formatter'
 require 'adyen/form'
+require 'adyen/api'
 
 require 'adyen/railtie' if defined?(::Rails) && ::Rails::VERSION::MAJOR >= 3

data/lib/adyen/api.rb

@@ -57,14 +57,15 @@ module Adyen
     #     invoice.id,
     #     { :currency => 'EUR', :value => invoice.amount },
     #     { :reference => user.id, :email => user.email, :ip => '8.8.8.8' },
-    #     { :holder_name => "Simon Hopper", :number => '4444333322221111', :cvc => '737', :expiry_month => 12, :expiry_year => 2012 }
+    #     { :holder_name => "Simon Hopper", :number => '4444333322221111', :cvc => '737',
+    #       :expiry_month => 12, :expiry_year => 2012 }
     #   )
     #   response.authorised? # => true
     #
     # @param          [Numeric,String] reference      Your reference (ID) for this payment.
     # @param          [Hash]           amount         A hash describing the money to charge.
     # @param          [Hash]           shopper        A hash describing the shopper.
-    # @param          [Hash]           card           A hash describing the creditcard details.
+    # @param          [Hash]           card           A hash describing the credit card details.
     #
     # @option amount  [String]         :currency      The ISO currency code (EUR, GBP, USD, etc).
     # @option amount  [Integer]        :value         The value of the payment in discrete cents,
@@ -278,15 +279,25 @@ module Adyen
       }).disable
     end
 
-    # Stores and tokenises the creditcard details so that recurring payments can be made in the
-    # future.
+    # Stores and tokenises the payment details so that recurring payments can be made in the
+    # future. It can be either a credit card or ELV (Elektronisches Lastschriftverfahren).
     #
-    # You do *not* have to include the card's CVC, because it won't be stored anyway.
+    #  For instance, this is how you would store credit card details:
     #
     # # @example
     #   response = Adyen::API.store_recurring_token(
     #     { :reference => user.id, :email => user.email, :ip => '8.8.8.8' },
-    #     { :holder_name => "Simon Hopper", :number => '4444333322221111', :expiry_month => 12, :expiry_year => 2012 }
+    #     { :holder_name => "Simon Hopper", :number => '4444333322221111',
+    #       :expiry_month => 12, :expiry_year => 2012 }
+    #   )
+    #
+    # Or use the following to store ELV details:
+    #
+    # # @example
+    #   response = Adyen::API.store_recurring_token(
+    #     { :reference => user.id, :email => user.email, :ip => '8.8.8.8' },
+    #     { :bank_location => "Berlin", :bank_name => "TestBank", :bank_location_id => "12345678",
+    #       :holder_name => "Simon Hopper", :number => "1234567890" }
     #   )
     #   response.stored? # => true
     #
@@ -299,24 +310,35 @@ module Adyen
     #   )
     #   authorize_response.authorised? # => true
     #
-    # @param          [Hash]           shopper        A hash describing the shopper.
-    # @param          [Hash]           card           A hash describing the creditcard details.
+    # @param            [Hash]           params                A hash describing the credit card or
+    #                                                          ELV details.
     #
-    # @option shopper [Numeric,String] :reference     The shopper’s reference (ID).
-    # @option shopper [String]         :email         The shopper’s email address.
-    # @option shopper [String]         :ip            The shopper’s IP address.
+    # @option shopper   [Numeric,String] :reference            The shopper’s reference (ID).
+    # @option shopper   [String]         :email                The shopper’s email address.
+    # @option shopper   [String]         :ip                   The shopper’s IP address.
     #
-    # @option card    [String]         :holder_name   The full name on the card.
-    # @option card    [String]         :number        The card number.
-    # @option card    [Numeric,String] :expiry_month  The month in which the card expires.
-    # @option card    [Numeric,String] :expiry_year   The year in which the card expires.
+    # @option params    [String]         :holder_name          The full name on the card or of the
+    #                                                          account holder.
+    # @option params    [String]         :number               The card or account number.
+    #
+    # ##### Credit card specific options:
+    #
+    # @option params    [Numeric,String] :expiry_month         The month in which the card expires.
+    # @option params    [Numeric,String] :expiry_year          The year in which the card expires.
+    #
+    # ##### ELV specific options:
+    #
+    # @option params    [String]         :bank_location        The Bank Location.
+    # @option params    [String]         :bank_name            The Bank Name.
+    # @option params    [Numeric,String] :bank_location_id     The Bank Location ID (Bankleitzahl).
     #
     # @return [RecurringService::StoreTokenResponse] The response object
-    def store_recurring_token(shopper, card)
-      RecurringService.new({
-        :shopper   => shopper,
-        :card      => card
-      }).store_token
+    def store_recurring_token(shopper, params)
+        payment_method = params.include?(:bank_location_id) ? :elv : :card
+        RecurringService.new({
+          :shopper => shopper,
+          payment_method => params
+        }).store_token
     end
   end
 end

data/lib/adyen/api/payment_service.rb

@@ -158,14 +158,7 @@ module Adyen
         }
 
         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
+        REFUSED    = 'Refused'
 
         response_attrs :result_code, :auth_code, :refusal_reason, :psp_reference
 
@@ -173,7 +166,12 @@ module Adyen
           super && params[:result_code] == AUTHORISED
         end
 
-        alias authorized? success?
+        def refused?
+          params[:result_code] == REFUSED
+        end
+
+        alias_method :authorised?, :success?
+        alias_method :authorized?, :success?
 
         # @return [Boolean] Returns whether or not the request was valid.
         def invalid_request?
@@ -193,8 +191,12 @@ module Adyen
         def error(prefix = nil)
           if error = ERRORS[fault_message]
             prefix ? ["#{prefix}_#{error[0]}".to_sym, error[1]] : error
-          else
+          elsif fault_message
             [:base, fault_message]
+          elsif refused?
+            [:base, 'Transaction was refused.']
+          else
+            [:base, 'Transaction failed for unkown reasons.']
           end
         end
 

data/lib/adyen/api/recurring_service.rb

@@ -46,6 +46,14 @@ module Adyen
         CARD_PARTIAL % card
       end
 
+      ELV_ATTRS = [:bank_location, :bank_name, :bank_location_id, :holder_name, :number]
+      # The ELV - (Elektronisches Lastschriftverfahren) does not require bank_location, so insert 'nil'.
+      def elv_partial
+        validate_parameters!(:elv => ELV_ATTRS)
+        elv  = @params[:elv].values_at(*ELV_ATTRS)
+        ELV_PARTIAL % elv
+      end
+
       def list_request_body
         validate_parameters!(:merchant_account, :shopper => [:reference])
         LIST_LAYOUT % [@params[:merchant_account], @params[:shopper][:reference]]
@@ -61,7 +69,10 @@ module Adyen
 
       def store_token_request_body
         validate_parameters!(:merchant_account, :shopper => [:email, :reference])
-        content = card_partial
+        content = []
+        content << card_partial unless @params[:card].nil?
+        content << elv_partial  unless @params[:elv].nil?    
+        raise ArgumentError, "The required parameter 'card' or 'elv' is missing." if content.empty?    
         STORE_TOKEN_LAYOUT % [@params[:merchant_account], @params[:shopper][:reference], @params[:shopper][:email], content]
       end
 
@@ -74,7 +85,7 @@ module Adyen
           super && DISABLED_RESPONSES.include?(params[:response])
         end
 
-        alias disabled? success?
+        alias_method :disabled?, :success?
 
         def params
           @params ||= { :response => xml_querier.text('//recurring:disableResponse/recurring:result/recurring:response') }
@@ -111,12 +122,17 @@ module Adyen
           }
 
           card = node.xpath('./recurring:card')
-          if card.children.empty?
-            result[:bank] = parse_bank_details(node.xpath('./recurring:bank'))
-          else
+          elv  = node.xpath('./recurring:elv')  
+          bank = node.xpath('./recurring:bank')        
+          
+          if !card.children.empty?
             result[:card] = parse_card_details(card)
+          elsif !elv.children.empty?
+            result[:elv] = parse_elv_details(elv)
+          else
+            result[:bank] = parse_bank_details(bank)
           end
-
+          
           result
         end
 
@@ -128,15 +144,25 @@ module Adyen
           }
         end
 
+        def parse_elv_details(elv)
+          {
+            :holder_name      => bank.text('./payment:accountHolderName'),
+            :number           => bank.text('./payment:bankAccountNumber'),
+            :bank_location    => bank.text('./payment:bankLocation'),
+            :bank_location_id => bank.text('./payment:bankLocationId'),
+            :bank_name        => bank.text('./payment:bankName')
+          }
+        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')
+            :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'),
+            :holder_name      => bank.text('./payment:ownerName')
           }
         end
       end
@@ -152,12 +178,14 @@ module Adyen
           super && params[:response] == 'Success'
         end
 
-        alias stored? success?
+        alias_method :stored?, :success?
 
         def params
-          @params ||= { :response => xml_querier.text('//recurring:storeTokenResponse/recurring:result/recurring:result'),
+          @params ||= {
+            :response => xml_querier.text('//recurring:storeTokenResponse/recurring:result/recurring:result'),
             :reference =>  xml_querier.text('//recurring:storeTokenResponse/recurring:result/recurring:rechargeReference'),
-            :recurring_detail_reference => xml_querier.text('//recurring:storeTokenResponse/recurring:result/recurring:recurringDetailReference')}
+            :recurring_detail_reference => xml_querier.text('//recurring:storeTokenResponse/recurring:result/recurring:recurringDetailReference')
+          }
         end
       end
     end

data/lib/adyen/api/response.rb

@@ -32,6 +32,13 @@ module Adyen
         !@http_response.is_a?(Net::HTTPSuccess)
       end
 
+      # @return [Boolean] Whether or not the SOAP request itself was a success.
+      # Adyen returns a 500 status code for e.g. failed CC validation and in this case, we don't
+      # want to throw a server error but rather treat it as something normal.
+      def server_error?
+        @http_response.is_a?(Net::HTTPServerError) && fault_message.nil?
+      end
+
       # @return [XMLQuerier] The response body wrapped in a XMLQuerier.
       def xml_querier
         @xml_querier ||= XMLQuerier.new(@http_response.body)

data/lib/adyen/api/simple_soap_client.rb

@@ -22,23 +22,27 @@ EOS
       # @see http://curl.haxx.se/ca/cacert.pem
       CACERT = File.expand_path('../cacert.pem', __FILE__)
 
-      class ClientError < StandardError
+      class StandardError < ::StandardError
         def initialize(response, action, endpoint)
           @response, @action, @endpoint = response, action, endpoint
         end
 
-        def message
-          "[#{@response.code} #{@response.message}] A client error occurred while calling SOAP action `#{@action}' on endpoint `#{@endpoint}'."
+        private
+
+        def message_prefix
+          %{[#{@response.http_response.code} #{@response.http_response.message}] A %s error occurred while calling SOAP action `#{@action}' on endpoint `#{@endpoint}'.}
         end
       end
 
-      class ServerError < StandardError
-        def initialize(response, action, endpoint)
-          @response, @action, @endpoint = response, action, endpoint
+      class ClientError < StandardError
+        def message
+          "#{message_prefix % "client"} Fault message: #{@response.fault_message}."
         end
+      end
 
+      class ServerError < StandardError
         def message
-          "[#{@response.code} #{@response.message}] A server error occurred while calling SOAP action `#{@action}' on endpoint `#{@endpoint}'."
+          message_prefix % 'server'
         end
       end
 
@@ -118,9 +122,10 @@ EOS
 
           request.start do |http|
             http_response = http.request(post)
-            raise ClientError.new(http_response, action, endpoint) if http_response.is_a?(Net::HTTPClientError)
-            raise ServerError.new(http_response, action, endpoint) if http_response.is_a?(Net::HTTPServerError)
-            response_class.new(http_response)
+            response = response_class.new(http_response)
+            raise ClientError.new(response, action, endpoint) if http_response.is_a?(Net::HTTPClientError)
+            raise ServerError.new(response, action, endpoint) if response.server_error?
+            response
           end
         end
       end

data/lib/adyen/api/templates/recurring_service.rb

@@ -54,6 +54,18 @@ EOS
           <payment:expiryMonth>%02d</payment:expiryMonth>
         </recurring:card>
 EOS
+      # Electronic bank debit in Germany. Semi real-time payment method.
+      # @private
+      ELV_PARTIAL = <<EOS
+        <recurring:elv>
+          <payment:bankLocation>%s</payment:bankLocation>
+          <payment:bankName>%s</payment:bankName>
+          <payment:bankLocationId>%s</payment:bankLocationId>
+          <payment:accountHolderName>%s</payment:accountHolderName>
+          <payment:bankAccountNumber>%02d</payment:bankAccountNumber>
+        </recurring:elv>
+EOS
+
     end
   end
 end

data/lib/adyen/templates/notification_model.rb

@@ -56,7 +56,7 @@ class AdyenNotification < ActiveRecord::Base
     event_code == 'AUTHORISATION'
   end
 
-  alias :authorization? :authorisation?
+  alias_method :authorization?, :authorisation?
   
   # Returns true if this notification is an AUTHORISATION notification and
   # the success status indicates that the authorization was successfull.
@@ -66,5 +66,5 @@ class AdyenNotification < ActiveRecord::Base
     event_code == 'AUTHORISATION' && success?
   end
   
-  alias :successful_authorization? :successful_authorisation?
+  alias_method :successful_authorization?, :successful_authorisation?
 end

data/spec/api/api_spec.rb

@@ -131,6 +131,17 @@ describe Adyen::API do
         )
       end
 
+      it "performs a `tokenize ELV details' request" do
+        should_map_shortcut_to(:store_token,
+          :shopper => { :reference => 'user-id', :email => 's.hopper@example.com' },
+          :elv => { :bank_location => "Berlin", :bank_name => "TestBank", :bank_location_id => "12345678", :holder_name => "Simon Hopper", :number => "1234567890" }
+        )
+        Adyen::API.store_recurring_token(
+          { :reference => 'user-id', :email => 's.hopper@example.com' },
+          { :bank_location => "Berlin", :bank_name => "TestBank", :bank_location_id => "12345678", :holder_name => "Simon Hopper", :number => "1234567890" }
+        )
+      end
+
       it "preforms a `list recurring details' request" do
         should_map_shortcut_to(:list, :shopper => { :reference => 'user-id' })
         Adyen::API.list_recurring_details('user-id')

data/spec/api/payment_service_spec.rb

@@ -156,6 +156,18 @@ describe Adyen::API::PaymentService do
       end
     end
 
+    describe "with a `refused' response" do
+      before do
+        stub_net_http(AUTHORISE_REQUEST_REFUSED_RESPONSE)
+        @response = @payment.authorise_payment
+      end
+
+      it "returns that the payment was refused" do
+        @response.should be_refused
+        @response.error.should == [:base, 'Transaction was refused.']
+      end
+    end
+
     describe "with a `invalid' response" do
       before do
         stub_net_http(AUTHORISE_REQUEST_INVALID_RESPONSE % 'validation 101 Invalid card number')
@@ -202,19 +214,6 @@ describe Adyen::API::PaymentService do
         end
       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::AuthorisationResponse.original_fault_message_for(*attr_and_message).should == expected
-        end
-      end
-
       private
 
       def response_with_fault_message(message)

data/spec/api/recurring_service_spec.rb

@@ -27,6 +27,14 @@ describe Adyen::API::RecurringService do
         #:issue_number => ,
         #:start_month => ,
         #:start_year => ,
+      },
+      # German's Direct Debit (Elektronisches Lastschriftverfahren)
+      :elv => {
+        :holder_name      => 'Simon わくわく Hopper',
+        :number           => '1234567890',
+        :bank_location    => 'Berlin',
+        :bank_location_id => '12345678',
+        :bank_name        => 'TestBank',
       }
     }
     @recurring = @object = Adyen::API::RecurringService.new(@params)
@@ -67,13 +75,13 @@ describe Adyen::API::RecurringService do
         },
         {
           :bank => {
-            :bank_account_number => '123456789',
+            :number => '123456789',
             :bank_location_id => 'bank-location-id',
             :bank_name => 'AnyBank',
             :bic => 'BBBBCCLLbbb',
             :country_code => 'NL',
             :iban => 'NL69PSTB0001234567',
-            :owner_name => 'S. Hopper'
+            :holder_name => 'S. Hopper'
           },
           :recurring_detail_reference => 'RecurringDetailReference2',
           :variant => 'IDEAL',
@@ -161,6 +169,38 @@ describe Adyen::API::RecurringService do
       text('./recurring:recurring/payment:contract').should == 'RECURRING'
     end
   end
+  
+  describe_request_body_of :store_token, '//recurring:storeToken/recurring:request' do
+    it_should_validate_request_parameters :merchant_account,
+                                          :shopper => [:email, :reference]
+
+    it "includes the merchant account handle" do
+      text('./recurring:merchantAccount').should == 'SuperShopper'
+    end
+
+    it "includes the shopper’s reference" do
+      text('./recurring:shopperReference').should == 'user-id'
+    end
+
+    it "includes the shopper’s email" do
+      text('./recurring:shopperEmail').should == 's.hopper@example.com'
+    end
+
+    it "includes the ELV details" do
+      xpath('./recurring:elv') do |elv|
+        # there's no reason why Nokogiri should escape these characters, but as long as they're correct        
+        elv.text('./payment:accountHolderName').should == 'Simon わくわく Hopper'
+        elv.text('./payment:bankAccountNumber').should == '1234567890'
+        elv.text('./payment:bankLocation').should == 'Berlin'
+        elv.text('./payment:bankLocationId').should == '12345678'
+        elv.text('./payment:bankName').should == 'TestBank'
+      end
+    end
+
+    it "includes the necessary recurring and one-click contract info if the `:recurring' param is truthful" do
+      text('./recurring:recurring/payment:contract').should == 'RECURRING'
+    end
+  end
 
   describe_response_from :disable, (DISABLE_RESPONSE % '[detail-successfully-disabled]'), 'disable' do
     it "returns whether or not it was disabled" do

data/spec/api/response_spec.rb

@@ -32,4 +32,28 @@ describe Adyen::API::Response do
       @response.should_not be_a_success
     end
   end
+
+  describe "with a server error HTTP response and _no_ SOAP fault message" do
+    before do
+      http_response = Net::HTTPServerError.new('1.1', '500', 'Internal Server Error')
+      http_response.stub!(:body).and_return(%{<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:Body></soap:Envelope>})
+      @response = Adyen::API::Response.new(http_response)
+    end
+
+    it "`server_error?` returns that the (HTTP) request did cause a server error" do
+      @response.server_error?.should be_true
+    end
+  end
+
+  describe "with a server error HTTP response _and_ SOAP fault message" do
+    before do
+      http_response = Net::HTTPServerError.new('1.1', '500', 'Internal Server Error')
+      http_response.stub!(:body).and_return(%{<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>Illegal argument. For input string: "100.0"</faultstring></soap:Fault></soap:Body></soap:Envelope>})
+      @response = Adyen::API::Response.new(http_response)
+    end
+
+    it "`server_error?` returns that the (HTTP) request did not cause a server error" do
+      @response.server_error?.should be_false
+    end
+  end
 end

data/spec/api/simple_soap_client_spec.rb

@@ -76,16 +76,58 @@ describe Adyen::API::SimpleSOAPClient do
       @response.xml_querier.to_s.should == AUTHORISE_RESPONSE
     end
 
-    it "raises when the HTTP response is a subclass of Net::HTTPClientError" do
-      Net::HTTP.stubbed_response = Net::HTTPBadRequest.new('1.1', '401', 'Bad request')
-      exception = nil
-      begin
-        @client.call_webservice_action('Action', '<bananas>Yes, please</bananas>', Adyen::API::Response)
-      rescue Adyen::API::SimpleSOAPClient::ClientError => e
-        exception = e
+    [
+      [
+        "[401 Bad request] A client",
+        Net::HTTPBadRequest.new('1.1', '401', 'Bad request'),
+        Adyen::API::SimpleSOAPClient::ClientError
+      ]
+    ].each do |label, response, expected_exception|
+      it "raises when the HTTP response is a subclass of #{response.class.name}" do
+        response.stub!(:body).and_return(%{<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>Illegal argument. For input string: "100.0"</faultstring></soap:Fault></soap:Body></soap:Envelope>})
+        Net::HTTP.stubbed_response = response
+
+        exception = nil
+        begin
+          @client.call_webservice_action('Action', '<bananas>Yes, please</bananas>', Adyen::API::Response)
+        rescue expected_exception => e
+          exception = e
+        end
+        exception.message.should ==  %{#{label} error occurred while calling SOAP action `Action' on endpoint `https://test.example.com/soap/Action'. Fault message: Illegal argument. For input string: "100.0".}
+      end
+    end
+
+    describe 'server error' do
+      [
+        ["[500 Internal Server Error] A server",      Net::HTTPBadGateway.new('1.1', '500', 'Internal Server Error')],
+        ["[501 Not Implemented] A server",            Net::HTTPBadGateway.new('1.1', '501', 'Not Implemented')],
+        ["[502 Bad Gateway] A server",                Net::HTTPBadGateway.new('1.1', '502', 'Bad Gateway')],
+        ["[503 Service Unavailable] A server",        Net::HTTPBadGateway.new('1.1', '503', 'Service Unavailable')],
+        ["[504 Gateway Timeout] A server",            Net::HTTPBadGateway.new('1.1', '504', 'Gateway Timeout')],
+        ["[505 HTTP Version Not Supported] A server", Net::HTTPBadGateway.new('1.1', '505', 'HTTP Version Not Supported')],
+      ].each do |label, response|
+        it "is raised when the HTTP response is a `real` server error by status code" do
+          response.stub!(:body).and_return(%{<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:Body></soap:Envelope>})
+          Net::HTTP.stubbed_response = response
+
+          exception = nil
+          begin
+            @client.call_webservice_action('Action', '<bananas>Yes, please</bananas>', Adyen::API::Response)
+          rescue Adyen::API::SimpleSOAPClient::ServerError => e
+            exception = e
+          end
+          exception.message.should ==  %{#{label} error occurred while calling SOAP action `Action' on endpoint `https://test.example.com/soap/Action'.}
+        end
+      end
+
+      it "is not raised when the HTTP response has a 500 status code with a fault message" do
+        response = Net::HTTPServerError.new('1.1', '500', 'Internal Server Error')
+        response.stub!(:body).and_return(%{<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>Illegal argument. For input string: "100.0"</faultstring></soap:Fault></soap:Body></soap:Envelope>})
+
+         lambda do
+            @client.call_webservice_action('Action', '<bananas>Yes, please</bananas>', Adyen::API::Response)
+          end.should_not raise_error Adyen::API::SimpleSOAPClient::ServerError
       end
-      msg = "[401 Bad request] A client error occurred while calling SOAP action `Action' on endpoint `https://test.example.com/soap/Action'."
-      exception.message.should == msg
     end
   end
 end

data/spec/api/spec_helper.rb

@@ -274,6 +274,21 @@ AUTHORISE_REQUEST_INVALID_RESPONSE = <<EOS
 </soap:Envelope>
 EOS
 
+AUTHORISE_REQUEST_REFUSED_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>
+        <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
+
+
 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">

data/spec/functional/api_spec.rb

@@ -57,14 +57,23 @@ if File.exist?(API_SPEC_INITIALIZER)
       response.psp_reference.should_not be_empty
     end
 
-    it "stores the provided creditcard details" do
-      response = Adyen::API.store_recurring_token(
-        { :email => "#{@user_id}@example.com", :reference => @user_id },
-        { :expiry_month => 12, :expiry_year => 2012, :holder_name => "Simon #{@user_id} Hopper", :number => '4111111111111111' }
-      )
-      response.should be_stored
-      response.recurring_detail_reference.should_not be_empty
-    end
+    # TODO disabled for now: https://github.com/wvanbergen/adyen/issues/29
+    #it "stores the provided ELV account details" do
+      #response = Adyen::API.store_recurring_token(
+        #{ :email => "#{@user_id}@example.com", :reference => @user_id },
+        #{ :bank_location => "Berlin", :bank_name => "TestBank", :bank_location_id => "12345678", :holder_name => "Simon #{@user_id} Hopper", :number => "1234567890" }
+      #)
+      #response.should be_stored
+      #response.recurring_detail_reference.should_not be_empty
+    #end
+    #it "stores the provided creditcard details" do
+      #response = Adyen::API.store_recurring_token(
+        #{ :email => "#{@user_id}@example.com", :reference => @user_id },
+        #{ :expiry_month => 12, :expiry_year => 2012, :holder_name => "Simon #{@user_id} Hopper", :number => '4111111111111111' }
+      #)
+      #response.should be_stored
+      #response.recurring_detail_reference.should_not be_empty
+    #end
 
     it "captures a payment" do
       response = Adyen::API.capture_payment(@payment_response.psp_reference, { :currency => 'EUR', :value => '1234' })

data/spec/spec_helper.rb

@@ -1,10 +1,8 @@
 # encoding: UTF-8
 
 require 'rubygems'
-require 'rspec'
-
-$:.unshift File.expand_path('../../lib', __FILE__)
 
+require 'rspec'
 require 'adyen'
 require 'adyen/matchers'
 

data/tasks/github-gem.rake

@@ -13,8 +13,8 @@ module GithubGem
 
   # Detects the main include file of this project using heuristics
   def self.detect_main_include
-    if detect_gemspec_file =~ /^(\.*)\.gemspec$/ && File.exist?("lib/#{$1}.rb")
-      "lib/#{$1}.rb"
+    if File.exist?(File.expand_path("../lib/#{File.basename(detect_gemspec_file, '.gemspec').gsub(/-/, '/')}.rb", detect_gemspec_file))
+      "lib/#{File.basename(detect_gemspec_file, '.gemspec').gsub(/-/, '/')}.rb"
     elsif FileList['lib/*.rb'].length == 1
       FileList['lib/*.rb'].first
     else
@@ -24,6 +24,8 @@ module GithubGem
 
   class RakeTasks
 
+    include Rake::DSL if Rake.const_defined?('DSL')
+
     attr_reader   :gemspec, :modified_files
     attr_accessor :gemspec_file, :task_namespace, :main_include, :root_dir, :spec_pattern, :test_pattern, :remote, :remote_branch, :local_branch
 
@@ -331,7 +333,7 @@ module GithubGem
 
         # Reload the gemspec so the changes are incorporated
         load_gemspec!
-
+        
         # Also mark the Gemfile.lock file as changed because of the new version.
         modified_files << 'Gemfile.lock' if File.exist?(File.join(root_dir, 'Gemfile.lock'))
       end
@@ -341,8 +343,8 @@ module GithubGem
     def update_tasks_task
       require 'net/https'
       require 'uri'
-
-      uri = URI.parse('https://github.com/wvanbergen/github-gem/raw/master/tasks/github-gem.rake')
+      
+      uri = URI.parse('https://raw.github.com/wvanbergen/github-gem/master/tasks/github-gem.rake')
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adyen
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -17,8 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -04:00
-default_executable: 
+date: 2011-10-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -28,6 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -41,37 +42,39 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
-        - 0
-        version: "2.0"
+        version: "2"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: rails
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 3
+        version: "2.3"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: nokogiri
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
-        - 2
-        - 3
-        version: "2.3"
+        - 0
+        version: "0"
   type: :development
   version_requirements: *id004
 description: "    Package to simplify including the Adyen payments services into a Ruby on Rails application.\n    The package provides functionality to create payment forms, handling and storing notifications \n    sent by Adyen and consuming the SOAP services provided by Adyen. Moreover, it contains helper\n    methods, mocks and matchers to simpify writing tests/specsfor your code.\n"
@@ -89,6 +92,8 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - .kick
+- .travis.yml
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -128,7 +133,6 @@ files:
 - spec/spec_helper.rb
 - tasks/github-gem.rake
 - yard_extensions.rb
-has_rdoc: true
 homepage: http://github.com/wvanbergen/adyen/wiki
 licenses: []
 
@@ -147,6 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -155,13 +160,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - Having Nokogiri installed will speed up XML handling when using the SOAP API.
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Integrate Adyen payment services in your Ruby on Rails application.