activemerchant 1.28.0 → 1.29.0

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

@@ -60,7 +60,6 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
 
@@ -109,10 +108,6 @@ module ActiveMerchant #:nodoc:
         commit('refund', money, post)
       end
 
-      def test?
-        @options[:test] || Base.gateway_mode == :test
-      end
-
       private
 
       def add_invoice(post, options)

data/lib/active_merchant/billing/gateways/payflow/payflow_common_api.rb

@@ -3,20 +3,20 @@ module ActiveMerchant #:nodoc:
     module PayflowCommonAPI
       def self.included(base)
         base.default_currency = 'USD'
-          
+
         base.class_attribute :partner
-        
+
         # Set the default partner to PayPal
         base.partner = 'PayPal'
-        
+
         base.supported_countries = ['US', 'CA', 'SG', 'AU']
-        
+
         base.class_attribute :timeout
         base.timeout = 60
 
         base.test_url = 'https://pilot-payflowpro.paypal.com'
         base.live_url = 'https://payflowpro.paypal.com'
-        
+
         # Enable safe retry of failed connections
         # Payflow is safe to retry because retried transactions use the same
         # X-VPS-Request-ID header. If a transaction is detected as a duplicate
@@ -25,9 +25,9 @@ module ActiveMerchant #:nodoc:
         # hash.
         base.retry_safe = true
       end
-      
+
       XMLNS = 'http://www.paypal.com/XMLPay'
-      
+
       CARD_MAPPING = {
         :visa => 'Visa',
         :master => 'MasterCard',
@@ -38,45 +38,40 @@ module ActiveMerchant #:nodoc:
         :switch => 'Switch',
         :solo => 'Solo'
       }
-      
-      TRANSACTIONS = { 
+
+      TRANSACTIONS = {
         :purchase       => "Sale",
         :authorization  => "Authorization",
         :capture        => "Capture",
         :void           => "Void",
-        :credit         => "Credit" 
+        :credit         => "Credit"
       }
-      
+
       CVV_CODE = {
         'Match' => 'M',
         'No Match' => 'N',
-        'Service Not Available' => 'U', 
+        'Service Not Available' => 'U',
         'Service not Requested' => 'P'
       }
-          
+
       def initialize(options = {})
         requires!(options, :login, :password)
-        
-        @options = options
-        @options[:partner] = partner if @options[:partner].blank?
+
+        options[:partner] = partner if options[:partner].blank?
         super
-      end  
-      
-      def test?
-        @options[:test] || super
       end
-      
+
       def capture(money, authorization, options = {})
         request = build_reference_request(:capture, money, authorization, options)
         commit(request, options)
       end
-      
+
       def void(authorization, options = {})
         request = build_reference_request(:void, nil, authorization, options)
         commit(request, options)
       end
-  
-      private      
+
+      private
       def build_request(body, options = {})
         xml = Builder::XmlMarkup.new
         xml.instruct!
@@ -104,12 +99,12 @@ module ActiveMerchant #:nodoc:
         end
         xml.target!
       end
-      
+
       def build_reference_request(action, money, authorization, options)
         xml = Builder::XmlMarkup.new
         xml.tag! TRANSACTIONS[action] do
           xml.tag! 'PNRef', authorization
-        
+
           unless money.nil?
             xml.tag! 'Invoice' do
               xml.tag!('TotalAmt', amount(money), 'Currency' => options[:currency] || currency(money))
@@ -119,11 +114,11 @@ module ActiveMerchant #:nodoc:
             end
           end
         end
-        
+
         xml.target!
       end
 
-      def add_address(xml, tag, address, options)  
+      def add_address(xml, tag, address, options)
         return if address.nil?
         xml.tag! tag do
           xml.tag! 'Name', address[:name] unless address[:name].blank?
@@ -131,7 +126,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'Phone', address[:phone] unless address[:phone].blank?
           xml.tag! 'CustCode', options[:customer] if !options[:customer].blank? && tag == 'BillTo'
           xml.tag! 'PONum', options[:po_number] if !options[:po_number].blank? && tag == 'BillTo'
-          
+
           xml.tag! 'Address' do
             xml.tag! 'Street', address[:address1] unless address[:address1].blank?
             xml.tag! 'City', address[:city] unless address[:city].blank?
@@ -141,26 +136,26 @@ module ActiveMerchant #:nodoc:
           end
         end
       end
-          
+
       def parse(data)
         response = {}
         xml = REXML::Document.new(data)
         root = REXML::XPath.first(xml, "//ResponseData")
-        
+
         # REXML::XPath in Ruby 1.8.6 is now unable to match nodes based on their attributes
         tx_result = REXML::XPath.first(root, "//TransactionResult")
-        
+
         if tx_result && tx_result.attributes['Duplicate'] == "true"
-          response[:duplicate] = true 
+          response[:duplicate] = true
         end
-        
+
         root.elements.to_a.each do |node|
           parse_element(response, node)
         end
 
         response
       end
-      
+
       def parse_element(response, node)
         node_name = node.name.underscore.to_sym
         case
@@ -182,7 +177,7 @@ module ActiveMerchant #:nodoc:
           response[node_name] = node.text
         end
       end
-      
+
       def build_headers(content_length)
         {
           "Content-Type" => "text/xml",
@@ -193,11 +188,11 @@ module ActiveMerchant #:nodoc:
       	  "X-VPS-Request-ID" => Utils.generate_unique_id
     	  }
     	end
-    	
+
     	def commit(request_body, options  = {})
         request = build_request(request_body, options)
         headers = build_headers(request.size)
-        
+
     	  response = parse(ssl_post(test? ? self.test_url : self.live_url, request, headers))
 
     	  build_response(response[:result] == "0", response[:message], response,

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

@@ -2,29 +2,29 @@ require 'rexml/document'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-    
-    # In NZ DPS supports ANZ, Westpac, National Bank, ASB and BNZ. 
-    # In Australia DPS supports ANZ, NAB, Westpac, CBA, St George and Bank of South Australia. 
+
+    # In NZ DPS supports ANZ, Westpac, National Bank, ASB and BNZ.
+    # In Australia DPS supports ANZ, NAB, Westpac, CBA, St George and Bank of South Australia.
     # The Maybank in Malaysia is supported and the Citibank for Singapore.
     class PaymentExpressGateway < Gateway
       self.default_currency = 'NZD'
-      # PS supports all major credit cards; Visa, Mastercard, Amex, Diners, BankCard & JCB. 
-      # Various white label cards can be accepted as well; Farmers, AirNZCard and Elders etc. 
+      # PS supports all major credit cards; Visa, Mastercard, Amex, Diners, BankCard & JCB.
+      # Various white label cards can be accepted as well; Farmers, AirNZCard and Elders etc.
       # Please note that not all acquirers and Eftpos networks can support some of these card types.
       # VISA, Mastercard, Diners Club and Farmers cards are supported
       #
       # However, regular accounts with DPS only support VISA and Mastercard
       self.supported_cardtypes = [ :visa, :master, :american_express, :diners_club, :jcb ]
-      
+
       self.supported_countries = %w[ AU MY NZ SG ZA GB US ]
-      
+
       self.homepage_url = 'http://www.paymentexpress.com/'
       self.display_name = 'PaymentExpress'
 
       self.live_url = self.test_url = 'https://sec.paymentexpress.com/pxpost.aspx'
-      
+
       APPROVED = '1'
-      
+
       TRANSACTIONS = {
         :purchase       => 'Purchase',
         :credit         => 'Refund',
@@ -32,7 +32,7 @@ module ActiveMerchant #:nodoc:
         :capture        => 'Complete',
         :validate       => 'Validate'
       }
-      
+
       # We require the DPS gateway username and password when the object is created.
       #
       # The PaymentExpress gateway also supports a :use_custom_payment_token boolean option.
@@ -40,25 +40,22 @@ module ActiveMerchant #:nodoc:
       # then the token will be sent as the DPS specified "DpsBillingId".  This is per the documentation at
       # http://www.paymentexpress.com/technical_resources/ecommerce_nonhosted/pxpost.html#Tokenbilling
       def initialize(options = {})
-        # A DPS username and password must exist
         requires!(options, :login, :password)
-        # Make the options an instance variable
-        @options = options
         super
       end
-      
+
       # Funds are transferred immediately.
       #
       # `payment_source` can be a usual ActiveMerchant credit_card object, or can also
-      # be a string of the `DpsBillingId` or `BillingId` which can be gotten through the 
+      # be a string of the `DpsBillingId` or `BillingId` which can be gotten through the
       # store method.  If you are using a `BillingId` instead of `DpsBillingId` you must
       # also set the instance method `#use_billing_id_for_token` to true, see the `#store`
       # method for an example of how to do this.
       def purchase(money, payment_source, options = {})
         request = build_purchase_or_authorization_request(money, payment_source, options)
-        commit(:purchase, request)      
+        commit(:purchase, request)
       end
-      
+
       # NOTE: Perhaps in options we allow a transaction note to be inserted
       # Verifies that funds are available for the requested card and amount and reserves the specified amount.
       # See: http://www.paymentexpress.com/technical_resources/ecommerce_nonhosted/pxpost.html#Authcomplete
@@ -68,19 +65,19 @@ module ActiveMerchant #:nodoc:
         request = build_purchase_or_authorization_request(money, payment_source, options)
         commit(:authorization, request)
       end
-      
+
       # Transfer pre-authorized funds immediately
       # See: http://www.paymentexpress.com/technical_resources/ecommerce_nonhosted/pxpost.html#Authcomplete
       def capture(money, identification, options = {})
-        request = build_capture_or_credit_request(money, identification, options)                                            
+        request = build_capture_or_credit_request(money, identification, options)
         commit(:capture, request)
       end
-      
+
       # Refund funds to the card holder
       def refund(money, identification, options = {})
         requires!(options, :description)
-        
-        request = build_capture_or_credit_request(money, identification, options)                                            
+
+        request = build_capture_or_credit_request(money, identification, options)
         commit(:credit, request)
       end
 
@@ -88,9 +85,9 @@ module ActiveMerchant #:nodoc:
         deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
-      
+
       # Token Based Billing
-      # 
+      #
       # Instead of storing the credit card details locally, you can store them inside the
       # Payment Express system and instead bill future transactions against a token.
       #
@@ -102,7 +99,7 @@ module ActiveMerchant #:nodoc:
       # initialization of your gateway object.
       #
       # To specify and use your own token, you need to do two things.
-      # 
+      #
       # Firstly, pass in a `:billing_id` as an option in the hash of this store method.  No
       # validation is done on this BillingId by PaymentExpress so you must ensure that it is unique.
       #
@@ -124,37 +121,37 @@ module ActiveMerchant #:nodoc:
         request  = build_token_request(credit_card, options)
         commit(:validate, request)
       end
-    
+
       private
 
       def use_custom_payment_token?
         @options[:use_custom_payment_token]
       end
-      
+
       def build_purchase_or_authorization_request(money, payment_source, options)
-        result = new_transaction      
+        result = new_transaction
 
         if payment_source.is_a?(String)
           add_billing_token(result, payment_source)
         else
           add_credit_card(result, payment_source)
         end
-        
+
         add_amount(result, money, options)
         add_invoice(result, options)
         add_address_verification_data(result, options)
         result
       end
-      
+
       def build_capture_or_credit_request(money, identification, options)
         result = new_transaction
-      
+
         add_amount(result, money, options)
         add_invoice(result, options)
         add_reference(result, identification)
         result
       end
-      
+
       def build_token_request(credit_card, options)
         result = new_transaction
         add_credit_card(result, credit_card)
@@ -162,26 +159,26 @@ module ActiveMerchant #:nodoc:
         add_token_request(result, options)
         result
       end
-      
+
       def add_credentials(xml)
         xml.add_element("PostUsername").text = @options[:login]
         xml.add_element("PostPassword").text = @options[:password]
       end
-      
+
       def add_reference(xml, identification)
         xml.add_element("DpsTxnRef").text = identification
       end
-      
+
       def add_credit_card(xml, credit_card)
         xml.add_element("CardHolderName").text = credit_card.name
         xml.add_element("CardNumber").text = credit_card.number
         xml.add_element("DateExpiry").text = format_date(credit_card.month, credit_card.year)
-        
+
         if credit_card.verification_value?
           xml.add_element("Cvc2").text = credit_card.verification_value
           xml.add_element("Cvc2Presence").text = "1"
         end
-        
+
         if requires_start_date_or_issue_number?(credit_card)
           xml.add_element("DateStart").text = format_date(credit_card.start_month, credit_card.start_year) unless credit_card.start_month.blank? || credit_card.start_year.blank?
           xml.add_element("IssueNumber").text = credit_card.issue_number unless credit_card.issue_number.blank?
@@ -195,37 +192,37 @@ module ActiveMerchant #:nodoc:
           xml.add_element("DpsBillingId").text = token
         end
       end
-      
+
       def add_token_request(xml, options)
         xml.add_element("BillingId").text = options[:billing_id] if options[:billing_id]
         xml.add_element("EnableAddBillCard").text = 1
       end
-      
+
       def add_amount(xml, money, options)
         xml.add_element("Amount").text = amount(money)
         xml.add_element("InputCurrency").text = options[:currency] || currency(money)
       end
-      
+
       def add_transaction_type(xml, action)
         xml.add_element("TxnType").text = TRANSACTIONS[action]
       end
-      
+
       def add_invoice(xml, options)
         xml.add_element("TxnId").text = options[:order_id].to_s.slice(0, 16) unless options[:order_id].blank?
         xml.add_element("MerchantReference").text = options[:description] unless options[:description].blank?
       end
-      
+
       def add_address_verification_data(xml, options)
         address = options[:billing_address] || options[:address]
         return if address.nil?
-        
+
         xml.add_element("EnableAvsData").text = 1
         xml.add_element("AvsAction").text = 1
-        
+
         xml.add_element("AvsStreetAddress").text = address[:address1]
         xml.add_element("AvsPostCode").text = address[:zip]
       end
-      
+
       def new_transaction
         REXML::Document.new.add_element("Txn")
       end
@@ -234,10 +231,10 @@ module ActiveMerchant #:nodoc:
       def commit(action, request)
         add_credentials(request)
         add_transaction_type(request, action)
-        
+
         # Parse the XML response
         response = parse( ssl_post(self.live_url, request.to_s) )
-        
+
         # Return a response
         PaymentExpressResponse.new(response[:success] == APPROVED, response[:card_holder_help_text], response,
           :test => response[:test_mode] == '1',
@@ -249,7 +246,7 @@ module ActiveMerchant #:nodoc:
       def parse(xml_string)
         response = {}
 
-        xml = REXML::Document.new(xml_string)          
+        xml = REXML::Document.new(xml_string)
 
         # Gather all root elements such as HelpText
         xml.elements.each('Txn/*') do |element|
@@ -262,15 +259,15 @@ module ActiveMerchant #:nodoc:
         xml.elements.each('Txn/Transaction/*') do |element|
           response[element.name.underscore.to_sym] = element.text
         end
-        
+
         response
       end
-      
+
       def format_date(month, year)
         "#{format(month, :two_digits)}#{format(year, :two_digits)}"
       end
     end
-    
+
     class PaymentExpressResponse < Response
       # add a method to response so we can easily get the token
       # for Validate transactions