adyen 1.3.1 → 1.3.2

data/.travis.yml

@@ -1,9 +1,19 @@
 language: ruby
+script: bundle exec rake
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
   - ruby-head
   - ree
-  - rbx
-  - jruby
+  - rbx-18mode
+  - rbx-19mode
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode
+    - rvm: jruby-19mode
+    - rvm: jruby-head
+    - rvm: ruby-head

data/adyen.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name    = 'adyen'
-  s.version = "1.3.1"
-  s.date    = "2012-02-20"
+  s.version = "1.3.2"
+  s.date    = "2013-01-14"
 
   s.summary = "Integrate Adyen payment services in your Ruby on Rails application."
   s.description = <<-EOS
     Package to simplify including the Adyen payments services into a Ruby on Rails application.
     The package provides functionality to create payment forms, handling and storing notifications 
     sent by Adyen and consuming the SOAP services provided by Adyen. Moreover, it contains helper
-    methods, mocks and matchers to simpify writing tests/specsfor your code.
+    methods, mocks and matchers to simpify writing tests/specs for your code.
   EOS
 
   s.authors  = ['Willem van Bergen', 'Michel Barbosa', 'Stefan Borsje', 'Eloy Duran']

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.3.1"
+  VERSION = "1.3.2"
 
   # @return [Configuration] The configuration singleton.
   def self.configuration

data/lib/adyen/api.rb

@@ -20,8 +20,14 @@ module Adyen
   # * {RecurringService} - for handling recurring contract details.
   #
   # *However*, direct use of these classes is discouraged in favor of the shortcut methods defined
-  # on the API module. These methods *expect* that you set the :merchant_account as a default
-  # parameter.
+  # on the API module. These methods *require* that you set the :merchant_account *beforehand* as
+  # a default parameter passed in all API calls:
+  #
+  #     Adyen.configuration.default_api_params[:merchant_account] = 'MerchantAccount'
+  #
+  # For Rails apps, you can also set it `application.rb` config block, like this:
+  #
+  #     config.adyen.default_api_params = { :merchant_account => 'MerchantAccount' }
   #
   # Note that you'll need an Adyen notification PSP reference for some of the calls. Because of
   # this, store all notifications that Adyen sends to you. Moreover, the responses to these calls 

data/lib/adyen/api/recurring_service.rb

@@ -96,7 +96,7 @@ module Adyen
         response_attrs :details, :last_known_shopper_email, :shopper_reference, :creation_date
 
         def references
-          details.map { |d| d[:recurring_detail_reference] }
+          details ? details.map { |d| d[:recurring_detail_reference] } : []
         end
 
         def params
@@ -113,7 +113,6 @@ module Adyen
 
         private
 
-        # @todo add support for elv
         def parse_recurring_detail(node)
           result = {
             :recurring_detail_reference => node.text('./recurring:recurringDetailReference'),
@@ -146,11 +145,11 @@ module Adyen
 
         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')
+            :holder_name      => elv.text('./payment:accountHolderName'),
+            :number           => elv.text('./payment:bankAccountNumber'),
+            :bank_location    => elv.text('./payment:bankLocation'),
+            :bank_location_id => elv.text('./payment:bankLocationId'),
+            :bank_name        => elv.text('./payment:bankName')
           }
         end
 

data/lib/adyen/configuration.rb

@@ -36,11 +36,11 @@ class Adyen::Configuration
     elsif defined?(::RAILS_ENV)
       ::RAILS_ENV.to_s
     end
-    
+
     LIVE_RAILS_ENVIRONMENTS.include?(rails_env) ? 'live' : 'test'
   end
-  
-  # The payment flow URL that’s used to choose the payement process
+
+  # The payment flow page type that’s used to choose the payment process
   #
   # @example
   #   Adyen.configuration.payment_flow = :select
@@ -49,7 +49,15 @@ class Adyen::Configuration
   #
   # @return [String]
   attr_accessor :payment_flow
-  
+
+  # The payment flow domain that’s used to choose the payment process
+  #
+  # @example
+  #   Adyen.configuration.payment_flow_domain = checkout.mydomain.com
+  #
+  # @return [String]
+  attr_accessor :payment_flow_domain
+
   # The username that’s used to authenticate for the Adyen SOAP services. It should look
   # something like ‘+ws@AndyInc.SuperShop+’
   #
@@ -78,13 +86,13 @@ class Adyen::Configuration
   #
   # @return [Hash]
   attr_accessor :default_form_params
-  
-  # Username that's set in Notification settings screen in Adyen PSP system and used by notification service to 
+
+  # Username that's set in Notification settings screen in Adyen PSP system and used by notification service to
   # authenticate instant payment notification requests.
   #
   # @return [String]
   attr_accessor :ipn_username
-  
+
   # Password used to authenticate notification requests together with '+ipn_username+' configuration attribute.
   #
   # @return [String]
@@ -98,10 +106,10 @@ class Adyen::Configuration
   #
   # @return [Hash] The hash of registered skins.
   attr_reader :form_skins
-  
+
   # Sets the registered skins.
   #
-  # @param [Hash<Symbol, Hash>] hash A hash with the skin name as key and the skin parameter hash 
+  # @param [Hash<Symbol, Hash>] hash A hash with the skin name as key and the skin parameter hash
   #    (which should include +:skin_code+ and +:shared_secret+) as value.
   #
   # @see Adyen::Configuration.register_form_skin
@@ -125,8 +133,8 @@ class Adyen::Configuration
   # @param [Symbol] name The name of the skin.
   # @param [String] skin_code The skin code for this skin, as defined by Adyen.
   # @param [String] shared_secret The shared secret used for signature calculation.
-  def register_form_skin(name, skin_code, shared_secret)
-    @form_skins[name.to_sym] = { :name => name.to_sym, :skin_code => skin_code, :shared_secret => shared_secret }
+  def register_form_skin(name, skin_code, shared_secret, default_form_params = {})
+    @form_skins[name.to_sym] = { :name => name.to_sym, :skin_code => skin_code, :shared_secret => shared_secret, :default_form_params => default_form_params}
   end
 
   # Returns a skin information by name.

data/lib/adyen/form.rb

@@ -2,8 +2,8 @@ require 'cgi'
 
 module Adyen
 
-  # The Adyen::Form module contains all functionality that is used to send payment requests 
-  # to the Adyen payment system, using either a HTML form (see {Adyen::Form.hidden_fields}) 
+  # The Adyen::Form module contains all functionality that is used to send payment requests
+  # to the Adyen payment system, using either a HTML form (see {Adyen::Form.hidden_fields})
   # or a HTTP redirect (see {Adyen::Form.redirect_url}).
   #
   # Moreover, this module contains the method {Adyen::Form.redirect_signature_check} to
@@ -12,7 +12,7 @@ module Adyen
   #
   # You can use different skins in Adyen to define different payment environments. You can
   # register these skins under a custom name in the module. The other methods will automatically
-  # use this information (i.e. the skin code and the shared secret) if it is available. 
+  # use this information (i.e. the skin code and the shared secret) if it is available.
   # Otherwise, you have to provide it yourself for every method call you make. See
   # {Adyen::Configuration#register_form_skin} for more information.
   #
@@ -27,22 +27,41 @@ module Adyen
     # ADYEN FORM URL
     ######################################################
 
+    # The DOMAIN of the Adyen payment system that still requires the current
+    # Adyen enviroment.
+    ACTION_DOMAIN = "%s.adyen.com"
+
     # The URL of the Adyen payment system that still requires the current
-    # Adyen enviroment and payment flow to be filled.
-    ACTION_URL = "https://%s.adyen.com/hpp/%s.shtml"
+    # domain and payment flow to be filled.
+    ACTION_URL = "https://%s/hpp/%s.shtml"
+
+    # Returns the DOMAIN of the Adyen payment system, adjusted for an Adyen environment.
+    #
+    # @param [String] environment The Adyen environment to use. This parameter can be
+    #    left out, in which case the 'current' environment will be used.
+    # @return [String] The domain of the Adyen payment system that can be used
+    #    for payment forms or redirects.
+    # @see Adyen::Form.environment
+    # @see Adyen::Form.redirect_url
+    def domain(environment = nil)
+      environment  ||= Adyen.configuration.environment
+      (Adyen.configuration.payment_flow_domain || ACTION_DOMAIN) % [environment.to_s]
+    end
 
     # Returns the URL of the Adyen payment system, adjusted for an Adyen environment.
     #
-    # @param [String] environment The Adyen environment to use. This parameter can be 
+    # @param [String] environment The Adyen environment to use. This parameter can be
     #    left out, in which case the 'current' environment will be used.
+    # @param [String] payment_flow The Adyen payment type to use. This parameter can be
+    #    left out, in which case the default payment type will be used.
     # @return [String] The absolute URL of the Adyen payment system that can be used
     #    for payment forms or redirects.
     # @see Adyen::Form.environment
+    # @see Adyen::Form.domain
     # @see Adyen::Form.redirect_url
     def url(environment = nil, payment_flow = nil)
-      environment  ||= Adyen.configuration.environment
       payment_flow ||= Adyen.configuration.payment_flow
-      Adyen::Form::ACTION_URL % [environment.to_s, payment_flow.to_s]
+      Adyen::Form::ACTION_URL % [domain(environment), payment_flow.to_s]
     end
 
     ######################################################
@@ -58,22 +77,24 @@ module Adyen
     # @param [Hash] parameters The payment parameters hash to transform
     def do_parameter_transformations!(parameters = {})
       parameters.replace(Adyen.configuration.default_form_params.merge(parameters))
-      parameters[:recurring_contract] = 'RECURRING' if parameters.delete(:recurring) == true
-      parameters[:order_data]         = Adyen::Encoding.gzip_base64(parameters.delete(:order_data_raw)) if parameters[:order_data_raw]
-      parameters[:ship_before_date]   = Adyen::Formatter::DateTime.fmt_date(parameters[:ship_before_date])
-      parameters[:session_validity]   = Adyen::Formatter::DateTime.fmt_time(parameters[:session_validity])
-      
+
       if parameters[:skin]
         skin = Adyen.configuration.form_skin_by_name(parameters.delete(:skin))
         parameters[:skin_code]     ||= skin[:skin_code]
         parameters[:shared_secret] ||= skin[:shared_secret]
+        parameters.merge!(skin[:default_form_params])
       end
+
+      parameters[:recurring_contract] = 'RECURRING' if parameters.delete(:recurring) == true
+      parameters[:order_data]         = Adyen::Encoding.gzip_base64(parameters.delete(:order_data_raw)) if parameters[:order_data_raw]
+      parameters[:ship_before_date]   = Adyen::Formatter::DateTime.fmt_date(parameters[:ship_before_date])
+      parameters[:session_validity]   = Adyen::Formatter::DateTime.fmt_time(parameters[:session_validity])
     end
 
     # Transforms the payment parameters to be in the correct format and calculates the merchant
     # signature parameter. It also does some basic health checks on the parameters hash.
     #
-    # @param [Hash] parameters The payment parameters. The parameters set in the 
+    # @param [Hash] parameters The payment parameters. The parameters set in the
     #    {Adyen::Configuration#default_form_params} hash will be included automatically.
     # @param [String] shared_secret The shared secret that should be used to calculate
     #    the payment request signature. This parameter can be left if the skin that is
@@ -83,7 +104,7 @@ module Adyen
     # @raise [ArgumentError] Thrown if some parameter health check fails.
     def payment_parameters(parameters = {}, shared_secret = nil)
       do_parameter_transformations!(parameters)
-      
+
       raise ArgumentError, "Cannot generate form: :currency code attribute not found!"         unless parameters[:currency_code]
       raise ArgumentError, "Cannot generate form: :payment_amount code attribute not found!"   unless parameters[:payment_amount]
       raise ArgumentError, "Cannot generate form: :merchant_account attribute not found!"      unless parameters[:merchant_account]
@@ -93,14 +114,27 @@ module Adyen
       shared_secret ||= parameters.delete(:shared_secret)
       raise ArgumentError, "Cannot calculate payment request signature without shared secret!" unless shared_secret
       parameters[:merchant_sig] = calculate_signature(parameters, shared_secret)
-      
+
+      if parameters[:billing_address]
+        parameters[:billing_address_sig] = calculate_billing_address_signature(parameters, shared_secret)
+      end
+
       return parameters
     end
-    
+
+    # Transforms and flattens payment parameters to be in the correct format which is understood and accepted by adyen
+    #
+    # @param [Hash] parameters The payment parameters. The parameters set in the
+    #    {Adyen::Configuration#default_form_params} hash will be included automatically.
+    # @return [Hash] The payment parameters flatten, with camelized and prefixed key, stringified value
+    def flat_payment_parameters(parameters = {})
+      flatten(payment_parameters(parameters))
+    end
+
     # Returns an absolute URL to the Adyen payment system, with the payment parameters included
     # as GET parameters in the URL. The URL also depends on the current Adyen enviroment.
     #
-    # The payment parameters that are provided to this method will be merged with the 
+    # The payment parameters that are provided to this method will be merged with the
     # {Adyen::Configuration#default_form_params} hash. The default parameter values will be
     # overrided if another value is provided to this method.
     #
@@ -108,7 +142,7 @@ module Adyen
     # if you provide either a registered skin name as the +:skin+ parameter or provide both the
     # +:skin_code+ and +:shared_secret+ parameters.
     #
-    # Note that Internet Explorer has a maximum length for URLs it can handle (2083 characters). 
+    # Note that Internet Explorer has a maximum length for URLs it can handle (2083 characters).
     # Make sure that the URL is not longer than this limit if you want your site to work in IE.
     #
     # @example
@@ -117,7 +151,7 @@ module Adyen
     #      # Genarate a URL to redirect to Adyen's payment system.
     #      adyen_url = Adyen::Form.redirect_url(:skin => :my_skin, :currency_code => 'USD',
     #            :payment_amount => 1000, merchant_account => 'MyMerchant', ... )
-    #      
+    #
     #      respond_to do |format|
     #        format.html { redirect_to(adyen_url) }
     #      end
@@ -126,14 +160,15 @@ module Adyen
     # @param [Hash] parameters The payment parameters to include in the payment request.
     # @return [String] An absolute URL to redirect to the Adyen payment system.
     def redirect_url(parameters = {})
-      url + '?' + payment_parameters(parameters).map{|k,v| [k.to_s,v] }.sort.map { |(k, v)| 
-        "#{camelize(k)}=#{CGI.escape(v.to_s)}" }.join('&')
+      url + '?' + flat_payment_parameters(parameters).map { |(k, v)|
+        "#{k}=#{CGI.escape(v)}"
+      }.join('&')
     end
-    
-    # Returns a HTML snippet of hidden INPUT tags with the provided payment parameters. 
+
+    # Returns a HTML snippet of hidden INPUT tags with the provided payment parameters.
     # The snippet can be included in a payment form that POSTs to the Adyen payment system.
     #
-    # The payment parameters that are provided to this method will be merged with the 
+    # The payment parameters that are provided to this method will be merged with the
     # {Adyen::Configuration#default_form_params} hash. The default parameter values will be
     # overrided if another value is provided to this method.
     #
@@ -152,15 +187,15 @@ module Adyen
     # @return [String] An HTML snippet that can be included in a form that POSTs to the
     #       Adyen payment system.
     def hidden_fields(parameters = {})
-      
+
       # Generate a hidden input tag per parameter, join them by newlines.
-      form_str = payment_parameters(parameters).map { |key, value|
-        "<input type=\"hidden\" name=\"#{CGI.escapeHTML(camelize(key))}\" value=\"#{CGI.escapeHTML(value.to_s)}\" />"
+      form_str = flat_payment_parameters(parameters).map { |key, value|
+        "<input type=\"hidden\" name=\"#{CGI.escapeHTML(key)}\" value=\"#{CGI.escapeHTML(value)}\" />"
       }.join("\n")
-      
+
       form_str.respond_to?(:html_safe) ? form_str.html_safe : form_str
     end
-    
+
     ######################################################
     # MERCHANT SIGNATURE CALCULATION
     ######################################################
@@ -181,7 +216,7 @@ module Adyen
                              parameters[:billing_address_type].to_s << parameters[:offset].to_s
     end
 
-    # Calculates the payment request signature for the given payment parameters. 
+    # Calculates the payment request signature for the given payment parameters.
     #
     # This signature is used by Adyen to check whether the request is
     # genuinely originating from you. The resulting signature should be
@@ -190,15 +225,47 @@ module Adyen
     #
     # @param [Hash] parameters The payment parameters for which to calculate
     #    the payment request signature.
-    # @param [String] shared_secret The shared secret to use for this signature. 
-    #    It should correspond with the skin_code parameter. This parameter can be 
+    # @param [String] shared_secret The shared secret to use for this signature.
+    #    It should correspond with the skin_code parameter. This parameter can be
     #    left out if the shared_secret is included as key in the parameters.
     # @return [String] The signature of the payment request
+    # @raise [ArgumentError] Thrown if shared_secret is empty
     def calculate_signature(parameters, shared_secret = nil)
       shared_secret ||= parameters.delete(:shared_secret)
+      raise ArgumentError, "Cannot calculate payment request signature with empty shared_secret" if shared_secret.to_s.empty?
       Adyen::Encoding.hmac_base64(shared_secret, calculate_signature_string(parameters))
     end
 
+    # Generates the string that is used to calculate the request signature. This signature
+    # is used by Adyen to check whether the request is genuinely originating from you.
+    # @param [Hash] parameters The parameters that will be included in the billing address request.
+    # @return [String] The string for which the siganture is calculated.
+    def calculate_billing_address_signature_string(parameters)
+      %w(street house_number_or_name city postal_code state_or_province country).map do |key|
+        parameters[key.to_sym]
+      end.join
+    end
+
+    # Calculates the billing address request signature for the given billing address parameters.
+    #
+    # This signature is used by Adyen to check whether the request is
+    # genuinely originating from you. The resulting signature should be
+    # included in the billing address request parameters as the +billingAddressSig+
+    # parameter; the shared secret should of course not be included.
+    #
+    # @param [Hash] parameters The billing address parameters for which to calculate
+    #    the billing address request signature.
+    # @param [String] shared_secret The shared secret to use for this signature.
+    #    It should correspond with the skin_code parameter. This parameter can be
+    #    left out if the shared_secret is included as key in the parameters.
+    # @return [String] The signature of the billing address request
+    # @raise [ArgumentError] Thrown if shared_secret is empty
+    def calculate_billing_address_signature(parameters, shared_secret = nil)
+      shared_secret ||= parameters.delete(:shared_secret)
+      raise ArgumentError, "Cannot calculate billing address request signature with empty shared_secret" if shared_secret.to_s.empty?
+      Adyen::Encoding.hmac_base64(shared_secret, calculate_billing_address_signature_string(parameters[:billing_address]))
+    end
+
     ######################################################
     # REDIRECT SIGNATURE CHECKING
     ######################################################
@@ -207,20 +274,22 @@ module Adyen
     # @param [Hash] params A hash of HTTP GET parameters for the redirect request.
     # @return [String] The signature string.
     def redirect_signature_string(params)
-      params[:authResult].to_s + params[:pspReference].to_s + params[:merchantReference].to_s + 
+      params[:authResult].to_s + params[:pspReference].to_s + params[:merchantReference].to_s +
         params[:skinCode].to_s + params[:merchantReturnData].to_s
     end
-    
-    # Computes the redirect signature using the request parameters, so that the 
+
+    # Computes the redirect signature using the request parameters, so that the
     # redirect can be checked for forgery.
     #
     # @param [Hash] params A hash of HTTP GET parameters for the redirect request.
     # @param [String] shared_secret The shared secret for the Adyen skin that was used for
-    #     the original payment form. You can leave this out of the skin is registered 
+    #     the original payment form. You can leave this out of the skin is registered
     #     using the {Adyen::Form.register_skin} method.
     # @return [String] The redirect signature
+    # @raise [ArgumentError] Thrown if shared_secret is empty
     def redirect_signature(params, shared_secret = nil)
       shared_secret ||= Adyen.configuration.form_skin_shared_secret_by_code(params[:skinCode])
+      raise ArgumentError, "Cannot compute redirect signature with empty shared_secret" if shared_secret.to_s.empty?
       Adyen::Encoding.hmac_base64(shared_secret, redirect_signature_string(params))
     end
 
@@ -235,14 +304,14 @@ module Adyen
     # @example
     #   class PaymentsController < ApplicationController
     #     before_filter :check_signature, :only => [:return_from_adyen]
-    #     
+    #
     #     def return_from_adyen
     #       @invoice = Invoice.find(params[:merchantReference])
     #       @invoice.set_paid! if params[:authResult] == 'AUTHORISED'
     #     end
-    #     
+    #
     #     private
-    #     
+    #
     #     def check_signature
     #       raise "Forgery!" unless Adyen::Form.redirect_signature_check(params)
     #     end
@@ -251,19 +320,46 @@ module Adyen
     # @param [Hash] params params A hash of HTTP GET parameters for the redirect request. This
     #      should include the +:merchantSig+ parameter, which contains the signature.
     # @param [String] shared_secret The shared secret for the Adyen skin that was used for
-    #     the original payment form. You can leave this out of the skin is registered 
+    #     the original payment form. You can leave this out of the skin is registered
     #     using the {Adyen::Configuration#register_form_skin} method.
     # @return [true, false] Returns true only if the signature in the parameters is correct.
     def redirect_signature_check(params, shared_secret = nil)
       params[:merchantSig] == redirect_signature(params, shared_secret)
     end
-    
+
     # Returns the camelized version of a string.
     # @param [:to_s] identifier The identifier to turn to camelcase
     # @return [String] The camelcase version of the identifier provided.
     def camelize(identifier)
       identifier.to_s.gsub(/_(.)/) { $1.upcase }
     end
-    
+
+    # Transforms the nested parameters Hash into a 'flat' Hash which is understood by adyen. This is:
+    #  * all keys are camelized
+    #  * all keys are  stringified
+    #  * nested hash is flattened, keys are prefixed with root key
+    #
+    # @example
+    #    flatten {:billing_address => { :street => 'My Street'}}
+    #
+    #    # resolves in:
+    #    {'billingAddress.street' =>  'My Street'}
+    #
+    # @param [Hash] parameters The payment parameters which to transform
+    # @param [String] prefix The prefix to add to the key
+    # @param [Hash] return_hash The new hash which is retruned (needed for recursive calls)
+    # @return [Hash] The return_hash filled with camelized and prefixed key, stringified value
+    def flatten(parameters, prefix = "", return_hash = {})
+      parameters ||= {}
+      parameters.inject(return_hash) do |hash, (key, value)|
+        key = "#{prefix}#{camelize(key)}"
+        if value.is_a?(Hash)
+          flatten(value, "#{key}.", return_hash)
+        else
+          hash[key] = value.to_s
+        end
+        hash
+      end
+    end
   end
 end

data/lib/adyen/templates/notification_migration.rb

@@ -5,7 +5,7 @@ class CreateAdyenNotifications < ActiveRecord::Migration
     create_table :adyen_notifications do |t|
       t.boolean  :live,                  :null => false, :default => false
       t.string   :event_code,            :null => false, :limit => 20
-      t.string   :psp_reference,         :null => false, :limit => 30
+      t.string   :psp_reference,         :null => false, :limit => 50
       t.string   :original_reference,    :null => true
       t.string   :merchant_reference,    :null => false
       t.string   :merchant_account_code, :null => false

data/lib/adyen/templates/notification_model.rb

@@ -16,20 +16,20 @@
 #      @invoice.set_paid!
 #    end
 class AdyenNotification < ActiveRecord::Base
-  
+
   # A notification should always include an event_code
   validates_presence_of :event_code
-  
+
   # A notification should always include a psp_reference
   validates_presence_of :psp_reference
-  
+
   # A notification should be unique using the composed key of
   # [:psp_reference, :event_code, :success]
   validates_uniqueness_of :success, :scope => [:psp_reference, :event_code]
-  
+
   # Make sure we don't end up with an original_reference with an empty string
   before_validation { |notification| notification.original_reference = nil if notification.original_reference.blank? }
-  
+
   # Logs an incoming notification into the database.
   #
   # @param [Hash] params The notification parameters that should be stored in the database.
@@ -38,15 +38,16 @@ class AdyenNotification < ActiveRecord::Base
   # @see Adyen::Notification::HttpPost.log
   def self.log(params)
     converted_params = {}
-    
-    # Convert each attribute from CamelCase notation to under_score notation
+
+    # Assign explicit each attribute from CamelCase notation to notification
     # For example, merchantReference will be converted to merchant_reference
-    params.each do |key, value|
-      column_name = key.to_s.underscore
-      converted_params[column_name] = value if self.column_names.include?(column_name)
+    self.new.tap do |notification|
+      params.each do |key, value|
+        setter = "#{key.to_s.underscore}="
+        notification.send(setter, value) if notification.respond_to?(setter)
+      end
+      notification.save!
     end
-    
-    self.create!(converted_params)
   end
 
   # Returns true if this notification is an AUTHORISATION notification
@@ -57,14 +58,14 @@ class AdyenNotification < ActiveRecord::Base
   end
 
   alias_method :authorization?, :authorisation?
-  
+
   # Returns true if this notification is an AUTHORISATION notification and
   # the success status indicates that the authorization was successfull.
   # @return [true, false] true iff  the notification is an authorization
   #   and the authorization was successful according to the success field.
   def successful_authorisation?
-    event_code == 'AUTHORISATION' && success?
+    authorisation? && success?
   end
-  
+
   alias_method :successful_authorization?, :successful_authorisation?
 end

data/spec/api/recurring_service_spec.rb

@@ -88,17 +88,34 @@ describe Adyen::API::RecurringService do
           :variant => 'IDEAL',
           :creation_date => DateTime.parse('2009-10-27T11:26:22.216+01:00')
         },
+        {
+          :elv => {
+            :holder_name      => 'S. Hopper',
+            :number           => '1234567890',
+            :bank_location    => 'Berlin',
+            :bank_location_id => '12345678',
+            :bank_name        => 'TestBank',
+          },
+          :recurring_detail_reference => 'RecurringDetailReference3',
+          :variant => 'elv',
+          :creation_date => DateTime.parse('2009-10-27T11:26:22.216+01:00')
+        }
       ],
     })
 
     it "returns an array with just the detail references" do
-      @response.references.should == %w{ RecurringDetailReference1 RecurringDetailReference2 }
+      @response.references.should == %w{ RecurringDetailReference1 RecurringDetailReference2 RecurringDetailReference3 }
     end
+  end
 
+  describe_response_from :list, LIST_EMPTY_RESPONSE, 'listRecurringDetails' do
     it "returns an empty hash when there are no details" do
-      stub_net_http(LIST_EMPTY_RESPONSE)
       @recurring.list.params.should == {}
     end
+
+    it "returns an empty array when there are no references" do
+      @response.references.should == []
+    end
   end
 
   describe_request_body_of :disable, '//recurring:disable/recurring:request' do

data/spec/api/spec_helper.rb

@@ -332,6 +332,21 @@ LIST_RESPONSE = <<EOS
             <recurringDetailReference>RecurringDetailReference2</recurringDetailReference>
             <variant>IDEAL</variant>
           </RecurringDetail>
+          <RecurringDetail>
+            <card xsi:nil="true"/>
+            <bank xsi:nil="true"/>            
+            <elv>
+              <accountHolderName xmlns="http://payment.services.adyen.com">S. Hopper</accountHolderName>
+              <bankAccountNumber xmlns="http://payment.services.adyen.com">1234567890</bankAccountNumber>
+              <bankLocation xmlns="http://payment.services.adyen.com">Berlin</bankLocation>
+              <bankLocationId xmlns="http://payment.services.adyen.com">12345678</bankLocationId>
+              <bankName xmlns="http://payment.services.adyen.com">TestBank</bankName>
+            </elv>
+            <creationDate>2009-10-27T11:26:22.216+01:00</creationDate>
+            <name/>
+            <recurringDetailReference>RecurringDetailReference3</recurringDetailReference>
+            <variant>elv</variant>
+          </RecurringDetail>
         </details>
         <ns1:lastKnownShopperEmail>s.hopper@example.com</ns1:lastKnownShopperEmail>
         <ns1:shopperReference>user-id</ns1:shopperReference>

data/spec/form_spec.rb

@@ -6,7 +6,7 @@ require 'adyen/form'
 
 describe Adyen::Form do
 
-  before(:all) do
+  before(:each) do
     Adyen.configuration.register_form_skin(:testing, '4aD37dJA', 'Kah942*$7sdp0)')
     Adyen.configuration.default_form_params[:merchant_account] = 'TestMerchant'
   end
@@ -35,21 +35,32 @@ describe Adyen::Form do
     it "should generate correct live url if explicitely asked for" do
       Adyen::Form.url(:live).should == 'https://live.adyen.com/hpp/select.shtml'
     end
-    
+
     it "should generate correct testing url if the payment flow selection is set to select" do
       Adyen.configuration.payment_flow = :select
       Adyen::Form.url.should == 'https://test.adyen.com/hpp/select.shtml'
     end
-    
+
     it "should generate correct testing url if the payment flow selection is set to pay" do
       Adyen.configuration.payment_flow = :pay
       Adyen::Form.url.should == 'https://test.adyen.com/hpp/pay.shtml'
     end
-    
+
     it "should generate correct testing url if the payment flow selection is set to details" do
       Adyen.configuration.payment_flow = :details
       Adyen::Form.url.should == 'https://test.adyen.com/hpp/details.shtml'
     end
+
+    context "with custom domain" do
+      before(:each) do
+        Adyen.configuration.payment_flow = :select
+        Adyen.configuration.payment_flow_domain = "checkout.mydomain.com"
+      end
+
+      it "should generate correct testing url" do
+        Adyen::Form.url.should == 'https://checkout.mydomain.com/hpp/select.shtml'
+      end
+    end
   end
 
   describe 'redirect signature check' do
@@ -80,6 +91,18 @@ describe Adyen::Form do
       Adyen::Form.redirect_signature_check(@params).should be_true
     end
 
+    it "should raise ArgumentError on missing skinCode" do
+      expect do
+        @params.delete(:skinCode)
+        Adyen::Form.redirect_signature_check(@params).should be_false
+      end.to raise_error ArgumentError
+    end
+
+    it "should raise ArgumentError on empty input" do
+      expect do
+        Adyen::Form.redirect_signature_check({}).should be_false
+      end.to raise_error ArgumentError
+    end
 
     it "should detect a tampered field" do
       Adyen::Form.redirect_signature_check(@params.merge(:pspReference => 'tampered')).should be_false
@@ -99,16 +122,16 @@ describe Adyen::Form do
 
       @redirect_url = Adyen::Form.redirect_url(@attributes)
     end
-    
+
     it "should return an URL pointing to the adyen server" do
       @redirect_url.should =~ %r[^#{Adyen::Form.url}]
     end
-    
+
     it "should include all provided attributes" do
       params = @redirect_url.split('?', 2).last.split('&').map { |param| param.split('=', 2).first }
       params.should include(*(@attributes.keys.map { |k| Adyen::Form.camelize(k) }))
     end
-    
+
     it "should include the merchant signature" do
       params = @redirect_url.split('?', 2).last.split('&').map { |param| param.split('=', 2).first }
       params.should include('merchantSig')
@@ -116,6 +139,7 @@ describe Adyen::Form do
   end
 
   describe 'hidden fields generation' do
+    subject { %Q'<form action="#{CGI.escapeHTML(Adyen::Form.url)}" method="post">#{Adyen::Form.hidden_fields(@attributes)}</form>' }
 
     before(:each) do
       @attributes = { :currency_code => 'GBP', :payment_amount => 10000, :ship_before_date => Date.today,
@@ -123,12 +147,18 @@ describe Adyen::Form do
         :session_validity => Time.now + 3600 }
     end
 
-    it "should generate a valid payment form" do
-      html_snippet = <<-HTML
-        <form action="#{CGI.escapeHTML(Adyen::Form.url)}" method="post">#{Adyen::Form.hidden_fields(@attributes)}</form>
-      HTML
-      
-      html_snippet.should have_adyen_payment_form
+    it { should have_adyen_payment_form }
+    it { should include('<input type="hidden" name="merchantAccount" value="TestMerchant" />') }
+
+    context "width default_form_params" do
+      before(:each) do
+        Adyen.configuration.register_form_skin(:testing, '4aD37dJA', 'Kah942*$7sdp0)', {
+          :merchant_account => 'OtherMerchant',
+        })
+      end
+
+      it { should include('<input type="hidden" name="merchantAccount" value="OtherMerchant" />') }
+      it { should_not include('<input type="hidden" name="merchantAccount" value="TestMerchant" />') }
     end
   end
 
@@ -140,7 +170,16 @@ describe Adyen::Form do
 
       @parameters = { :currency_code => 'GBP', :payment_amount => 10000,
         :ship_before_date => '2007-10-20', :merchant_reference => 'Internet Order 12345',
-        :skin => :testing, :session_validity => '2007-10-11T11:00:00Z' }
+        :skin => :testing, :session_validity => '2007-10-11T11:00:00Z',
+        :billing_address => {
+           :street               => 'Alexanderplatz',
+           :house_number_or_name => '0815',
+           :city                 => 'Berlin',
+           :postal_code          => '10119',
+           :state_or_province    => 'Berlin',
+           :country              => 'Germany',
+          }
+        }
 
       Adyen::Form.do_parameter_transformations!(@parameters)
     end
@@ -148,17 +187,24 @@ describe Adyen::Form do
     it "should construct the signature base string correctly" do
       signature_string = Adyen::Form.calculate_signature_string(@parameters)
       signature_string.should == "10000GBP2007-10-20Internet Order 123454aD37dJATestMerchant2007-10-11T11:00:00Z"
-      
+
       signature_string = Adyen::Form.calculate_signature_string(@parameters.merge(:merchant_return_data => 'testing123'))
       signature_string.should == "10000GBP2007-10-20Internet Order 123454aD37dJATestMerchant2007-10-11T11:00:00Ztesting123"
-      
+
     end
-    
+
     it "should calculate the signature correctly" do
       signature = Adyen::Form.calculate_signature(@parameters)
       signature.should == 'x58ZcRVL1H6y+XSeBGrySJ9ACVo='
     end
 
+    it "should raise ArgumentError on empty shared_secret" do
+      expect do
+        @parameters.delete(:shared_secret)
+        signature = Adyen::Form.calculate_signature(@parameters)
+      end.to raise_error ArgumentError
+    end
+
     it "should calculate the signature base string correctly for a recurring payment" do
       # Add the required recurrent payment attributes
       @parameters.merge!(:recurring_contract => 'DEFAULT', :shopper_reference => 'grasshopper52', :shopper_email => 'gras.shopper@somewhere.org')
@@ -174,5 +220,44 @@ describe Adyen::Form do
       signature = Adyen::Form.calculate_signature(@parameters)
       signature.should == 'F2BQEYbE+EUhiRGuPtcD16Gm7JY='
     end
+
+    context 'billing address' do
+
+      it "should construct the signature base string correctly" do
+        signature_string = Adyen::Form.calculate_billing_address_signature_string(@parameters[:billing_address])
+        signature_string.should == "Alexanderplatz0815Berlin10119BerlinGermany"
+      end
+
+      it "should calculate the signature correctly" do
+        signature = Adyen::Form.calculate_billing_address_signature(@parameters)
+        signature.should == '5KQb7VJq4cz75cqp11JDajntCY4='
+      end
+
+      it "should raise ArgumentError on empty shared_secret" do
+        expect do
+          @parameters.delete(:shared_secret)
+          signature = Adyen::Form.calculate_billing_address_signature(@parameters)
+        end.to raise_error ArgumentError
+      end
+    end
+
+  end
+
+  describe "flatten" do
+   let(:parameters) do
+      {
+        :billing_address => { :street => 'My Street'}
+      }
+    end
+
+    it "returns empty hash for nil input" do
+      Adyen::Form.flatten(nil).should == {}
+    end
+
+    it "flattens hash and prefixes keys" do
+      Adyen::Form.flatten(parameters).should == {
+        'billingAddress.street' =>  'My Street'
+      }
+    end
   end
-end
+end

metadata

@@ -1,14 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: adyen
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 3
-  - 1
-  version: 1.3.1
+version: !ruby/object:Gem::Version
+  version: 1.3.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Willem van Bergen
 - Michel Barbosa
 - Stefan Borsje
@@ -16,72 +12,67 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-20 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: &70260598824500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70260598824500
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70260598798280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        version: "2"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+  version_requirements: *70260598798280
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &70260598790820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70260598790820
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70260598661900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        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"
-email: 
+  prerelease: false
+  version_requirements: *70260598661900
+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/specs for your code.\n"
+email:
 - willem@vanbergen.org
 - cicaboo@gmail.com
 - mail@sborsje.nl
 - eloy.de.enige@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .gitignore
 - .kick
 - .travis.yml
@@ -125,42 +116,38 @@ files:
 - spec/spec_helper.rb
 - tasks/github-gem.rake
 - yard_extensions.rb
-has_rdoc: true
 homepage: http://github.com/wvanbergen/adyen/wiki
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - adyen
 - --main
 - README.rdoc
 - --line-numbers
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - Having Nokogiri installed will speed up XML handling when using the SOAP API.
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Integrate Adyen payment services in your Ruby on Rails application.
-test_files: 
+test_files:
 - spec/adyen_spec.rb
 - spec/api/api_spec.rb
 - spec/api/payment_service_spec.rb