activemerchant 1.28.0 → 1.29.1

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

@@ -10,13 +10,12 @@ module ActiveMerchant #:nodoc:
       self.money_format = :cents
       self.homepage_url = 'http://www.barclaycard.co.uk/business/accepting-payments/epdq-mpi/'
       self.display_name = 'Barclays ePDQ'
-      
+
       def initialize(options = {})
         requires!(options, :login, :password, :client_id)
-        @options = options
         super
-      end  
-      
+      end
+
       def authorize(money, creditcard, options = {})
         document = Document.new(self, @options) do
           add_order_form(options[:order_id]) do
@@ -29,7 +28,7 @@ module ActiveMerchant #:nodoc:
 
         commit(document)
       end
-      
+
       def purchase(money, creditcard, options = {})
         # disable fraud checks if this is a repeat order:
         if options[:payment_number] && (options[:payment_number] > 1)
@@ -46,9 +45,9 @@ module ActiveMerchant #:nodoc:
           end
         end
         commit(document)
-      end                       
-    
-      # authorization is your unique order ID, not the authorization 
+      end
+
+      # authorization is your unique order ID, not the authorization
       # code returned by ePDQ
       def capture(money, authorization, options = {})
         document = Document.new(self, @options) do
@@ -60,7 +59,7 @@ module ActiveMerchant #:nodoc:
         commit(document)
       end
 
-      # authorization is your unique order ID, not the authorization 
+      # authorization is your unique order ID, not the authorization
       # code returned by ePDQ
       def credit(money, creditcard_or_authorization, options = {})
         if creditcard_or_authorization.is_a?(String)
@@ -85,7 +84,7 @@ module ActiveMerchant #:nodoc:
         commit(document)
       end
 
-      private                       
+      private
       def credit_new_order(money, creditcard, options)
         document = Document.new(self, @options) do
           add_order_form do
@@ -106,10 +105,10 @@ module ActiveMerchant #:nodoc:
             add_transaction(:Credit, money)
           end
         end
-        
+
         commit(document)
       end
-      
+
       def parse(body)
         parser = Parser.new(body)
         response = parser.parse
@@ -121,8 +120,8 @@ module ActiveMerchant #:nodoc:
           :order_id => response[:order_id],
           :raw_response => response[:raw_response]
         )
-      end     
-      
+      end
+
       def commit(document)
         url = (test? ? self.test_url : self.live_url)
         data = ssl_post(url, document.to_xml)
@@ -150,7 +149,7 @@ module ActiveMerchant #:nodoc:
             success = find(doc, "//Transaction/AuthCode").present?
           end
 
-          {       
+          {
             :success => success,
             :message => message,
             :transaction_id => find(doc, "//Transaction/Id"),
@@ -169,7 +168,7 @@ module ActiveMerchant #:nodoc:
       class Document
         attr_reader :type, :xml
 
-        PAYMENT_INTERVALS = { 
+        PAYMENT_INTERVALS = {
           :days => 'D',
           :months => 'M'
         }
@@ -180,7 +179,7 @@ module ActiveMerchant #:nodoc:
           :switch => 9,
           :maestro => 10,
         }
-      
+
         def initialize(gateway, options = {}, document_options = {}, &block)
           @gateway = gateway
           @options = options
@@ -206,7 +205,7 @@ module ActiveMerchant #:nodoc:
               end
               xml.Instructions do
                 if @document_options[:no_fraud]
-                  xml.Pipeline "PaymentNoFraud" 
+                  xml.Pipeline "PaymentNoFraud"
                 else
                   xml.Pipeline "Payment"
                 end
@@ -294,9 +293,9 @@ module ActiveMerchant #:nodoc:
         # date must be formatted MM/YY
         def format_expiry_date(creditcard)
           month_str = "%02d" % creditcard.month
-          if match = creditcard.year.to_s.match(/^\d{2}(\d{2})$/) 
+          if match = creditcard.year.to_s.match(/^\d{2}(\d{2})$/)
             year_str = "%02d" % match[1].to_i
-          else 
+          else
             year_str = "%02d" % creditcard.year
           end
           "#{month_str}/#{year_str}"

data/lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb

@@ -37,7 +37,7 @@ module ActiveMerchant #:nodoc:
         '5' => 'I',
         '9' => 'I'
       }
-      
+
       PERIODS = {
         :days   => 'D',
         :weeks  => 'W',
@@ -75,28 +75,27 @@ module ActiveMerchant #:nodoc:
         # The name of the gateway
         base.display_name = 'Beanstream.com'
       end
-      
-      # Only <tt>:login</tt> is required by default, 
-      # which is the merchant's merchant ID. If you'd like to perform void, 
+
+      # Only <tt>:login</tt> is required by default,
+      # which is the merchant's merchant ID. If you'd like to perform void,
       # capture or refund transactions then you'll also need to add a username
       # and password to your account under administration -> account settings ->
       # order settings -> Use username/password validation
       def initialize(options = {})
         requires!(options, :login)
-        @options = options
         super
       end
-      
+
       def capture(money, authorization, options = {})
         reference, amount, type = split_auth(authorization)
-        
+
         post = {}
         add_amount(post, money)
         add_reference(post, reference)
         add_transaction_type(post, :capture)
         commit(post)
       end
-      
+
       def refund(money, source, options = {})
         post = {}
         reference, amount, type = split_auth(source)
@@ -110,7 +109,7 @@ module ActiveMerchant #:nodoc:
         deprecated Gateway::CREDIT_DEPRECATION_MESSAGE
         refund(money, source, options)
       end
-    
+
       private
       def purchase_action(source)
         if source.is_a?(Check)
@@ -119,38 +118,38 @@ module ActiveMerchant #:nodoc:
           :purchase
         end
       end
-      
+
       def void_action(original_transaction_type)
         (original_transaction_type == TRANSACTIONS[:refund]) ? :void_refund : :void_purchase
       end
-      
+
       def refund_action(type)
         (type == TRANSACTIONS[:check_purchase]) ? :check_refund : :refund
       end
-      
+
       def secure_profile_action(type)
         PROFILE_OPERATIONS[type] || PROFILE_OPERATIONS[:new]
       end
-      
+
       def split_auth(string)
         string.split(";")
       end
-      
+
       def add_amount(post, money)
         post[:trnAmount] = amount(money)
       end
-      
+
       def add_original_amount(post, amount)
         post[:trnAmount] = amount
       end
 
-      def add_reference(post, reference)                
+      def add_reference(post, reference)
         post[:adjId] = reference
       end
-      
+
       def add_address(post, options)
         prepare_address_for_non_american_countries(options)
-        
+
         if billing_address = options[:billing_address] || options[:address]
           post[:ordName]          = billing_address[:name]
           post[:ordEmailAddress]  = options[:email]
@@ -195,7 +194,7 @@ module ActiveMerchant #:nodoc:
         post[:ordTax2Price]     = amount(options[:tax2])
         post[:ref1]             = options[:custom]
       end
-      
+
       def add_credit_card(post, credit_card)
         if credit_card
           post[:trnCardOwner] = credit_card.name
@@ -205,31 +204,31 @@ module ActiveMerchant #:nodoc:
           post[:trnCardCvd] = credit_card.verification_value
         end
       end
-            
+
       def add_check(post, check)
         # The institution number of the consumer’s financial institution. Required for Canadian dollar EFT transactions.
         post[:institutionNumber] = check.institution_number
-        
+
         # The bank transit number of the consumer’s bank account. Required for Canadian dollar EFT transactions.
         post[:transitNumber] = check.transit_number
-        
+
         # The routing number of the consumer’s bank account.  Required for US dollar EFT transactions.
         post[:routingNumber] = check.routing_number
-        
+
         # The account number of the consumer’s bank account.  Required for both Canadian and US dollar EFT transactions.
         post[:accountNumber] = check.account_number
       end
-      
+
       def add_secure_profile_variables(post, options = {})
         post[:serviceVersion] = SP_SERVICE_VERSION
         post[:responseFormat] = 'QS'
         post[:cardValidation] = (options[:cardValidation].to_i == 1) || '0'
-        
+
         post[:operationType] = options[:operationType] || options[:operation] || secure_profile_action(:new)
         post[:customerCode] = options[:billing_id] || options[:vault_id] || false
         post[:status] = options[:status]
       end
-      
+
       def add_recurring_amount(post, money)
         post[:amount] = amount(money)
       end
@@ -293,14 +292,14 @@ module ActiveMerchant #:nodoc:
             results[key.to_sym] = val.nil? ? nil : CGI.unescape(val)
           end
         end
-        
+
         # Clean up the message text if there is any
         if results[:messageText]
           results[:messageText].gsub!(/<LI>/, "")
           results[:messageText].gsub!(/(\.)?<br>/, ". ")
           results[:messageText].strip!
         end
-        
+
         results
       end
 
@@ -314,7 +313,7 @@ module ActiveMerchant #:nodoc:
       def commit(params, use_profile_api = false)
         post(post_data(params,use_profile_api),use_profile_api)
       end
-      
+
       def recurring_commit(params)
         recurring_post(post_data(params, false))
       end
@@ -329,7 +328,7 @@ module ActiveMerchant #:nodoc:
           :avs_result => { :code => (AVS_CODES.include? response[:avsId]) ? AVS_CODES[response[:avsId]] : response[:avsId] }
         )
       end
-      
+
       def recurring_post(data)
         response = recurring_parse(ssl_post(RECURRING_URL, data))
         build_response(recurring_success?(response), recurring_message_from(response), response)
@@ -350,7 +349,7 @@ module ActiveMerchant #:nodoc:
       def success?(response)
         response[:responseType] == 'R' || response[:trnApproved] == '1' || response[:responseCode] == '1'
       end
-      
+
       def recurring_success?(response)
         response[:code] == '1'
       end
@@ -362,24 +361,24 @@ module ActiveMerchant #:nodoc:
           card_brand(source) == "check" ? add_check(post, source) : add_credit_card(post, source)
         end
       end
-      
+
       def add_transaction_type(post, action)
         post[:trnType] = TRANSACTIONS[action]
       end
-          
+
       def post_data(params, use_profile_api)
         params[:requestType] = 'BACKEND'
         if use_profile_api
-          params[:merchantId] = @options[:login] 
+          params[:merchantId] = @options[:login]
           params[:passCode] = @options[:secure_profile_api_key]
         else
           params[:username] = @options[:user] if @options[:user]
           params[:password] = @options[:password] if @options[:password]
-          params[:merchant_id] = @options[:login]     
+          params[:merchant_id] = @options[:login]
         end
         params[:vbvEnabled] = '0'
         params[:scEnabled] = '0'
-        
+
         params.reject{|k, v| v.blank?}.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
       end