activemerchant 1.28.0 → 1.29.1

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

@@ -10,22 +10,21 @@ module ActiveMerchant #:nodoc:
       self.abstract_class = true
 
       # Creates a new SageGateway
-      # 
+      #
       # The gateway requires that a valid login and password be passed
       # in the +options+ hash.
-      # 
+      #
       # ==== Options
       #
       # * <tt>:login</tt> - The Sage Payment Solutions Merchant ID Number.
       # * <tt>:password</tt> - The Sage Payment Solutions Merchant Key Number.
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
-      
+
       # Performs an authorization transaction
-      # 
+      #
       # ==== Parameters
       # * <tt>money</tt> - The amount to be authorized as an integer value in cents.
       # * <tt>credit_card</tt> - The CreditCard object to be used as the funding source for the transaction.
@@ -42,20 +41,20 @@ module ActiveMerchant #:nodoc:
       #     * <tt>:phone</tt> - The billing address phone number
       #     * <tt>:fax</tt> - The billing address fax number
       #   * <tt>:shipping_address</tt> - The customer's shipping address as a hash of address information.
-      #     * <tt>:name</tt> - The name at the shipping address 
+      #     * <tt>:name</tt> - The name at the shipping address
       #     * <tt>:address1</tt> - The shipping address street
       #     * <tt>:city</tt> - The shipping address city
       #     * <tt>:state</tt> - The shipping address state code
       #     * <tt>:country</tt> - The 2 digit ISO shipping address country code
       #     * <tt>:zip</tt> - The shipping address zip code
       #   * <tt>:tax</tt> - The tax amount for the transaction as an Integer value in cents. Maps to Sage <tt>T_tax</tt>.
-      #   * <tt>:shipping</tt> - The shipping amount for the transaction as an Integer value in cents. Maps to Sage <tt>T_shipping</tt>.      
+      #   * <tt>:shipping</tt> - The shipping amount for the transaction as an Integer value in cents. Maps to Sage <tt>T_shipping</tt>.
       def authorize(money, credit_card, options = {})
         bankcard.authorize(money, credit_card, options)
       end
-      
+
       # Performs 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.
@@ -73,7 +72,7 @@ module ActiveMerchant #:nodoc:
       #     * <tt>:phone</tt> - The billing address phone number
       #     * <tt>:fax</tt> - The billing address fax number
       #   * <tt>:shipping_address</tt> - The customer's shipping address as a hash of address information.
-      #     * <tt>:name</tt> - The name at the shipping address 
+      #     * <tt>:name</tt> - The name at the shipping address
       #     * <tt>:address1</tt> - The shipping address street
       #     * <tt>:city</tt> - The shipping address city
       #     * <tt>:state</tt> - The shipping address state code
@@ -95,8 +94,8 @@ module ActiveMerchant #:nodoc:
         else
           bankcard.purchase(money, source, options)
         end
-      end                       
-    
+      end
+
       # Captures authorized funds.
       #
       # ==== Parameters
@@ -106,7 +105,7 @@ module ActiveMerchant #:nodoc:
       def capture(money, reference, options = {})
         bankcard.capture(money, reference, options)
       end
-      
+
       # Voids a prior transaction. Works for both CreditCard and Check transactions.
       #
       # ==== Parameters
@@ -133,15 +132,15 @@ module ActiveMerchant #:nodoc:
           bankcard.credit(money, source, options)
         end
       end
-          
+
       private
       def bankcard
         @bankcard ||= SageBankcardGateway.new(@options)
       end
-      
+
       def virtual_check
         @virtual_check ||= SageVirtualCheckGateway.new(@options)
-      end 
+      end
     end
   end
 end

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

@@ -1,6 +1,6 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-    class SagePayGateway < Gateway  
+    class SagePayGateway < Gateway
       cattr_accessor :simulate
       self.simulate = false
 
@@ -9,9 +9,9 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://test.sagepay.com/gateway/service'
       self.live_url = 'https://live.sagepay.com/gateway/service'
       self.simulator_url = 'https://test.sagepay.com/Simulator'
-      
+
       APPROVED = 'OK'
-    
+
       TRANSACTIONS = {
         :purchase => 'PAYMENT',
         :credit => 'REFUND',
@@ -20,7 +20,7 @@ module ActiveMerchant #:nodoc:
         :void => 'VOID',
         :abort => 'ABORT'
       }
-      
+
       CREDIT_CARDS = {
         :visa => "VISA",
         :master => "MC",
@@ -35,36 +35,31 @@ module ActiveMerchant #:nodoc:
       }
 
       ELECTRON = /^(424519|42496[23]|450875|48440[6-8]|4844[1-5][1-5]|4917[3-5][0-9]|491880)\d{10}(\d{3})?$/
-      
+
       AVS_CVV_CODE = {
-        "NOTPROVIDED" => nil, 
+        "NOTPROVIDED" => nil,
         "NOTCHECKED" => 'X',
         "MATCHED" => 'Y',
         "NOTMATCHED" => 'N'
       }
-    
+
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :switch, :solo, :maestro, :diners_club]
       self.supported_countries = ['GB']
       self.default_currency = 'GBP'
-      
+
       self.homepage_url = 'http://www.sagepay.com'
       self.display_name = 'SagePay'
 
       def initialize(options = {})
         requires!(options, :login)
-        @options = options
         super
       end
-      
-      def test?
-        @options[:test] || super
-      end
-      
+
       def purchase(money, credit_card, options = {})
         requires!(options, :order_id)
-        
+
         post = {}
-        
+
         add_amount(post, money, options)
         add_invoice(post, options)
         add_credit_card(post, credit_card)
@@ -73,12 +68,12 @@ module ActiveMerchant #:nodoc:
 
         commit(:purchase, post)
       end
-      
+
       def authorize(money, credit_card, options = {})
         requires!(options, :order_id)
-        
+
         post = {}
-        
+
         add_amount(post, money, options)
         add_invoice(post, options)
         add_credit_card(post, credit_card)
@@ -87,20 +82,20 @@ module ActiveMerchant #:nodoc:
 
         commit(:authorization, post)
       end
-      
+
       # You can only capture a transaction once, even if you didn't capture the full amount the first time.
       def capture(money, identification, options = {})
         post = {}
-        
+
         add_reference(post, identification)
         add_release_amount(post, money, options)
-        
+
         commit(:capture, post)
       end
-      
+
       def void(identification, options = {})
         post = {}
-        
+
         add_reference(post, identification)
         action = abort_or_void_from(identification)
 
@@ -110,13 +105,13 @@ module ActiveMerchant #:nodoc:
       # Refunding requires a new order_id to passed in, as well as a description
       def refund(money, identification, options = {})
         requires!(options, :order_id, :description)
-        
+
         post = {}
-        
+
         add_credit_reference(post, identification)
         add_amount(post, money, options)
         add_invoice(post, options)
-        
+
         commit(:credit, post)
       end
 
@@ -124,26 +119,26 @@ module ActiveMerchant #:nodoc:
         deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
-      
+
       private
       def add_reference(post, identification)
-        order_id, transaction_id, authorization, security_key = identification.split(';') 
-        
+        order_id, transaction_id, authorization, security_key = identification.split(';')
+
         add_pair(post, :VendorTxCode, order_id)
         add_pair(post, :VPSTxId, transaction_id)
         add_pair(post, :TxAuthNo, authorization)
         add_pair(post, :SecurityKey, security_key)
       end
-      
+
       def add_credit_reference(post, identification)
-        order_id, transaction_id, authorization, security_key = identification.split(';') 
-        
+        order_id, transaction_id, authorization, security_key = identification.split(';')
+
         add_pair(post, :RelatedVendorTxCode, order_id)
         add_pair(post, :RelatedVPSTxId, transaction_id)
         add_pair(post, :RelatedTxAuthNo, authorization)
         add_pair(post, :RelatedSecurityKey, security_key)
       end
-      
+
       def add_amount(post, money, options)
         currency = options[:currency] || currency(money)
         add_pair(post, :Amount, localized_amount(money, currency), :required => true)
@@ -173,7 +168,7 @@ module ActiveMerchant #:nodoc:
           add_pair(post, :BillingCountry, billing_address[:country])
           add_pair(post, :BillingPostCode, billing_address[:zip])
         end
-        
+
         if shipping_address = options[:shipping_address] || billing_address
           first_name, last_name = parse_first_and_last_name(shipping_address[:name])
           add_pair(post, :DeliverySurname, last_name)
@@ -195,59 +190,59 @@ module ActiveMerchant #:nodoc:
       def add_credit_card(post, credit_card)
         add_pair(post, :CardHolder, credit_card.name, :required => true)
         add_pair(post, :CardNumber, credit_card.number, :required => true)
-         
+
         add_pair(post, :ExpiryDate, format_date(credit_card.month, credit_card.year), :required => true)
-         
+
         if requires_start_date_or_issue_number?(credit_card)
           add_pair(post, :StartDate, format_date(credit_card.start_month, credit_card.start_year))
           add_pair(post, :IssueNumber, credit_card.issue_number)
         end
         add_pair(post, :CardType, map_card_type(credit_card))
-        
+
         add_pair(post, :CV2, credit_card.verification_value)
       end
-      
+
       def sanitize_order_id(order_id)
         order_id.to_s.gsub(/[^-a-zA-Z0-9._]/, '')
       end
-      
+
       def map_card_type(credit_card)
         raise ArgumentError, "The credit card type must be provided" if card_brand(credit_card).blank?
-        
+
         card_type = card_brand(credit_card).to_sym
-        
+
         # Check if it is an electron card
-        if card_type == :visa && credit_card.number =~ ELECTRON 
+        if card_type == :visa && credit_card.number =~ ELECTRON
           CREDIT_CARDS[:electron]
-        else  
+        else
           CREDIT_CARDS[card_type]
         end
       end
-      
+
       # MMYY format
       def format_date(month, year)
         return nil if year.blank? || month.blank?
-        
+
         year  = sprintf("%.4i", year)
         month = sprintf("%.2i", month)
 
         "#{month}#{year[-2..-1]}"
       end
-      
+
       def commit(action, parameters)
         response = parse( ssl_post(url_for(action), post_data(action, parameters)) )
-          
+
         Response.new(response["Status"] == APPROVED, message_from(response), response,
           :test => test?,
           :authorization => authorization_from(response, parameters, action),
-          :avs_result => { 
+          :avs_result => {
             :street_match => AVS_CVV_CODE[ response["AddressResult"] ],
             :postal_match => AVS_CVV_CODE[ response["PostCodeResult"] ],
           },
           :cvv_result => AVS_CVV_CODE[ response["CV2Result"] ]
         )
       end
-      
+
       def authorization_from(response, params, action)
          [ params[:VendorTxCode],
            response["VPSTxId"],
@@ -264,12 +259,12 @@ module ActiveMerchant #:nodoc:
       def url_for(action)
         simulate ? build_simulator_url(action) : build_url(action)
       end
-      
+
       def build_url(action)
         endpoint = [ :purchase, :authorization ].include?(action) ? "vspdirect-register" : TRANSACTIONS[action].downcase
         "#{test? ? self.test_url : self.live_url}/#{endpoint}.vsp"
       end
-      
+
       def build_simulator_url(action)
         endpoint = [ :purchase, :authorization ].include?(action) ? "VSPDirectGateway.asp" : "VSPServerGateway.asp?Service=Vendor#{TRANSACTIONS[action].capitalize}Tx"
         "#{self.simulator_url}/#{endpoint}"
@@ -285,10 +280,10 @@ module ActiveMerchant #:nodoc:
           :TxType => TRANSACTIONS[action],
           :VPSProtocol => "2.23"
         )
-        
+
         parameters.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
       end
-      
+
       # SagePay returns data in the following format
       # Key1=value1
       # Key2=value2
@@ -306,12 +301,12 @@ module ActiveMerchant #:nodoc:
 
       def parse_first_and_last_name(value)
         name = value.to_s.split(' ')
-        
+
         last_name = name.pop || ''
         first_name = name.join(' ')
         [ first_name[0,20], last_name[0,20] ]
       end
-      
+
       def localized_amount(money, currency)
         amount = amount(money)
         CURRENCIES_WITHOUT_FRACTIONS.include?(currency.to_s) ? amount.split('.').first : amount

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

@@ -17,10 +17,9 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :login)
-        @options = options
         super
       end
-      
+
       def test?
         @options[:login] == "TEST0"
       end

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

@@ -17,16 +17,13 @@ module ActiveMerchant #:nodoc:
         end
 
         requires!(options, :login, :password, :processor_token)
-        @options = options
         Samurai.options = {
           :merchant_key       => options[:login],
           :merchant_password  => options[:password],
           :processor_token    => options[:processor_token]
         }
-      end
 
-      def test?
-        @options[:test] || super
+        super
       end
 
       def authorize(money, credit_card_or_vault_id, options = {})

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

@@ -58,7 +58,6 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
 

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

@@ -4,24 +4,21 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class SecurePayGateway < AuthorizeNetGateway
       self.live_url = self.test_url = 'https://www.securepay.com/AuthSpayAdapter/process.aspx'
-      
+
       self.homepage_url = 'http://www.securepay.com/'
       self.display_name = 'SecurePay'
-      
+
       # Limit support to purchase() for the time being
       # JRuby chokes here
       # undef_method :authorize, :capture, :void, :credit
-      
+
       undef_method :authorize
       undef_method :capture
       undef_method :void
       undef_method :credit
-      
-      def test?
-        Base.gateway_mode == :test
-      end
-      
+
       private
+
       def split(response)
         response.split(',')
       end

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

@@ -58,14 +58,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)
           requires!(options, :order_id)

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

@@ -18,7 +18,7 @@ module ActiveMerchant #:nodoc:
         8 => "Bad or malformed request",
         9 => "Invalid card number"
       }
-  
+
       self.default_currency = 'NZD'
       self.supported_countries = ['NZ']
       self.supported_cardtypes = [:visa, :master, :american_express, :diners_club]
@@ -27,33 +27,32 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
-      end  
-      
+      end
+
       def purchase(money, creditcard, options = {})
         post = SecurePayTechPostData.new
 
         add_invoice(post, money, options)
-        add_creditcard(post, creditcard)        
-             
+        add_creditcard(post, creditcard)
+
         commit(:purchase, post)
-      end                       
-    
-      private                       
-      
+      end
+
+      private
+
       def add_invoice(post, money, options)
         post[:Amount] = amount(money)
         post[:Currency] = options[:currency] || currency(money)
 
         post[:OrderReference] = options[:order_id]
       end
-      
+
       def add_creditcard(post, creditcard)
         post[:CardNumber] = creditcard.number
         post[:CardExpiry] = expdate(creditcard)
         post[:CardHolderName] = creditcard.name
-        
+
         if creditcard.verification_value?
           post[:EnableCSC] = true
           post[:CSC] = creditcard.verification_value
@@ -62,7 +61,7 @@ module ActiveMerchant #:nodoc:
         # SPT will autodetect this
         post[:CardType] = 0
       end
-      
+
       def parse(body)
         response = CGI.unescape(body).split(',')
 
@@ -80,13 +79,13 @@ module ActiveMerchant #:nodoc:
         end
 
         result
-      end    
-      
+      end
+
       def commit(action, post)
         response = parse( ssl_post(self.live_url, post_data(action, post) ) )
 
-        Response.new(response[:result_code] == 1, message_from(response), response, 
-          :test => test?, 
+        Response.new(response[:result_code] == 1, message_from(response), response,
+          :test => test?,
           :authorization => response[:merchant_transaction_reference]
         )
       end
@@ -94,7 +93,7 @@ module ActiveMerchant #:nodoc:
       def message_from(result)
         PAYMENT_GATEWAY_RESPONSES[result[:result_code]]
       end
-      
+
       def post_data(action, post)
         post[:MerchantID] = @options[:login]
         post[:MerchantKey] = @options[:password]