activemerchant 1.28.0 → 1.29.0

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

@@ -3,33 +3,33 @@ require 'rexml/document'
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
 
-    # To learn more about the Moneris gateway, please contact 
-    # eselectplus@moneris.com for a copy of their integration guide. For 
-    # information on remote testing, please see "Test Environment Penny Value 
-    # Response Table", and "Test Environment eFraud (AVS and CVD) Penny 
-    # Response Values", available at Moneris' {eSelect Plus Documentation 
+    # To learn more about the Moneris gateway, please contact
+    # eselectplus@moneris.com for a copy of their integration guide. For
+    # information on remote testing, please see "Test Environment Penny Value
+    # Response Table", and "Test Environment eFraud (AVS and CVD) Penny
+    # Response Values", available at Moneris' {eSelect Plus Documentation
     # Centre}[https://www3.moneris.com/connect/en/documents/index.html].
     class MonerisGateway < Gateway
       self.test_url = 'https://esqa.moneris.com/gateway2/servlet/MpgRequest'
       self.live_url = 'https://www3.moneris.com/gateway2/servlet/MpgRequest'
-      
+
       self.supported_countries = ['CA']
       self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :discover]
       self.homepage_url = 'http://www.moneris.com/'
       self.display_name = 'Moneris'
-  
+
       # login is your Store ID
       # password is your API Token
       def initialize(options = {})
         requires!(options, :login, :password)
         @options = { :crypt_type => 7 }.update(options)
-        super      
-      end      
-    
-      # Referred to as "PreAuth" in the Moneris integration guide, this action 
-      # verifies and locks funds on a customer's card, which then must be 
+        super
+      end
+
+      # Referred to as "PreAuth" in the Moneris integration guide, this action
+      # verifies and locks funds on a customer's card, which then must be
       # captured at a later date.
-      # 
+      #
       # Pass in +order_id+ and optionally a +customer+ parameter.
       def authorize(money, creditcard_or_datakey, options = {})
         requires!(options, :order_id)
@@ -42,10 +42,10 @@ module ActiveMerchant #:nodoc:
         action = (post[:data_key].blank?) ? 'preauth' : 'res_preauth_cc'
         commit(action, post)
       end
-      
+
       # This action verifies funding on a customer's card and readies them for
       # deposit in a merchant's account.
-      # 
+      #
       # Pass in <tt>order_id</tt> and optionally a <tt>customer</tt> parameter
       def purchase(money, creditcard_or_datakey, options = {})
         requires!(options, :order_id)
@@ -59,9 +59,9 @@ module ActiveMerchant #:nodoc:
         commit(action, post)
       end
 
-      # This method retrieves locked funds from a customer's account (from a 
+      # This method retrieves locked funds from a customer's account (from a
       # PreAuth) and prepares them for deposit in a merchant's account.
-      # 
+      #
       # Note: Moneris requires both the order_id and the transaction number of
       # the original authorization.  To maintain the same interface as the other
       # gateways the two numbers are concatenated together with a ; separator as
@@ -70,27 +70,27 @@ module ActiveMerchant #:nodoc:
         commit 'completion', crediting_params(authorization, :comp_amount => amount(money))
       end
 
-      # Voiding requires the original transaction ID and order ID of some open 
-      # transaction. Closed transactions must be refunded. Note that the only 
+      # Voiding requires the original transaction ID and order ID of some open
+      # transaction. Closed transactions must be refunded. Note that the only
       # methods which may be voided are +capture+ and +purchase+.
-      # 
-      # Concatenate your transaction number and order_id by using a semicolon 
-      # (';'). This is to keep the Moneris interface consistent with other 
+      #
+      # Concatenate your transaction number and order_id by using a semicolon
+      # (';'). This is to keep the Moneris interface consistent with other
       # gateways. (See +capture+ for details.)
       def void(authorization, options = {})
         commit 'purchasecorrection', crediting_params(authorization)
       end
-      
-      # Performs a refund. This method requires that the original transaction 
-      # number and order number be included. Concatenate your transaction 
-      # number and order_id by using a semicolon (';'). This is to keep the 
-      # Moneris interface consistent with other gateways. (See +capture+ for 
+
+      # Performs a refund. This method requires that the original transaction
+      # number and order number be included. Concatenate your transaction
+      # number and order_id by using a semicolon (';'). This is to keep the
+      # Moneris interface consistent with other gateways. (See +capture+ for
       # details.)
       def credit(money, authorization, options = {})
         deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, authorization, options)
       end
-   
+
       def refund(money, authorization, options = {})
         commit 'refund', crediting_params(authorization, :amount => amount(money))
       end
@@ -118,12 +118,8 @@ module ActiveMerchant #:nodoc:
         commit('res_update_cc', post)
       end
 
-      def test?
-        @options[:test] || super
-      end
+      private # :nodoc: all
 
-    private # :nodoc: all
-    
       def expdate(creditcard)
         sprintf("%.4i", creditcard.year)[-2..-1] + sprintf("%.2i", creditcard.month)
       end
@@ -136,26 +132,26 @@ module ActiveMerchant #:nodoc:
           post[:expdate]    = expdate(source)
         end
       end
-      
+
       # Common params used amongst the +credit+, +void+ and +capture+ methods
       def crediting_params(authorization, options = {})
         {
-          :txn_number => split_authorization(authorization).first, 
-          :order_id   => split_authorization(authorization).last, 
+          :txn_number => split_authorization(authorization).first,
+          :order_id   => split_authorization(authorization).last,
           :crypt_type => options[:crypt_type] || @options[:crypt_type]
         }.merge(options)
       end
-      
-      # Splits an +authorization+ param and retrives the order id and 
+
+      # Splits an +authorization+ param and retrives the order id and
       # transaction number in that order.
       def split_authorization(authorization)
         if authorization.nil? || authorization.empty? || authorization !~ /;/
-          raise ArgumentError, 'You must include a valid authorization code (e.g. "1234;567")' 
+          raise ArgumentError, 'You must include a valid authorization code (e.g. "1234;567")'
         else
           authorization.split(';')
         end
       end
-  
+
       def commit(action, parameters = {})
         response = parse(ssl_post(test? ? self.test_url : self.live_url, post_data(action, parameters)))
 
@@ -164,27 +160,27 @@ module ActiveMerchant #:nodoc:
           :authorization => authorization_from(response)
         )
       end
-      
+
       # Generates a Moneris authorization string of the form 'trans_id;receipt_id'.
       def authorization_from(response = {})
         if response[:trans_id] && response[:receipt_id]
           "#{response[:trans_id]};#{response[:receipt_id]}"
         end
       end
-      
+
       # Tests for a successful response from Moneris' servers
       def successful?(response)
-        response[:response_code] && 
-        response[:complete] && 
+        response[:response_code] &&
+        response[:complete] &&
         (0..49).include?(response[:response_code].to_i)
       end
-                                               
+
       def parse(xml)
         response = { :message => "Global Error Receipt", :complete => false }
         hashify_xml!(xml, response)
         response
       end
-      
+
       def hashify_xml!(xml, response)
         xml = REXML::Document.new(xml)
         return if xml.root.nil?
@@ -204,10 +200,10 @@ module ActiveMerchant #:nodoc:
         actions[action].each do |key|
           transaction.add_element(key.to_s).text = parameters[key] unless parameters[key].blank?
         end
-        
+
         xml.to_s
       end
-    
+
       def message_from(message)
         return 'Unspecified error' if message.blank?
         message.gsub(/[^\w]/, ' ').split.join(" ").capitalize
@@ -220,9 +216,9 @@ module ActiveMerchant #:nodoc:
           when "false"    then false
           when '', "null" then nil
           else field
-        end        
+        end
       end
-      
+
       def actions
         {
           "purchase"           => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],

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

@@ -3,49 +3,49 @@ require 'rexml/document'
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
 
-    # To learn more about the Moneris (US) gateway, please contact 
-    # ussales@moneris.com for a copy of their integration guide. For 
-    # information on remote testing, please see "Test Environment Penny Value 
-    # Response Table", and "Test Environment eFraud (AVS and CVD) Penny 
-    # Response Values", available at Moneris' {eSelect Plus Documentation 
+    # To learn more about the Moneris (US) gateway, please contact
+    # ussales@moneris.com for a copy of their integration guide. For
+    # information on remote testing, please see "Test Environment Penny Value
+    # Response Table", and "Test Environment eFraud (AVS and CVD) Penny
+    # Response Values", available at Moneris' {eSelect Plus Documentation
     # Centre}[https://www3.moneris.com/connect/en/documents/index.html].
     class MonerisUsGateway < Gateway
       self.test_url = 'https://esplusqa.moneris.com/gateway_us/servlet/MpgRequest'
       self.live_url = 'https://esplus.moneris.com/gateway_us/servlet/MpgRequest'
-      
+
       self.supported_countries = ['US']
       self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :discover]
       self.homepage_url = 'http://www.monerisusa.com/'
       self.display_name = 'Moneris (US)'
-  
+
       # login is your Store ID
       # password is your API Token
       def initialize(options = {})
         requires!(options, :login, :password)
         @options = { :crypt_type => 7 }.update(options)
-        super      
-      end      
-    
-      # Referred to as "PreAuth" in the Moneris integration guide, this action 
-      # verifies and locks funds on a customer's card, which then must be 
+        super
+      end
+
+      # Referred to as "PreAuth" in the Moneris integration guide, this action
+      # verifies and locks funds on a customer's card, which then must be
       # captured at a later date.
-      # 
+      #
       # Pass in +order_id+ and optionally a +customer+ parameter.
       def authorize(money, creditcard, options = {})
-        debit_commit 'us_preauth', money, creditcard, options        
+        debit_commit 'us_preauth', money, creditcard, options
       end
-      
-      # This action verifies funding on a customer's card, and readies them for 
+
+      # This action verifies funding on a customer's card, and readies them for
       # deposit in a merchant's account.
-      # 
+      #
       # Pass in <tt>order_id</tt> and optionally a <tt>customer</tt> parameter
       def purchase(money, creditcard, options = {})
         debit_commit 'us_purchase', money, creditcard, options
       end
-     
-      # This method retrieves locked funds from a customer's account (from a 
+
+      # This method retrieves locked funds from a customer's account (from a
       # PreAuth) and prepares them for deposit in a merchant's account.
-      # 
+      #
       # Note: Moneris requires both the order_id and the transaction number of
       # the original authorization.  To maintain the same interface as the other
       # gateways the two numbers are concatenated together with a ; separator as
@@ -54,45 +54,42 @@ module ActiveMerchant #:nodoc:
         commit 'us_completion', crediting_params(authorization, :comp_amount => amount(money))
       end
 
-      # Voiding requires the original transaction ID and order ID of some open 
-      # transaction. Closed transactions must be refunded. Note that the only 
+      # Voiding requires the original transaction ID and order ID of some open
+      # transaction. Closed transactions must be refunded. Note that the only
       # methods which may be voided are +capture+ and +purchase+.
-      # 
-      # Concatenate your transaction number and order_id by using a semicolon 
-      # (';'). This is to keep the Moneris interface consistent with other 
+      #
+      # Concatenate your transaction number and order_id by using a semicolon
+      # (';'). This is to keep the Moneris interface consistent with other
       # gateways. (See +capture+ for details.)
       def void(authorization, options = {})
         commit 'us_purchasecorrection', crediting_params(authorization)
       end
-      
-      # Performs a refund. This method requires that the original transaction 
-      # number and order number be included. Concatenate your transaction 
-      # number and order_id by using a semicolon (';'). This is to keep the 
-      # Moneris interface consistent with other gateways. (See +capture+ for 
+
+      # Performs a refund. This method requires that the original transaction
+      # number and order number be included. Concatenate your transaction
+      # number and order_id by using a semicolon (';'). This is to keep the
+      # Moneris interface consistent with other gateways. (See +capture+ for
       # details.)
       def credit(money, authorization, options = {})
         deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, authorization, options)
       end
-   
+
       def refund(money, authorization, options = {})
         commit 'us_refund', crediting_params(authorization, :amount => amount(money))
       end
 
-      def test?
-        @options[:test] || super
-      end
-    private # :nodoc: all
-    
+      private # :nodoc: all
+
       def expdate(creditcard)
         sprintf("%.4i", creditcard.year)[-2..-1] + sprintf("%.2i", creditcard.month)
       end
-      
+
       def debit_commit(commit_type, money, creditcard, options)
         requires!(options, :order_id)
         commit(commit_type, debit_params(money, creditcard, options))
       end
-      
+
       # Common params used amongst the +purchase+ and +authorization+ methods
       def debit_params(money, creditcard, options = {})
         {
@@ -104,26 +101,26 @@ module ActiveMerchant #:nodoc:
           :crypt_type => options[:crypt_type] || @options[:crypt_type]
         }
       end
-      
+
       # Common params used amongst the +credit+, +void+ and +capture+ methods
       def crediting_params(authorization, options = {})
         {
-          :txn_number => split_authorization(authorization).first, 
-          :order_id   => split_authorization(authorization).last, 
+          :txn_number => split_authorization(authorization).first,
+          :order_id   => split_authorization(authorization).last,
           :crypt_type => options[:crypt_type] || @options[:crypt_type]
         }.merge(options)
       end
-      
-      # Splits an +authorization+ param and retrives the order id and 
+
+      # Splits an +authorization+ param and retrives the order id and
       # transaction number in that order.
       def split_authorization(authorization)
         if authorization.nil? || authorization.empty? || authorization !~ /;/
-          raise ArgumentError, 'You must include a valid authorization code (e.g. "1234;567")' 
+          raise ArgumentError, 'You must include a valid authorization code (e.g. "1234;567")'
         else
           authorization.split(';')
         end
       end
-  
+
       def commit(action, parameters = {})
         response = parse(ssl_post(test? ? self.test_url : self.live_url, post_data(action, parameters)))
 
@@ -132,27 +129,27 @@ module ActiveMerchant #:nodoc:
           :authorization => authorization_from(response)
         )
       end
-      
+
       # Generates a Moneris authorization string of the form 'trans_id;receipt_id'.
       def authorization_from(response = {})
         if response[:trans_id] && response[:receipt_id]
           "#{response[:trans_id]};#{response[:receipt_id]}"
         end
       end
-      
+
       # Tests for a successful response from Moneris' servers
       def successful?(response)
-        response[:response_code] && 
-        response[:complete] && 
+        response[:response_code] &&
+        response[:complete] &&
         (0..49).include?(response[:response_code].to_i)
       end
-                                               
+
       def parse(xml)
         response = { :message => "Global Error Receipt", :complete => false }
         hashify_xml!(xml, response)
         response
       end
-      
+
       def hashify_xml!(xml, response)
         xml = REXML::Document.new(xml)
         return if xml.root.nil?
@@ -172,10 +169,10 @@ module ActiveMerchant #:nodoc:
         actions[action].each do |key|
           transaction.add_element(key.to_s).text = parameters[key] unless parameters[key].blank?
         end
-        
+
         xml.to_s
       end
-    
+
       def message_from(message)
         return 'Unspecified error' if message.blank?
         message.gsub(/[^\w]/, ' ').split.join(" ").capitalize
@@ -188,9 +185,9 @@ module ActiveMerchant #:nodoc:
           when "false"    then false
           when '', "null" then nil
           else field
-        end        
+        end
       end
-      
+
       def actions
         {
           "us_purchase"           => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],

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

@@ -52,14 +52,9 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
 
-      def test?
-        @options[:test] || super
-      end
-
       def purchase(money, credit_card_or_stored_id, options = {})
         if credit_card_or_stored_id.respond_to?(:number)
           #Credit card for instant payment