active_merchant_ideal 0.1.4 → 0.1.5

data/README.textile

@@ -90,7 +90,7 @@ h3. First configure the gateway
 Put the following code in, for instance, an initializer:
 
 <pre>
-IdealGateway.live_url = 'https://ideal.secure-ing.com:443/ideal/iDeal'
+IdealGateway.acquirer = :ing # Other banks preloaded are :abnamro and :rabobank
 IdealGateway.merchant_id = '00123456789'
 IdealGateway.passphrase = 'the_private_key_passphrase'
 
@@ -181,7 +181,7 @@ In 2007 this code was refactored as a patch for the ActiveMerchant library, this
 
 In 2009 Fingertips forked the ActiveMerchant library and added an iDEAL gateway (presumable based on the first ActiveMerchant patch) to a new ideal branch. 
 
-In 2010 this code was extracted and converted into a separate gem, so it can be more easily used in combination with the latest version of ActiveMerchant. This library is just an extraction, nothing more and nothing less. There are no fundamental changes between the code from the ideal branch and the code of this gem.
+In 2010 this code was extracted and converted into a separate gem, so it can be more easily used in combination with the latest version of ActiveMerchant. This library is just an extraction, nothing more and nothing less. There are no fundamental changes between the code from the ideal branch and the code of this gem. Later that year "Sernin van de Krol":http://github/companeidos added support for ABN AMRO.
 
 h2. Maintainer
 

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/active_merchant_ideal.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_merchant_ideal}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Soemirno Kartosoewito, Matthijs Kadijk, Aloy Duran, Frank Oxener"]
-  s.date = %q{2010-05-20}
+  s.date = %q{2010-12-02}
   s.description = %q{iDEAL payment gateway for ActiveMerchant (see http://www.ideal.nl and http://www.activemerchant.org/)}
   s.email = %q{frank.oxener@gmail.com}
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "active_merchant_ideal.gemspec",
      "init.rb",
      "lib/active_merchant_ideal.rb",
+     "lib/active_merchant_ideal/acquirers.yml",
      "lib/active_merchant_ideal/ideal.rb",
      "lib/active_merchant_ideal/ideal_response.rb",
      "test/fixtures.yml",

data/lib/active_merchant_ideal/acquirers.yml

@@ -0,0 +1,18 @@
+ing:
+  live: https://ideal.secure-ing.com/ideal/iDeal
+  test: https://idealtest.secure-ing.com/ideal/iDeal
+
+rabobank:
+  live: https://ideal.rabobank.nl/ideal/iDeal
+  test: https://idealtest.rabobank.nl/ideal/iDeal
+
+abnamro:
+  live:
+    directory: https://idealm.abnamro.nl/nl/issuerInformation/getIssuerInformation.xml
+    transaction: https://idealm.abnamro.nl/nl/acquirerTrxRegistration/getAcquirerTrxRegistration.xml
+    status: https://idealm.abnamro.nl/nl/acquirerStatusInquiry/getAcquirerStatusInquiry.xml
+
+  test:
+    directory: https://itt.idealdesk.com/ITTEmulatorAcquirer/Directory.aspx
+    transaction: https://itt.idealdesk.com/ITTEmulatorAcquirer/Transaction.aspx
+    status: https://itt.idealdesk.com/ITTEmulatorAcquirer/Status.aspx

data/lib/active_merchant_ideal/ideal.rb

@@ -20,12 +20,20 @@ module ActiveMerchant #:nodoc:
       API_VERSION = '1.1.0'
       XML_NAMESPACE = 'http://www.idealdesk.com/Message'
 
+      def self.acquirers
+        config_file = File.dirname(__FILE__) + '/acquirers.yml'
+        File.exists?(config_file) ? YAML.load(File.read(config_file)) : {}
+      end
+
       # Assigns the global iDEAL merchant id. Make sure to use a string with
       # leading zeroes if needed.
       cattr_accessor :merchant_id
 
       # Assigns the passphrase that should be used for the merchant private_key.
       cattr_accessor :passphrase
+      
+      # Defines the whitespace behaviour, this is different for ABN AMRO. Possible values: :abn, :normal
+      cattr_accessor :whitespace_behaviour
 
       # Loads the global merchant private_key from disk.
       def self.private_key_file=(pkey_file)
@@ -63,25 +71,39 @@ module ActiveMerchant #:nodoc:
       def self.ideal_certificate_file=(certificate_file)
         self.ideal_certificate = File.read(certificate_file)
       end
-      
+
       # Instantiates and assings a OpenSSL::X509::Certificate instance with the
       # provided iDEAL certificate data.
       def self.ideal_certificate=(certificate_data)
         @ideal_certificate = OpenSSL::X509::Certificate.new(certificate_data)
       end
-      
+
       # Returns the global merchant ideal_certificate.
       def self.ideal_certificate
         @ideal_certificate
       end
 
       # Assign the test and production urls for your iDeal acquirer.
-      #
-      # For instance, for ING:
-      #
-      #   ActiveMerchant::Billing::IdealGateway.test_url = "https://idealtest.secure-ing.com:443/ideal/iDeal"
-      #   ActiveMerchant::Billing::IdealGateway.live_url = "https://ideal.secure-ing.com:443/ideal/iDeal"
-      cattr_accessor :test_url, :live_url
+      # For ABN AMRO only assign the three separate directory, transaction and status urls.
+      cattr_accessor :live_url,             :test_url
+      cattr_accessor :live_directory_url,   :test_directory_url
+      cattr_accessor :live_transaction_url, :test_transaction_url
+      cattr_accessor :live_status_url,      :test_status_url
+
+      # Set the correct acquirer url based on the specific Bank
+      # Currently supported arguments: :ing, :rabobank, :abnamro
+      def self.acquirer=(acquirer)
+        acquirer = acquirer.to_s
+        if self.acquirers.include?(acquirer)
+          if self.acquirers[acquirer]['live'].is_a?(Hash) #Assume acquirer is abnamro
+            self.acquirers[acquirer].each{|env, url| url.each{|sort,value| self.send("#{env}_#{sort}_url=",value)}}
+            self.whitespace_behaviour = :abnamro
+          else
+            self.live_url = self.acquirers[acquirer]['live']
+            self.test_url = self.acquirers[acquirer]['test']
+          end
+        end
+      end
 
       # Returns the merchant `subID' being used for this IdealGateway instance.
       # Defaults to 0.
@@ -99,8 +121,8 @@ module ActiveMerchant #:nodoc:
       #
       # When #test? returns +true+ the IdealGateway.test_url is used, otherwise
       # the IdealGateway.live_url is used.
-      def acquirer_url
-        test? ? self.class.test_url : self.class.live_url
+      def acquirer_url(request_type)
+        self.class.send("#{test_or_live}#{sort_request(request_type)}_url")
       end
 
       # Sends a directory request to the acquirer and returns an
@@ -109,7 +131,7 @@ module ActiveMerchant #:nodoc:
       #
       #   gateway.issuers.list # => [{ :id => '1006', :name => 'ABN AMRO Bank' }, …]
       def issuers
-        post_data build_directory_request_body, IdealDirectoryResponse
+        post_data acquirer_url(:directory), build_directory_request_body, IdealDirectoryResponse
       end
 
       # Starts a purchase by sending an acquirer transaction request for the
@@ -157,7 +179,7 @@ module ActiveMerchant #:nodoc:
       #
       # See the IdealGateway class description for a more elaborate example.
       def setup_purchase(money, options)
-        post_data build_transaction_request_body(money, options), IdealTransactionResponse
+        post_data acquirer_url(:transaction), build_transaction_request_body(money, options), IdealTransactionResponse
       end
 
       # Sends a acquirer status request for the specified +transaction_id+ and
@@ -177,13 +199,27 @@ module ActiveMerchant #:nodoc:
       #
       # See the IdealGateway class description for a more elaborate example.
       def capture(transaction_id)
-        post_data build_status_request_body(:transaction_id => transaction_id), IdealStatusResponse
+        post_data acquirer_url(:status), build_status_request_body(:transaction_id => transaction_id), IdealStatusResponse
       end
 
       private
 
-      def post_data(data, response_klass)
-        response_klass.new(ssl_post(acquirer_url, data), :test => test?)
+      def abnamro?
+        self.class.whitespace_behaviour == :abnamro
+      end
+
+      # Set correct mode for acquirer_url
+      def test_or_live
+        test? ? 'test' : 'live'
+      end
+
+      # Determine type of request used by ABN AMRO
+      def sort_request(request_type)
+        request_type && abnamro? ? "_#{request_type.to_s}" : nil
+      end
+
+      def post_data(gateway_url, data, response_klass)
+        response_klass.new(ssl_post(gateway_url, data), :test => test?)
       end
 
       # This is the list of charaters that are not supported by iDEAL according
@@ -205,10 +241,14 @@ module ActiveMerchant #:nodoc:
         Digest::SHA1.hexdigest(self.class.private_certificate.to_der).upcase
       end
 
+      def strip_whitespace(str)
+        abnamro? ? str.gsub(/(\f|\n|\r|\t|\v)/m, '') : str.gsub(/\s/m,'')
+      end
+
       # Creates a +tokenCode+ from the specified +message+.
       def token_code(message)
-        signature = self.class.private_key.sign(OpenSSL::Digest::SHA1.new, message.gsub(/\s/m, ''))
-        Base64.encode64(signature).gsub(/\s/m, '')
+        signature = self.class.private_key.sign(OpenSSL::Digest::SHA1.new, strip_whitespace(message))
+        strip_whitespace(Base64.encode64(signature))
       end
 
       # Returns a string containing the current UTC time, formatted as per the

data/test/fixtures.yml

@@ -1,7 +1,7 @@
 # You can also paste the contents of the key and certificates here,
 # if you want to do so remove the “_file” part of the keys.
 ideal_ing_postbank:
-  test_url: https://idealtest.secure-ing.com:443/ideal/iDeal
+  acquirer: ing
   merchant_id: ID
   passphrase: PRIVATE KEY PASSPHRASE
   private_key_file: |--

data/test/test_active_merchant_ideal.rb

@@ -10,9 +10,7 @@ module IdealTestCases
       self.private_key = PRIVATE_KEY
       self.private_certificate = PRIVATE_CERTIFICATE
       self.ideal_certificate = IDEAL_CERTIFICATE
-
-      self.test_url = "https://idealtest.example.com:443/ideal/iDeal"
-      self.live_url = "https://ideal.example.com:443/ideal/iDeal"
+      self.acquirer = :ing
     end
   end
 
@@ -25,16 +23,34 @@ module IdealTestCases
     :entrance_code     => '1234'
   }
 
-  ###
-  #
-  # Actual test cases
-  #
-
   class ClassMethodsTest < Test::Unit::TestCase
     def test_merchant_id
       assert_equal IdealGateway.merchant_id, '123456789'
     end
 
+    def test_verify_live_url_for_ing
+      ActiveMerchant::Billing::IdealGateway.acquirer = :ing
+      assert_equal 'https://ideal.secure-ing.com/ideal/iDeal', IdealGateway.live_url
+    end
+
+    def test_verify_live_url_for_rabobank
+      ActiveMerchant::Billing::IdealGateway.acquirer = :rabobank
+      assert_equal 'https://ideal.rabobank.nl/ideal/iDeal', IdealGateway.live_url
+    end
+
+    def test_verify_live_urls_for_abnamro
+      ActiveMerchant::Billing::IdealGateway.acquirer = :abnamro
+      assert_equal 'https://idealm.abnamro.nl/nl/issuerInformation/getIssuerInformation.xml', IdealGateway.live_directory_url
+      assert_equal 'https://idealm.abnamro.nl/nl/acquirerTrxRegistration/getAcquirerTrxRegistration.xml', IdealGateway.live_transaction_url
+      assert_equal 'https://idealm.abnamro.nl/nl/acquirerStatusInquiry/getAcquirerStatusInquiry.xml', IdealGateway.live_status_url
+    end
+
+    def test_acquirers
+      assert_equal 'https://ideal.rabobank.nl/ideal/iDeal', IdealGateway.acquirers['rabobank']['live']
+      assert_equal 'https://ideal.secure-ing.com/ideal/iDeal', IdealGateway.acquirers['ing']['live']
+      assert_equal 'https://idealm.abnamro.nl/nl/acquirerTrxRegistration/getAcquirerTrxRegistration.xml', IdealGateway.acquirers['abnamro']['live']['transaction']
+    end
+
     def test_private_certificate_returns_a_loaded_Certificate_instance
       assert_equal IdealGateway.private_certificate.to_text,
         OpenSSL::X509::Certificate.new(PRIVATE_CERTIFICATE).to_text
@@ -63,12 +79,16 @@ module IdealTestCases
 
     def test_returns_the_test_url_when_in_the_test_env
       @gateway.stubs(:test?).returns(true)
-      assert_equal IdealGateway.test_url, @gateway.send(:acquirer_url)
+      assert_equal IdealGateway.test_directory_url,   @gateway.send(:acquirer_url,:directory)
+      assert_equal IdealGateway.test_transaction_url, @gateway.send(:acquirer_url,:transaction)
+      assert_equal IdealGateway.test_status_url,      @gateway.send(:acquirer_url,:status)
     end
 
     def test_returns_the_live_url_when_not_in_the_test_env
       @gateway.stubs(:test?).returns(false)
-      assert_equal IdealGateway.live_url, @gateway.send(:acquirer_url)
+      assert_equal IdealGateway.live_directory_url,   @gateway.send(:acquirer_url,:directory)
+      assert_equal IdealGateway.live_transaction_url, @gateway.send(:acquirer_url,:transaction)
+      assert_equal IdealGateway.live_status_url,      @gateway.send(:acquirer_url,:status)
     end
 
     def test_returns_created_at_timestamp
@@ -112,6 +132,7 @@ module IdealTestCases
     end
 
     def test_token_code_generation
+      IdealGateway.whitespace_behaviour = nil
       message = "Top\tsecret\tman.\nI could tell you, but then I'd have to kill you…"
       stripped_message = message.gsub(/\s/m, '')
 
@@ -124,15 +145,29 @@ module IdealTestCases
       assert_equal encoded_signature, @gateway.send(:token_code, message)
     end
 
+    def test_token_code_generation_on_abn_amro
+      IdealGateway.whitespace_behaviour = :abnamro
+      message = "Top\tsecret\tman.\nI could tell you, but\r then I'd have to kill you…"
+      stripped_message = message.gsub(/(\f|\n|\r|\t|\v)/m, '')
+
+      sha1 = OpenSSL::Digest::SHA1.new
+      OpenSSL::Digest::SHA1.stubs(:new).returns(sha1)
+
+      signature = IdealGateway.private_key.sign(sha1, stripped_message)
+      encoded_signature = Base64.encode64(signature).strip.gsub(/\n/, '')
+
+      assert_equal encoded_signature, @gateway.send(:token_code, message)
+    end
+
     def test_posts_data_with_ssl_to_acquirer_url_and_return_the_correct_response
       IdealResponse.expects(:new).with('response', :test => true)
-      @gateway.expects(:ssl_post).with(@gateway.acquirer_url, 'data').returns('response')
-      @gateway.send(:post_data, 'data', IdealResponse)
+      @gateway.expects(:ssl_post).with(@gateway.acquirer_url(:directory), 'data').returns('response')
+      @gateway.send(:post_data, @gateway.acquirer_url(:directory), 'data', IdealResponse)
 
       @gateway.stubs(:test?).returns(false)
       IdealResponse.expects(:new).with('response', :test => false)
-      @gateway.expects(:ssl_post).with(@gateway.acquirer_url, 'data').returns('response')
-      @gateway.send(:post_data, 'data', IdealResponse)
+      @gateway.expects(:ssl_post).with(@gateway.acquirer_url(:directory), 'data').returns('response')
+      @gateway.send(:post_data, @gateway.acquirer_url(:directory), 'data', IdealResponse)
     end
   end
 
@@ -387,7 +422,7 @@ module IdealTestCases
 
     def test_returns_a_list_with_only_one_issuer
       @gateway.stubs(:build_directory_request_body).returns('the request body')
-      @gateway.expects(:ssl_post).with(@gateway.acquirer_url, 'the request body').returns(DIRECTORY_RESPONSE_WITH_ONE_ISSUER)
+      @gateway.expects(:ssl_post).with(@gateway.acquirer_url(:directory), 'the request body').returns(DIRECTORY_RESPONSE_WITH_ONE_ISSUER)
 
       expected_issuers = [{ :id => '1006', :name => 'ABN AMRO Bank' }]
 
@@ -398,7 +433,7 @@ module IdealTestCases
 
     def test_returns_list_of_issuers_from_response
       @gateway.stubs(:build_directory_request_body).returns('the request body')
-      @gateway.expects(:ssl_post).with(@gateway.acquirer_url, 'the request body').returns(DIRECTORY_RESPONSE_WITH_MULTIPLE_ISSUERS)
+      @gateway.expects(:ssl_post).with(@gateway.acquirer_url(:directory), 'the request body').returns(DIRECTORY_RESPONSE_WITH_MULTIPLE_ISSUERS)
 
       expected_issuers = [
         { :id => '1006', :name => 'ABN AMRO Bank' },
@@ -419,7 +454,7 @@ module IdealTestCases
       @gateway = IdealGateway.new
 
       @gateway.stubs(:build_transaction_request_body).with(4321, VALID_PURCHASE_OPTIONS).returns('the request body')
-      @gateway.expects(:ssl_post).with(@gateway.acquirer_url, 'the request body').returns(ACQUIRER_TRANSACTION_RESPONSE)
+      @gateway.expects(:ssl_post).with(@gateway.acquirer_url(:transaction), 'the request body').returns(ACQUIRER_TRANSACTION_RESPONSE)
 
       @setup_purchase_response = @gateway.setup_purchase(4321, VALID_PURCHASE_OPTIONS)
     end
@@ -494,7 +529,7 @@ module IdealTestCases
     private
 
     def expects_request_and_returns(str)
-      @gateway.expects(:ssl_post).with(@gateway.acquirer_url, 'the request body').returns(str)
+      @gateway.expects(:ssl_post).with(@gateway.acquirer_url(:status), 'the request body').returns(str)
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Soemirno Kartosoewito, Matthijs Kadijk, Aloy Duran, Frank Oxener
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-20 00:00:00 +02:00
+date: 2010-12-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,7 @@ files:
 - active_merchant_ideal.gemspec
 - init.rb
 - lib/active_merchant_ideal.rb
+- lib/active_merchant_ideal/acquirers.yml
 - lib/active_merchant_ideal/ideal.rb
 - lib/active_merchant_ideal/ideal_response.rb
 - test/fixtures.yml