activemerchant 1.28.0 → 1.29.0

data/lib/active_merchant/billing/gateways/net_registry.rb

@@ -23,11 +23,11 @@ module ActiveMerchant
     # (response.params['receipt']) if a receipt was issued by the gateway.
     class NetRegistryGateway < Gateway
       self.live_url = self.test_url = 'https://4tknox.au.com/cgi-bin/themerchant.au.com/ecom/external2.pl'
-      
+
       FILTERED_PARAMS = [ 'card_no', 'card_expiry', 'receipt_array' ]
-      
+
       self.supported_countries = ['AU']
-      
+
       # Note that support for Diners, Amex, and JCB require extra
       # steps in setting up your account, as detailed in
       # "Programming for NetRegistry's E-commerce Gateway."
@@ -35,7 +35,7 @@ module ActiveMerchant
       self.supported_cardtypes = [:visa, :master, :diners_club, :american_express, :jcb]
       self.display_name = 'NetRegistry'
       self.homepage_url = 'http://www.netregistry.com.au'
-      
+
       TRANSACTIONS = {
         :authorization => 'preauth',
         :purchase => 'purchase',
@@ -43,13 +43,12 @@ module ActiveMerchant
         :status => 'status',
         :credit => 'refund'
       }
-      
+
       # Create a new NetRegistry gateway.
       #
       # Options :login and :password must be given.
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
 
@@ -103,7 +102,7 @@ module ActiveMerchant
         add_request_details(params, options)
         commit(:credit, params)
       end
-      
+
       # Specific to NetRegistry.
       #
       # Run a 'status' command.  This lets you view the status of a
@@ -113,7 +112,7 @@ module ActiveMerchant
         params = {
           'TXNREF'  => identification
         }
-        
+
         commit(:status, params)
       end
 
@@ -121,7 +120,7 @@ module ActiveMerchant
       def add_request_details(params, options)
         params['COMMENT'] = options[:description] unless options[:description].blank?
       end
-      
+
       # Return the expiry for the given creditcard in the required
       # format for a command.
       def expiry(credit_card)
@@ -138,44 +137,44 @@ module ActiveMerchant
       def commit(action, params)
         # get gateway response
         response = parse( ssl_post(self.live_url, post_data(action, params)) )
-        
-        Response.new(response['status'] == 'approved', message_from(response), response,          
+
+        Response.new(response['status'] == 'approved', message_from(response), response,
           :authorization => authorization_from(response, action)
         )
       end
-      
+
       def post_data(action, params)
         params['COMMAND'] = TRANSACTIONS[action]
         params['LOGIN'] = "#{@options[:login]}/#{@options[:password]}"
         URI.encode(params.map{|k,v| "#{k}=#{v}"}.join('&'))
       end
-      
+
       def parse(response)
         params = {}
-        
+
         lines = response.split("\n")
-        
+
         # Just incase there is no real response returned
         params['status'] = lines[0]
         params['response_text'] = lines[1]
-        
+
         started = false
-        lines.each do |line|          
+        lines.each do |line|
           if started
             key, val = line.chomp.split(/=/, 2)
             params[key] = val unless FILTERED_PARAMS.include?(key)
           end
-          
+
           started = line.chomp =~ /^\.$/ unless started
         end
-        
+
         params
       end
-      
+
       def message_from(response)
         response['response_text']
       end
-      
+
       def authorization_from(response, command)
         case command
         when :purchase

data/lib/active_merchant/billing/gateways/netaxept.rb

@@ -5,29 +5,28 @@ module ActiveMerchant #:nodoc:
     class NetaxeptGateway < Gateway
       self.test_url = 'https://epayment-test.bbs.no/'
       self.live_url = 'https://epayment.bbs.no/'
-      
+
       # The countries the gateway supports merchants from as 2 digit ISO country codes
       self.supported_countries = ['NO', 'DK', 'SE', 'FI']
-      
+
       # The card types supported by the payment gateway
       self.supported_cardtypes = [:visa, :master, :american_express]
-      
+
       # The homepage URL of the gateway
       self.homepage_url = 'http://www.betalingsterminal.no/Netthandel-forside/'
-      
+
       # The name of the gateway
       self.display_name = 'BBS Netaxept'
-      
+
       self.money_format = :cents
-      
+
       self.default_currency = 'NOK'
-      
+
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
-      end  
-      
+      end
+
       def purchase(money, creditcard, options = {})
         requires!(options, :order_id)
 
@@ -37,7 +36,7 @@ module ActiveMerchant #:nodoc:
         add_order(post, money, options)
         add_creditcard(post, creditcard)
         commit('Sale', post)
-      end                       
+      end
 
       def authorize(money, creditcard, options = {})
         requires!(options, :order_id)
@@ -76,35 +75,30 @@ module ActiveMerchant #:nodoc:
         commit('Annul', post, false)
       end
 
-      def test?
-        @options[:test] || Base.gateway_mode == :test
-      end
-
-    
       private
-      
+
       def add_credentials(post, options)
         post[:merchantId] = @options[:login]
         post[:token] = @options[:password]
       end
-      
+
       def add_authorization(post, authorization, money=nil)
         post[:transactionId] = authorization
         post[:transactionAmount] = amount(money) if money
       end
-      
+
       def add_transaction(post, options)
         post[:transactionId] = generate_transaction_id(options)
         post[:serviceType] = 'M'
         post[:redirectUrl] = 'http://example.com'
       end
-      
+
       def add_order(post, money, options)
         post[:orderNumber] = options[:order_id]
         post[:amount] = amount(money)
         post[:currencyCode] = (options[:currency] || currency(money))
       end
-      
+
       CARD_TYPE_PREFIXES = {
         'visa' => 'v',
         'master' => 'm',
@@ -123,7 +117,7 @@ module ActiveMerchant #:nodoc:
         post[:creditcard][:"#{prefix}y"] = format(creditcard.year, :two_digits)
         post[:creditcard][:"#{prefix}c"] = creditcard.verification_value
       end
-      
+
       def commit(action, parameters, setup=true)
         parameters[:action] = action
 
@@ -138,27 +132,27 @@ module ActiveMerchant #:nodoc:
           commit_transaction(response, parameters)
           response[:success] = true
         end
-        
+
         Response.new(response[:success], response[:message], response, :test => test?, :authorization => response[:authorization])
       end
-      
+
       def commit_transaction_setup(response, parameters)
         response[:setup] = parse(ssl_get(build_url("REST/Setup.aspx", pick(parameters, :merchantId, :token, :serviceType, :amount, :currencyCode, :redirectUrl, :orderNumber, :transactionId))))
         process(response, :setup)
       end
-      
+
       def commit_payment_details(response, parameters)
         data = encode(parameters[:creditcard].merge(:BBSePay_transaction => response[:setup]['SetupString']))
         response[:paymentDetails] = parse(ssl_post(build_url("terminal/default.aspx"), data), false)
         process(response, :paymentDetails)
       end
-      
+
       def commit_process_setup(response, parameters)
         result = ssl_get(build_url("REST/ProcessSetup.aspx", pick(parameters, :merchantId, :token, :transactionId).merge(:transactionString => response[:paymentDetails][:result])))
         response[:processSetup] = parse(result)
         process(response, :processSetup)
       end
-      
+
       def commit_transaction(response, parameters)
         result = ssl_get(build_url("REST/#{parameters[:action]}.aspx", pick(parameters, :merchantId, :token, :transactionId, :transactionAmount)))
         response[:action] = parse(result)
@@ -172,11 +166,11 @@ module ActiveMerchant #:nodoc:
         else
           message = (response[step]['ResponseText'] || response[step]['ResponseCode'])
           response[:message] = (message || response[:message])
-          
+
           response[:authorization] = response[step]['TransactionId']
         end
       end
-      
+
       def parse(result, expects_xml=true)
         if expects_xml || /^</ =~ result
           doc = REXML::Document.new(result)
@@ -185,7 +179,7 @@ module ActiveMerchant #:nodoc:
           {:result => result}
         end
       end
-      
+
       def extract_xml(element)
         if element.has_elements?
           hash = {}
@@ -197,19 +191,19 @@ module ActiveMerchant #:nodoc:
           element.text
         end
       end
-      
+
       def url
         (test? ? self.test_url : self.live_url)
       end
-      
+
       def generate_transaction_id(options)
         Digest::MD5.hexdigest("#{options.inspect}+#{Time.now}+#{rand}")
       end
-      
+
       def pick(hash, *keys)
         keys.inject({}){|h,key| h[key] = hash[key] if hash[key]; h}
       end
-      
+
       def build_url(base, parameters=nil)
         url = "#{test? ? self.test_url : self.live_url}"
         url << base
@@ -219,11 +213,11 @@ module ActiveMerchant #:nodoc:
         end
         url
       end
-      
+
       def encode(hash)
         hash.collect{|(k,v)| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}"}.join('&')
       end
-      
+
       class Response < Billing::Response
         attr_reader :error_detail
         def initialize(success, message, raw, options)

data/lib/active_merchant/billing/gateways/netbilling.rb

@@ -24,7 +24,6 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :login)
-        @options = options
         super
       end
 
@@ -81,10 +80,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def test?
-        @options[:login] == TEST_LOGIN || super
+        (@options[:login] == TEST_LOGIN || super)
       end
 
       private
+
       def add_amount(post, money)
         post[:amount] = amount(money)
       end

data/lib/active_merchant/billing/gateways/ogone.rb

@@ -138,7 +138,6 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :login, :user, :password)
-        @options = options
         super
       end
 
@@ -205,10 +204,6 @@ module ActiveMerchant #:nodoc:
         response
       end
 
-      def test?
-        @options[:test] || super
-      end
-
       private
 
       def reference_from(authorization)

data/lib/active_merchant/billing/gateways/optimal_payment.rb

@@ -18,7 +18,6 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         #requires!(options, :login, :password)
-        @options = options
         super
       end
 
@@ -49,11 +48,7 @@ module ActiveMerchant #:nodoc:
         commit('ccSettlement', money, options)
       end
 
-      def test?
-        super || @options[:test]
-      end
-
-    private
+      private
 
       def parse_card_or_auth(card_or_auth, options)
         if card_or_auth.respond_to?(:number)

data/lib/active_merchant/billing/gateways/orbital.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/orbital/orbital_soft_descriptors.rb'
+require File.dirname(__FILE__) + '/orbital/orbital_soft_descriptors'
+require File.dirname(__FILE__) + '/orbital/avs_result'
 require "rexml/document"
 
 module ActiveMerchant #:nodoc:
@@ -82,7 +83,6 @@ module ActiveMerchant #:nodoc:
       def initialize(options = {})
         requires!(options, :merchant_id)
         requires!(options, :login, :password) unless options[:ip_authentication]
-        @options = options
         super
       end
 
@@ -93,7 +93,7 @@ module ActiveMerchant #:nodoc:
           add_address(xml, creditcard, options)
           add_customer_data(xml, options) if @options[:customer_profiles]
         end
-        commit(order)
+        commit(order, :authorize)
       end
 
       # AC – Authorization and Capture
@@ -103,12 +103,12 @@ module ActiveMerchant #:nodoc:
           add_address(xml, creditcard, options)
           add_customer_data(xml, options) if @options[:customer_profiles]
         end
-        commit(order)
+        commit(order, :purchase)
       end
 
       # MFC - Mark For Capture
       def capture(money, authorization, options = {})
-        commit(build_mark_for_capture_xml(money, authorization, options))
+        commit(build_mark_for_capture_xml(money, authorization, options), :capture)
       end
 
       # R – Refund request
@@ -117,7 +117,7 @@ module ActiveMerchant #:nodoc:
           add_refund(xml, options[:currency])
           xml.tag! :CustomerRefNum, options[:customer_ref_num] if @options[:customer_profiles] && options[:profile_txn]
         end
-        commit(order)
+        commit(order, :refund)
       end
 
       def credit(money, authorization, options= {})
@@ -128,7 +128,7 @@ module ActiveMerchant #:nodoc:
       # setting money to nil will perform a full void
       def void(money, authorization, options = {})
         order = build_void_request_xml(money, authorization, options)
-        commit(order)
+        commit(order, :void)
       end
 
 
@@ -156,25 +156,25 @@ module ActiveMerchant #:nodoc:
       def add_customer_profile(creditcard, options = {})
         options.merge!(:customer_profile_action => 'C')
         order = build_customer_request_xml(creditcard, options)
-        commit(order)
+        commit(order, :add_customer_profile)
       end
 
       def update_customer_profile(creditcard, options = {})
         options.merge!(:customer_profile_action => 'U')
         order = build_customer_request_xml(creditcard, options)
-        commit(order)
+        commit(order, :update_customer_profile)
       end
 
       def retrieve_customer_profile(customer_ref_num)
         options = {:customer_profile_action => 'R', :customer_ref_num => customer_ref_num}
         order = build_customer_request_xml(nil, options)
-        commit(order)
+        commit(order, :retrieve_customer_profile)
       end
 
       def delete_customer_profile(customer_ref_num)
         options = {:customer_profile_action => 'D', :customer_ref_num => customer_ref_num}
         order = build_customer_request_xml(nil, options)
-        commit(order)
+        commit(order, :delete_customer_profile)
       end
 
       private
@@ -291,33 +291,37 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def commit(order)
+      def commit(order, message_type)
         headers = POST_HEADERS.merge("Content-length" => order.size.to_s)
-        request = lambda {return parse(ssl_post(remote_url, order, headers))}
+        request = lambda{|url| parse(ssl_post(url, order, headers))}
 
-        # Failover URL will be used in the event of a connection error
-        begin response = request.call; rescue ConnectionError; retry end
+        # Failover URL will be attempted in the event of a connection error
+        response = begin
+          request.call(remote_url)
+        rescue ConnectionError
+          request.call(remote_url(:secondary))
+        end
 
-        Response.new(success?(response), message_from(response), response,
+        Response.new(success?(response, message_type), message_from(response), response,
           {
              :authorization => authorization_string(response[:tx_ref_num], response[:order_id]),
              :test => self.test?,
-             :avs_result => {:code => response[:avs_resp_code]},
+             :avs_result => OrbitalGateway::AVSResult.new(response[:avs_resp_code]),
              :cvv_result => response[:cvv2_resp_code]
           }
         )
       end
 
-      def remote_url
-        unless $!.class == ActiveMerchant::ConnectionError
+      def remote_url(url=:primary)
+        if url == :primary
           self.test? ? self.test_url : self.live_url
         else
           self.test? ? self.secondary_test_url : self.secondary_live_url
         end
       end
 
-      def success?(response)
-        if response[:message_type] == "R"
+      def success?(response, message_type)
+        if [:refund, :void].include?(message_type)
           response[:proc_status] == SUCCESS
         elsif response[:customer_profile_action]
           response[:profile_proc_status] == SUCCESS