activemerchant 1.28.0 → 1.29.0

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

@@ -7,13 +7,13 @@ module ActiveMerchant #:nodoc:
         base.homepage_url = 'http://www.sagepayments.com'
         base.display_name = 'Sage Payment Solutions'
       end
-      
+
       # Transactions types:
       # <tt>01</tt> - Sale
-      # <tt>02</tt> - AuthOnly 
-      # <tt>03</tt> - Force/PriorAuthSale 
-      # <tt>04</tt> - Void 
-      # <tt>06</tt> - Credit 
+      # <tt>02</tt> - AuthOnly
+      # <tt>03</tt> - Force/PriorAuthSale
+      # <tt>04</tt> - Void
+      # <tt>06</tt> - Credit
       # <tt>11</tt> - PriorAuthSale by Reference*
       TRANSACTIONS = {
         :purchase           => '01',
@@ -22,83 +22,82 @@ module ActiveMerchant #:nodoc:
         :void               => '04',
         :credit             => '06'
       }
-      
+
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
-      
+
       private
       def add_invoice(post, options)
         post[:T_ordernum] = options[:order_id].slice(0, 20)
         post[:T_tax] = amount(options[:tax]) unless options[:tax].blank?
         post[:T_shipping] = amount(options[:shipping]) unless options[:shipping].blank?
       end
-      
+
       def add_reference(post, reference)
         ref, source = reference.to_s.split(";")
         post[:T_reference] = ref
       end
-      
+
       def add_amount(post, money)
         post[:T_amt] = amount(money)
       end
-      
+
       def add_customer_data(post, options)
         post[:T_customer_number] = options[:customer]
       end
 
       def add_addresses(post, options)
         billing_address   = options[:billing_address] || options[:address] || {}
-        
+
         post[:C_address]    = billing_address[:address1]
         post[:C_city]       = billing_address[:city]
-        
+
         if ['US', 'CA'].include?(billing_address[:country])
           post[:C_state]    = billing_address[:state]
         else
           post[:C_state]    = "Outside of United States"
         end
-        
+
         post[:C_zip]        = billing_address[:zip]
-        post[:C_country]    = billing_address[:country] 
+        post[:C_country]    = billing_address[:country]
         post[:C_telephone]  = billing_address[:phone]
         post[:C_fax]        = billing_address[:fax]
         post[:C_email]      = options[:email]
-        
+
         if shipping_address = options[:shipping_address]
           post[:C_ship_name]    = shipping_address[:name]
           post[:C_ship_address] = shipping_address[:address1]
           post[:C_ship_city]    = shipping_address[:city]
           post[:C_ship_state]   = shipping_address[:state]
-          post[:C_ship_zip]     = shipping_address[:zip] 
+          post[:C_ship_zip]     = shipping_address[:zip]
           post[:C_ship_country] = shipping_address[:country]
         end
       end
-      
+
       def add_transaction_data(post, money, options)
         add_amount(post, money)
         add_invoice(post, options)
-        add_addresses(post, options)        
+        add_addresses(post, options)
         add_customer_data(post, options)
       end
-      
+
       def commit(action, params)
         response = parse(ssl_post(self.live_url, post_data(action, params)))
-        
-        Response.new(success?(response), response[:message], response, 
-          :test => test?, 
+
+        Response.new(success?(response), response[:message], response,
+          :test => test?,
           :authorization => authorization_from(response),
           :avs_result => { :code => response[:avs_result] },
           :cvv_result => response[:cvv_result]
         )
       end
-      
+
       def authorization_from(response)
         "#{response[:reference]};#{source}"
       end
-            
+
       def success?(response)
         response[:success] == 'A'
       end
@@ -107,7 +106,7 @@ module ActiveMerchant #:nodoc:
         params[:M_id]  = @options[:login]
         params[:M_key] = @options[:password]
         params[:T_code] = TRANSACTIONS[action]
-        
+
         params.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
       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