activemerchant 1.28.0 → 1.29.0

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

@@ -57,18 +57,20 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :merchant_id, :public_key, :private_key)
-        @options = options
         @merchant_account_id = options[:merchant_account_id]
+
+        super
+
         Braintree::Configuration.merchant_id = options[:merchant_id]
         Braintree::Configuration.public_key = options[:public_key]
         Braintree::Configuration.private_key = options[:private_key]
         Braintree::Configuration.environment = (options[:environment] || (test? ? :sandbox : :production)).to_sym
         Braintree::Configuration.custom_user_agent = "ActiveMerchant #{ActiveMerchant::VERSION}"
+
         if wiredump_device
           Braintree::Configuration.logger = wiredump_device
           Braintree::Configuration.logger.level = Logger::DEBUG
         end
-        super
       end
 
       def authorize(money, credit_card_or_vault_id, options = {})
@@ -93,7 +95,7 @@ module ActiveMerchant #:nodoc:
       def refund(*args)
         # legacy signature: #refund(transaction_id, options = {})
         # new signature: #refund(money, transaction_id, options = {})
-        money, transaction_id, options = extract_refund_args(args)
+        money, transaction_id, _ = extract_refund_args(args)
         money = amount(money).to_s if money
 
         commit do
@@ -140,7 +142,7 @@ module ActiveMerchant #:nodoc:
 
       def update(vault_id, creditcard, options = {})
         braintree_credit_card = nil
-        customer_update_result = commit do
+        commit do
           braintree_credit_card = Braintree::Customer.find(vault_id).credit_cards.detect { |cc| cc.default? }
           return Response.new(false, 'Braintree::NotFoundError') if braintree_credit_card.nil?
 
@@ -362,9 +364,15 @@ module ActiveMerchant #:nodoc:
             :submit_for_settlement => options[:submit_for_settlement]
           }
         }
+
         if merchant_account_id = (options[:merchant_account_id] || @merchant_account_id)
           parameters[:merchant_account_id] = merchant_account_id
         end
+
+        if options[:recurring]
+          parameters[:recurring] = true
+        end
+
         if credit_card_or_vault_id.is_a?(String) || credit_card_or_vault_id.is_a?(Integer)
           parameters[:customer_id] = credit_card_or_vault_id
         else

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

@@ -2,24 +2,24 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     #
     # CardStream supports the following credit cards, which are auto-detected by
-    # the gateway based on the card number used: 
-    # * AM American Express 
-    # * Diners Club 
-    # * Electron 
-    # * JCB 
-    # * UK Maestro 
-    # * Maestro International 
-    # * Mastercard 
-    # * Solo 
-    # * Style 
-    # * Switch 
-    # * Visa Credit 
-    # * Visa Debit 
-    # * Visa Purchasing 
+    # the gateway based on the card number used:
+    # * AM American Express
+    # * Diners Club
+    # * Electron
+    # * JCB
+    # * UK Maestro
+    # * Maestro International
+    # * Mastercard
+    # * Solo
+    # * Style
+    # * Switch
+    # * Visa Credit
+    # * Visa Debit
+    # * Visa Purchasing
     #
     class CardStreamGateway < Gateway
       self.live_url = self.test_url = 'https://gateway.cardstream.com/process.ashx'
-      
+
       self.money_format = :cents
       self.default_currency = 'GBP'
       self.supported_countries = ['GB']
@@ -29,7 +29,7 @@ module ActiveMerchant #:nodoc:
 
       APPROVED = '00'
 
-      CURRENCY_CODES = { 
+      CURRENCY_CODES = {
         "AUD"=> '036',
         "CAD"=> '124',
         "CZK"=> '203',
@@ -45,24 +45,24 @@ module ActiveMerchant #:nodoc:
         "USD"=> '840',
         "EUR"=> '978'
       }
-      
+
       TRANSACTIONS = {
         :purchase => 'ESALE_KEYED',
         :refund => 'EREFUND_KEYED',
         :authorization => 'ESALE_KEYED'
       }
-      
+
       CVV_CODE = {
-        '0' => 'U',  
+        '0' => 'U',
         '1' => 'P',
         '2' => 'M',
         '4' => 'N'
       }
-      
-      # 0 - No additional information available.  
-      # 1 - Postcode not checked.  
-      # 2 - Postcode matched.  
-      # 4 - Postcode not matched.  
+
+      # 0 - No additional information available.
+      # 1 - Postcode not checked.
+      # 2 - Postcode matched.
+      # 4 - Postcode not matched.
       # 8 - Postcode partially matched.
       AVS_POSTAL_MATCH = {
         "0" => nil,
@@ -71,11 +71,11 @@ module ActiveMerchant #:nodoc:
         "4" => "N",
         "8" => "N"
       }
-      
-      # 0 - No additional information available.  
-      # 1 - Address numeric not checked.  
-      # 2 - Address numeric matched.  
-      # 4 - Address numeric not matched.  
+
+      # 0 - No additional information available.
+      # 1 - Address numeric not checked.
+      # 2 - Address numeric matched.
+      # 4 - Address numeric not matched.
       # 8 - Address numeric partially matched.
       AVS_STREET_MATCH = {
         "0" => nil,
@@ -84,18 +84,17 @@ module ActiveMerchant #:nodoc:
         "4" => "N",
         "8" => "N"
       }
-      
+
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
 
       def purchase(money, credit_card, options = {})
         requires!(options, :order_id)
-        
+
         post = {}
-        
+
         add_amount(post, money, options)
         add_invoice(post, money, credit_card, options)
         add_credit_card(post, credit_card)
@@ -104,9 +103,9 @@ module ActiveMerchant #:nodoc:
 
         commit(:purchase, post)
       end
-  
+
       private
-      
+
       def add_amount(post, money, options)
         add_pair(post, :Amount, amount(money), :required => true)
         add_pair(post, :CurrencyCode, currency_code(options[:currency] || currency(money)), :required => true)
@@ -119,7 +118,7 @@ module ActiveMerchant #:nodoc:
 
       def add_address(post, options)
         address = options[:billing_address] || options[:address]
-        
+
         return if address.nil?
 
         add_pair(post, :BillingStreet, address[:address1])
@@ -132,10 +131,10 @@ module ActiveMerchant #:nodoc:
       def add_invoice(post, money, credit_card, options)
         add_pair(post, :TransactionUnique, options[:order_id], :required => true)
         add_pair(post, :OrderDesc, options[:description] || options[:order_id], :required => true)
-        
+
         if [ 'american_express', 'diners_club' ].include?(card_brand(credit_card).to_s)
-          add_pair(post, :AEIT1Quantity,  1) 
-          add_pair(post, :AEIT1Description,  (options[:description] || options[:order_id]).slice(0, 15)) 
+          add_pair(post, :AEIT1Quantity,  1)
+          add_pair(post, :AEIT1Description,  (options[:description] || options[:order_id]).slice(0, 15))
           add_pair(post, :AEIT1GrossValue, amount(money))
         end
       end
@@ -143,20 +142,20 @@ module ActiveMerchant #:nodoc:
       def add_credit_card(post, credit_card)
         add_pair(post, :CardName, credit_card.name, :required => true)
         add_pair(post, :CardNumber, credit_card.number, :required => true)
-         
+
         add_pair(post, :ExpiryDateMM, format(credit_card.month, :two_digits), :required => true)
         add_pair(post, :ExpiryDateYY, format(credit_card.year, :two_digits), :required => true)
-         
+
         if requires_start_date_or_issue_number?(credit_card)
           add_pair(post, :StartDateMM, format(credit_card.start_month, :two_digits))
           add_pair(post, :StartDateYY, format(credit_card.start_year, :two_digits))
-          
+
           add_pair(post, :IssueNumber, credit_card.issue_number)
         end
-        
+
         add_pair(post, :CV2, credit_card.verification_value)
       end
-      
+
       def commit(action, parameters)
         response = parse( ssl_post(self.live_url, post_data(action, parameters)) )
 
@@ -188,19 +187,19 @@ module ActiveMerchant #:nodoc:
           :ReturnAVSCV2Message => "YES",
           :CountryCode => '826' # 826 for UK based merchant
         )
-        
+
         add_pair(parameters, :Dispatch, action == :authorization ? "LATER" : "NOW")
-    
+
         parameters.collect { |key, value| "VP#{key}=#{CGI.escape(value.to_s)}" }.join("&")
       end
-      
-      # VPCrossReference 
-      # The value in VPCrossReference on a success transaction will contain 
-      # a unique reference that you may use to run future transactions. 
-      # Please note that cross reference transactions must come a static IP 
-      # addressed that has been pre-registered with Cardstream. To 
-      # register an IP address please send it to support@cardstream.com 
-      # with your Cardstream issued merchant ID and it will be added to 
+
+      # VPCrossReference
+      # The value in VPCrossReference on a success transaction will contain
+      # a unique reference that you may use to run future transactions.
+      # Please note that cross reference transactions must come a static IP
+      # addressed that has been pre-registered with Cardstream. To
+      # register an IP address please send it to support@cardstream.com
+      # with your Cardstream issued merchant ID and it will be added to
       # your account.
       def parse(body)
         result = {}
@@ -209,14 +208,10 @@ module ActiveMerchant #:nodoc:
           a = pair.split("=")
           result[a[0].gsub(/^VP/,'').underscore.to_sym] = a[1]
         end
-        
+
         result
       end
 
-      def test?
-        @options[:test] || Base.gateway_mode == :test
-      end
-      
       def currency_code(currency)
         CURRENCY_CODES[currency]
       end

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

@@ -26,7 +26,6 @@ module ActiveMerchant #:nodoc:
       #   Otherwise, perform transactions against the production server.
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
 

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

@@ -107,15 +107,9 @@ module ActiveMerchant #:nodoc:
       #                       if CVV would have failed
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
 
-      # Should run against the test servers or not?
-      def test?
-        @options[:test] || Base.gateway_mode == :test
-      end
-
       # Request an authorization for an amount from CyberSource
       #
       # You must supply an :order_id in the options hash
@@ -148,12 +142,13 @@ module ActiveMerchant #:nodoc:
       end
 
       def refund(money, identification, options = {})
-        commit(build_credit_request(money, identification, options), options)
+        commit(build_refund_request(money, identification, options), options)
       end
 
-      def credit(money, identification, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
-        refund(money, identification, options)
+      # Adds credit to a subscription (stand alone credit).
+      def credit(money, reference, options = {})
+        requires!(options, :order_id)
+        commit(build_credit_request(money, reference, options), options)
       end
 
       # Stores a customer subscription/profile with type "on-demand".
@@ -281,7 +276,7 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
 
-      def build_credit_request(money, identification, options)
+      def build_refund_request(money, identification, options)
         order_id, request_id, request_token = identification.split(";")
         options[:order_id] = order_id
 
@@ -292,6 +287,16 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
 
+      def build_credit_request(money, reference, options)
+        xml = Builder::XmlMarkup.new :indent => 2
+
+        add_purchase_data(xml, money, true, options)
+        add_subscription(xml, options, reference)
+        add_credit_service(xml)
+
+        xml.target!
+      end
+
       def build_create_subscription_request(creditcard, options)
         options[:subscription] = (options[:subscription] || {}).merge(:frequency => "on-demand", :amount => 0, :automatic_renew => false)
 
@@ -435,10 +440,10 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def add_credit_service(xml, request_id, request_token)
+      def add_credit_service(xml, request_id = nil, request_token = nil)
         xml.tag! 'ccCreditService', {'run' => 'true'} do
-          xml.tag! 'captureRequestID', request_id
-          xml.tag! 'captureRequestToken', request_token
+          xml.tag! 'captureRequestID', request_id if request_id
+          xml.tag! 'captureRequestToken', request_token if request_token
         end
       end
 

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

@@ -8,9 +8,9 @@ module ActiveMerchant
       # usable:
       # American Express, ATM, Carte Blanche, Diners Club, Discover,
       # EnRoute, GE Capital, JCB, Laser, Maestro, Mastercard, Solo,
-      # Switch, Visa, Visa Delta, VISA Electron, Visa Purchasing 
+      # Switch, Visa, Visa Delta, VISA Electron, Visa Purchasing
       #
-      # Note continuous authority is only supported for :visa, :master and :american_express card types  
+      # Note continuous authority is only supported for :visa, :master and :american_express card types
       self.supported_cardtypes = [ :visa, :master, :american_express, :discover, :diners_club, :jcb, :maestro, :switch, :solo, :laser ]
 
       self.homepage_url = 'http://www.datacash.com/'
@@ -37,24 +37,23 @@ module ActiveMerchant
       DATACASH_SUCCESS = '1'
 
       # Creates a new DataCashGateway
-      # 
+      #
       # The gateway requires that a valid login and password be passed
       # in the +options+ hash.
-      # 
+      #
       # ==== Options
       #
       # * <tt>:login</tt> -- The Datacash account login.
       # * <tt>:password</tt> -- The Datacash account password.
       # * <tt>:test => +true+ or +false+</tt> -- Use the test or live Datacash url.
-      #     
+      #
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
 
       # Perform a purchase, which is essentially an authorization and capture in a single operation.
-      # 
+      #
       # ==== Parameters
       # * <tt>money</tt> The amount to be authorized as an Integer value in cents.
       # * <tt>authorization_or_credit_card</tt>:: The continuous authority reference or CreditCard details for the transaction.
@@ -62,8 +61,8 @@ module ActiveMerchant
       #   * <tt>:order_id</tt> A unique reference for this order (corresponds to merchantreference in datacash documentation)
       #   * <tt>:set_up_continuous_authority</tt>
       #      Set to true to set up a recurring historic transaction account be set up.
-      #      Only supported for :visa, :master and :american_express card types 
-      #      See http://www.datacash.com/services/recurring/historic.php for more details of historic transactions. 
+      #      Only supported for :visa, :master and :american_express card types
+      #      See http://www.datacash.com/services/recurring/historic.php for more details of historic transactions.
       #   * <tt>:address</tt>:: billing address for card
       #
       # The continuous authority reference will be available in response#params['ca_referece'] if you have requested one
@@ -79,7 +78,7 @@ module ActiveMerchant
         commit(request)
       end
 
-      # Performs an authorization, which reserves the funds on the customer's credit card, but does not 
+      # Performs an authorization, which reserves the funds on the customer's credit card, but does not
       # charge the card.
       #
       # ==== Parameters
@@ -90,8 +89,8 @@ module ActiveMerchant
       #   * <tt>:order_id</tt> A unique reference for this order (corresponds to merchantreference in datacash documentation)
       #   * <tt>:set_up_continuous_authority</tt>::
       #      Set to true to set up a recurring historic transaction account be set up.
-      #      Only supported for :visa, :master and :american_express card types 
-      #      See http://www.datacash.com/services/recurring/historic.php for more details of historic transactions. 
+      #      Only supported for :visa, :master and :american_express card types
+      #      See http://www.datacash.com/services/recurring/historic.php for more details of historic transactions.
       #   * <tt>:address</tt>:: billing address for card
       #
       # The continuous authority reference will be available in response#params['ca_referece'] if you have requested one
@@ -108,20 +107,20 @@ module ActiveMerchant
       end
 
       # Captures the funds from an authorized transaction.
-      # 
+      #
       # ==== Parameters
       #
       # * <tt>money</tt> -- The amount to be captured as anInteger value in cents.
-      # * <tt>authorization</tt> -- The authorization returned from the previous authorize request.   
+      # * <tt>authorization</tt> -- The authorization returned from the previous authorize request.
       def capture(money, authorization, options = {})
         commit(build_void_or_capture_request(FULFILL_TYPE, money, authorization, options))
-      end                    
+      end
 
       # Void a previous transaction
-      # 
+      #
       # ==== Parameters
       #
-      # * <tt>authorization</tt> - The authorization returned from the previous authorize request.   
+      # * <tt>authorization</tt> - The authorization returned from the previous authorize request.
       def void(authorization, options = {})
         request = build_void_or_capture_request(CANCEL_TYPE, nil, authorization, options)
 
@@ -129,7 +128,7 @@ module ActiveMerchant
       end
 
       # Refund to a card
-      # 
+      #
       # ==== Parameters
       #
       # * <tt>money</tt> The amount to be refunded as an Integer value in cents. Set to nil for a full refund on existing transaction.
@@ -151,14 +150,9 @@ module ActiveMerchant
         commit(build_transaction_refund_request(money, reference))
       end
 
-      # Is the gateway running in test mode?
-      def test?
-        @options[:test] || super
-      end
-
-      private                         
+      private
       # Create the xml document for a 'cancel' or 'fulfill' transaction.
-      # 
+      #
       # Final XML should look like:
       # <Request>
       #  <Authentication>
@@ -176,14 +170,14 @@ module ActiveMerchant
       #    </HistoricTxn>
       #  </Transaction>
       # </Request>
-      # 
+      #
       # Parameters:
       # * <tt>type</tt> must be FULFILL_TYPE or CANCEL_TYPE
       # * <tt>money</tt> - optional - Integer value in cents
       # * <tt>authorization</tt> - the Datacash authorization from a previous succesful authorize transaction
       # * <tt>options</tt>
       #   * <tt>order_id</tt> - A unique reference for the transaction
-      #   
+      #
       # Returns:
       #   -Builder xml document
       #
@@ -194,14 +188,14 @@ module ActiveMerchant
         xml.instruct!
         xml.tag! :Request do
           add_authentication(xml)
-          
+
           xml.tag! :Transaction do
             xml.tag! :HistoricTxn do
               xml.tag! :reference, reference
               xml.tag! :authcode, auth_code
               xml.tag! :method, type
             end
-            
+
             if money
               xml.tag! :TxnDetails do
                 xml.tag! :merchantreference, format_reference_number(options[:order_id])
@@ -214,9 +208,9 @@ module ActiveMerchant
       end
 
       # Create the xml document for an 'auth' or 'pre' transaction with a credit card
-      # 
+      #
       # Final XML should look like:
-      # 
+      #
       # <Request>
       #  <Authentication>
       #    <client>99000000</client>
@@ -261,7 +255,7 @@ module ActiveMerchant
       #    </CardTxn>
       #  </Transaction>
       # </Request>
-      # 
+      #
       # Parameters:
       #   -type must be 'auth' or 'pre'
       #   -money - A money object with the price and currency
@@ -270,7 +264,7 @@ module ActiveMerchant
       #     :order_id is the merchant reference number
       #     :billing_address is the billing address for the cc
       #     :address is the delivery address
-      #   
+      #
       # Returns:
       #   -xml: Builder document containing the markup
       #
@@ -279,7 +273,7 @@ module ActiveMerchant
         xml.instruct!
         xml.tag! :Request do
           add_authentication(xml)
-          
+
           xml.tag! :Transaction do
             if options[:set_up_continuous_authority]
               xml.tag! :ContAuthTxn, :type => 'setup'
@@ -299,35 +293,35 @@ module ActiveMerchant
 
       # Create the xml document for an 'auth' or 'pre' transaction with
       # continuous authorization
-      # 
+      #
       # Final XML should look like:
-      # 
-      # <Request> 
-      #   <Transaction> 
-      #     <ContAuthTxn type="historic" /> 
-      #     <TxnDetails> 
-      #       <merchantreference>3851231</merchantreference> 
-      #       <capturemethod>cont_auth</capturemethod> 
-      #       <amount currency="GBP">18.50</amount> 
-      #     </TxnDetails> 
-      #     <HistoricTxn> 
-      #       <reference>4500200040925092</reference> 
-      #       <method>auth</method> 
-      #     </HistoricTxn> 
-      #   </Transaction> 
-      #   <Authentication> 
-      #     <client>99000001</client> 
-      #     <password>mypasswd</password> 
-      #   </Authentication> 
+      #
+      # <Request>
+      #   <Transaction>
+      #     <ContAuthTxn type="historic" />
+      #     <TxnDetails>
+      #       <merchantreference>3851231</merchantreference>
+      #       <capturemethod>cont_auth</capturemethod>
+      #       <amount currency="GBP">18.50</amount>
+      #     </TxnDetails>
+      #     <HistoricTxn>
+      #       <reference>4500200040925092</reference>
+      #       <method>auth</method>
+      #     </HistoricTxn>
+      #   </Transaction>
+      #   <Authentication>
+      #     <client>99000001</client>
+      #     <password>mypasswd</password>
+      #   </Authentication>
       # </Request>
-      # 
+      #
       # Parameters:
       #   -type must be 'auth' or 'pre'
       #   -money - A money object with the price and currency
       #   -authorization - The authorization containing a continuous authority reference previously set up on a credit card
       #   -options:
       #     :order_id is the merchant reference number
-      #   
+      #
       # Returns:
       #   -xml: Builder document containing the markup
       #
@@ -356,25 +350,25 @@ module ActiveMerchant
       end
 
       # Create the xml document for a full or partial refund transaction with
-      # 
+      #
       # Final XML should look like:
       #
-      # <Request> 
-      #   <Authentication> 
-      #     <client>99000001</client> 
-      #     <password>*******</password> 
-      #   </Authentication> 
-      #   <Transaction> 
-      #     <HistoricTxn> 
-      #       <method>txn_refund</method> 
-      #       <reference>12345678</reference> 
-      #     </HistoricTxn> 
-      #     <TxnDetails> 
-      #       <amount>10.00</amount> 
-      #     </TxnDetails> 
+      # <Request>
+      #   <Authentication>
+      #     <client>99000001</client>
+      #     <password>*******</password>
+      #   </Authentication>
+      #   <Transaction>
+      #     <HistoricTxn>
+      #       <method>txn_refund</method>
+      #       <reference>12345678</reference>
+      #     </HistoricTxn>
+      #     <TxnDetails>
+      #       <amount>10.00</amount>
+      #     </TxnDetails>
       #   </Transaction>
-      # </Request> 
-      # 
+      # </Request>
+      #
       def build_transaction_refund_request(money, reference)
         xml = Builder::XmlMarkup.new :indent => 2
         xml.instruct!
@@ -396,27 +390,27 @@ module ActiveMerchant
       end
 
       # Create the xml document for a full or partial refund  with
-      # 
+      #
       # Final XML should look like:
       #
-      # <Request> 
-      #   <Authentication> 
-      #     <client>99000001</client> 
-      #     <password>*****</password> 
-      #   </Authentication> 
-      #   <Transaction> 
-      #     <CardTxn> 
-      #       <Card> 
-      #         <pan>633300*********1</pan> 
-      #         <expirydate>04/06</expirydate> 
-      #         <startdate>01/04</startdate> 
-      #       </Card> 
-      #       <method>refund</method> 
-      #     </CardTxn> 
-      #     <TxnDetails> 
-      #       <merchantreference>1000001</merchantreference> 
-      #       <amount currency="GBP">95.99</amount> 
-      #     </TxnDetails> 
+      # <Request>
+      #   <Authentication>
+      #     <client>99000001</client>
+      #     <password>*****</password>
+      #   </Authentication>
+      #   <Transaction>
+      #     <CardTxn>
+      #       <Card>
+      #         <pan>633300*********1</pan>
+      #         <expirydate>04/06</expirydate>
+      #         <startdate>01/04</startdate>
+      #       </Card>
+      #       <method>refund</method>
+      #     </CardTxn>
+      #     <TxnDetails>
+      #       <merchantreference>1000001</merchantreference>
+      #       <amount currency="GBP">95.99</amount>
+      #     </TxnDetails>
       #   </Transaction>
       # </Request>
       def build_refund_request(money, credit_card, options)
@@ -440,13 +434,13 @@ module ActiveMerchant
 
 
       # Adds the authentication element to the passed builder xml doc
-      # 
+      #
       # Parameters:
       #   -xml: Builder document that is being built up
-      #   
+      #
       # Returns:
       #   -none: The results is stored in the passed xml document
-      #   
+      #
       def add_authentication(xml)
         xml.tag! :Authentication do
           xml.tag! :client, @options[:login]
@@ -455,17 +449,17 @@ module ActiveMerchant
       end
 
       # Add credit_card detals to the passed XML Builder doc
-      # 
+      #
       # Parameters:
       #   -xml: Builder document that is being built up
       #   -credit_card: ActiveMerchant::Billing::CreditCard object
       #   -billing_address: Hash containing all of the billing address details
-      #   
+      #
       # Returns:
       #   -none: The results is stored in the passed xml document
-      #   
+      #
       def add_credit_card(xml, credit_card, address)
-        
+
         xml.tag! :Card do
 
           # DataCash calls the CC number 'pan'
@@ -474,7 +468,7 @@ module ActiveMerchant
 
           # optional values - for Solo etc
           if [ 'switch', 'solo' ].include?(card_brand(credit_card).to_s)
-            
+
             xml.tag! :issuenumber, credit_card.issue_number unless credit_card.issue_number.blank?
 
             if !credit_card.start_month.blank? && !credit_card.start_year.blank?
@@ -492,14 +486,14 @@ module ActiveMerchant
               xml.tag! :postcode, address[:zip] unless address[:zip].blank?
             end
 
-            # The ExtendedPolicy defines what to do when the passed data 
+            # The ExtendedPolicy defines what to do when the passed data
             # matches, or not...
-            # 
+            #
             # All of the following elements MUST be present for the
             # xml to be valid (or can drop the ExtendedPolicy and use
             # a predefined one
             xml.tag! :ExtendedPolicy do
-              xml.tag! :cv2_policy, 
+              xml.tag! :cv2_policy,
               :notprovided =>   POLICY_REJECT,
               :notchecked =>    POLICY_REJECT,
               :matched =>       POLICY_ACCEPT,
@@ -511,7 +505,7 @@ module ActiveMerchant
               :matched =>       POLICY_ACCEPT,
               :notmatched =>    POLICY_REJECT,
               :partialmatch =>  POLICY_ACCEPT
-              xml.tag! :address_policy, 
+              xml.tag! :address_policy,
               :notprovided =>   POLICY_ACCEPT,
               :notchecked =>    POLICY_ACCEPT,
               :matched =>       POLICY_ACCEPT,
@@ -523,15 +517,15 @@ module ActiveMerchant
       end
 
       # Send the passed data to DataCash for processing
-      # 
+      #
       # Parameters:
       #   -request: The XML data that is to be sent to Datacash
-      #   
+      #
       # Returns:
       #   - ActiveMerchant::Billing::Response object
-      #   
+      #
       def commit(request)
-        response = parse(ssl_post(test? ? self.test_url : self.live_url, request))      
+        response = parse(ssl_post(test? ? self.test_url : self.live_url, request))
 
         Response.new(response[:status] == DATACASH_SUCCESS, response[:reason], response,
           :test => test?,
@@ -540,11 +534,11 @@ module ActiveMerchant
       end
 
       # Returns a date string in the format Datacash expects
-      # 
+      #
       # Parameters:
       #   -month: integer, the month
       #   -year: integer, the year
-      # 
+      #
       # Returns:
       #   -String: date in MM/YY format
       #
@@ -556,10 +550,10 @@ module ActiveMerchant
       #
       # Parameters:
       #   -body: The XML returned from Datacash
-      # 
+      #
       # Returns:
       #   -a hash with all of the values returned in the Datacash XML response
-      # 
+      #
       def parse(body)
 
         response = {}
@@ -571,14 +565,14 @@ module ActiveMerchant
         end
 
         response
-      end     
+      end
 
       # Parse an xml element
       #
       # Parameters:
       #   -response: The hash that the values are being returned in
       #   -node: The node that is currently being read
-      # 
+      #
       # Returns:
       # -  none (results are stored in the passed hash)
       def parse_element(response, node)