activemerchant 1.101.0 → 1.102.0

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

@@ -62,7 +62,7 @@ module ActiveMerchant #:nodoc:
           post[:address1] = address[:address1].to_s
           post[:address2] = address[:address2].to_s
           post[:city]     = address[:city].to_s
-          post[:state]    = (address[:state].blank?  ? 'n/a' : address[:state])
+          post[:state]    = (address[:state].blank? ? 'n/a' : address[:state])
           post[:zip]      = address[:zip].to_s
           post[:country]  = address[:country].to_s
           post[:phone]    = address[:phone].to_s
@@ -78,7 +78,7 @@ module ActiveMerchant #:nodoc:
           post[:shipping_address2]  = address[:address2].to_s
           post[:shipping_city]      = address[:city].to_s
           post[:shipping_country]   = address[:country].to_s
-          post[:shipping_state]     = (address[:state].blank?  ? 'n/a' : address[:state])
+          post[:shipping_state]     = (address[:state].blank? ? 'n/a' : address[:state])
           post[:shipping_zip]       = address[:zip].to_s
           post[:shipping_email]     = address[:email].to_s
         end

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

@@ -128,7 +128,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_token(post, token)
-        post[:fp] = 't'    # turn on "future payments" - what paystation calls Token Billing
+        post[:fp] = 't' # turn on "future payments" - what paystation calls Token Billing
         post[:ft] = token
       end
 

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

@@ -154,20 +154,21 @@ module ActiveMerchant #:nodoc:
 
       def clean(value, format, maxlength)
         value ||= ''
-        value = case format
-        when :alphanumeric
-          value.gsub(/[^A-Za-z0-9]/, '')
-        when :name
-          value.gsub(/[^A-Za-z ]/, '')
-        when :numeric
-          value.gsub(/[^0-9]/, '')
-        when :text
-          value.gsub(/[^A-Za-z0-9@\-_\/\. ]/, '')
-        when nil
-          value
-        else
-          raise "Unknown format #{format} for #{value}"
-        end
+        value =
+          case format
+          when :alphanumeric
+            value.gsub(/[^A-Za-z0-9]/, '')
+          when :name
+            value.gsub(/[^A-Za-z ]/, '')
+          when :numeric
+            value.gsub(/[^0-9]/, '')
+          when :text
+            value.gsub(/[^A-Za-z0-9@\-_\/\. ]/, '')
+          when nil
+            value
+          else
+            raise "Unknown format #{format} for #{value}"
+          end
         value[0...maxlength]
       end
 

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

@@ -219,7 +219,7 @@ module ActiveMerchant
 
       def add_customer_data(post, options)
         post[:email] = options[:email]
-        post[:dontsndmail]        = 'yes' unless options[:send_email_confirmation]
+        post[:dontsndmail] = 'yes' unless options[:send_email_confirmation]
         post[:ipaddress] = options[:ip]
       end
 
@@ -256,7 +256,7 @@ module ActiveMerchant
             post[:state] = shipping_address[:state]
           else
             post[:state] = 'ZZ'
-            post[:province]  = shipping_address[:state]
+            post[:province] = shipping_address[:state]
           end
 
           post[:country] = shipping_address[:country]

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

@@ -253,7 +253,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(body)
-        results  = {}
+        results = {}
         xml = Nokogiri::XML(body)
         resp = xml.xpath('//XMLResponse/XMLTrans')
         resp.children.each do |element|

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

@@ -211,7 +211,7 @@ module ActiveMerchant
 
       def add_purchase_details(post)
         post[:EchoAmount] = 'YES'
-        post[:SCBI] = 'YES'                   # Return information about the transaction
+        post[:SCBI] = 'YES' # Return information about the transaction
         post[:MessageType] = MESSAGE_TYPE
       end
 

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

@@ -102,7 +102,7 @@ module ActiveMerchant #:nodoc:
 
       def build_purchase_request(money, creditcard, options)
         xml = Builder::XmlMarkup.new
-        add_common_credit_card_info(xml, @options[:ignore_avs] ||  @options[:ignore_cvv] ? 'SALES' : 'AUTH_CAPTURE')
+        add_common_credit_card_info(xml, @options[:ignore_avs] || @options[:ignore_cvv] ? 'SALES' : 'AUTH_CAPTURE')
         add_address(xml, creditcard, options[:billing_address], options)
         add_purchase_data(xml, money)
         add_creditcard(xml, creditcard)

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

@@ -11,7 +11,7 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'http://payments.intuit.com'
       self.display_name = 'QuickBooks Payments'
       BASE = '/quickbooks/v4/payments'
-      ENDPOINT =  "#{BASE}/charges"
+      ENDPOINT = "#{BASE}/charges"
       VOID_ENDPOINT = "#{BASE}/txn-requests"
       REFRESH_URI = 'https://oauth.platform.intuit.com/oauth2/v1/tokens/bearer'
 
@@ -42,7 +42,7 @@ module ActiveMerchant #:nodoc:
         'PMT-5001' => STANDARD_ERROR_CODE[:card_declined],      # Merchant does not support given payment method
 
         # System Error
-        'PMT-6000' => STANDARD_ERROR_CODE[:processing_error],   # A temporary Issue prevented this request from being processed.
+        'PMT-6000' => STANDARD_ERROR_CODE[:processing_error], # A temporary Issue prevented this request from being processed.
       }
 
       FRAUD_WARNING_CODES = ['PMT-1000', 'PMT-1001', 'PMT-1002', 'PMT-1003']
@@ -68,7 +68,7 @@ module ActiveMerchant #:nodoc:
         post[:capture] = 'true'
 
         response = commit(ENDPOINT, post)
-        check_token_response(response, ENDPOINT, post)
+        check_token_response(response, ENDPOINT, post, options)
       end
 
       def authorize(money, payment, options = {})
@@ -78,7 +78,7 @@ module ActiveMerchant #:nodoc:
         post[:capture] = 'false'
 
         response = commit(ENDPOINT, post)
-        check_token_response(response, ENDPOINT, post)
+        check_token_response(response, ENDPOINT, post, options)
       end
 
       def capture(money, authorization, options = {})
@@ -88,7 +88,7 @@ module ActiveMerchant #:nodoc:
         add_context(post, options)
 
         response = commit(capture_uri(authorization), post)
-        check_token_response(response, capture_uri(authorization), post)
+        check_token_response(response, capture_uri(authorization), post, options)
       end
 
       def refund(money, authorization, options = {})
@@ -98,20 +98,25 @@ module ActiveMerchant #:nodoc:
         authorization, _ = split_authorization(authorization)
 
         response = commit(refund_uri(authorization), post)
-        check_token_response(response, refund_uri(authorization), post)
+        check_token_response(response, refund_uri(authorization), post, options)
       end
 
       def void(authorization, options = {})
         _, request_id = split_authorization(authorization)
 
         response = commit(void_uri(request_id))
-        check_token_response(response, void_uri(request_id))
+        check_token_response(response, void_uri(request_id), {}, options)
       end
 
       def verify(credit_card, options = {})
         authorize(1.00, credit_card, options)
       end
 
+      def refresh
+        response = refresh_access_token
+        response_object(response)
+      end
+
       def supports_scrubbing?
         true
       end
@@ -276,8 +281,9 @@ module ActiveMerchant #:nodoc:
         }
       end
 
-      def check_token_response(response, endpoint, body = {})
+      def check_token_response(response, endpoint, body = {}, options = {})
         return response unless @options[:refresh_token]
+        return response unless options[:allow_refresh]
         return response unless response.params['code'] == 'AuthenticationFailed'
         refresh_access_token
         commit(endpoint, body)
@@ -297,10 +303,11 @@ module ActiveMerchant #:nodoc:
         }
 
         response = ssl_post(REFRESH_URI, data, headers)
-        response = JSON.parse(response)
+        json_response = JSON.parse(response)
 
-        @options[:access_token] = response['access_token'] if response['access_token']
-        @options[:refresh_token] = response['refresh_token'] if response['refresh_token']
+        @options[:access_token] = json_response['access_token'] if json_response['access_token']
+        @options[:refresh_token] = json_response['refresh_token'] if json_response['refresh_token']
+        response
       end
 
       def cvv_code_from(response)
@@ -314,7 +321,7 @@ module ActiveMerchant #:nodoc:
       def success?(response)
         return FRAUD_WARNING_CODES.concat(['0']).include?(response['errors'].first['code']) if response['errors']
 
-        !['DECLINED', 'CANCELLED'].include?(response['status'])
+        !['DECLINED', 'CANCELLED'].include?(response['status']) && !['AuthenticationFailed'].include?(response['code'])
       end
 
       def message_from(response)

data/lib/active_merchant/billing/gateways/quickpay/quickpay_v10.rb

@@ -204,7 +204,7 @@ module ActiveMerchant
       end
 
       def add_credit_card_or_reference(post, credit_card_or_reference, options = {})
-        post[:card]             ||= {}
+        post[:card] ||= {}
         if credit_card_or_reference.is_a?(String)
           post[:card][:token] = credit_card_or_reference
         else

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

@@ -373,9 +373,9 @@ module ActiveMerchant #:nodoc:
 
       def build_signature(data)
         str = data[:amount] +
-          data[:order_id].to_s +
-          @options[:login].to_s +
-          data[:currency]
+              data[:order_id].to_s +
+              @options[:login].to_s +
+              data[:currency]
 
         if card = data[:card]
           str << card[:pan]
@@ -495,14 +495,14 @@ module ActiveMerchant #:nodoc:
           sig.casecmp(data[:ds_signature].to_s).zero?
         else
           str = data[:ds_amount] +
-            data[:ds_order].to_s +
-            data[:ds_merchantcode] +
-            data[:ds_currency] +
-            data[:ds_response] +
-            data[:ds_cardnumber].to_s +
-            data[:ds_transactiontype].to_s +
-            data[:ds_securepayment].to_s +
-            @options[:secret_key]
+                data[:ds_order].to_s +
+                data[:ds_merchantcode] +
+                data[:ds_currency] +
+                data[:ds_response] +
+                data[:ds_cardnumber].to_s +
+                data[:ds_transactiontype].to_s +
+                data[:ds_securepayment].to_s +
+                @options[:secret_key]
 
           sig = Digest::SHA1.hexdigest(str)
           data[:ds_signature].to_s.downcase == sig
@@ -591,7 +591,7 @@ module ActiveMerchant #:nodoc:
 
       def xml_signed_fields(data)
         xml_signed_fields = data[:ds_amount] + data[:ds_order] + data[:ds_merchantcode] +
-          data[:ds_currency] + data[:ds_response]
+                            data[:ds_currency] + data[:ds_response]
 
         xml_signed_fields += data[:ds_cardnumber] if data[:ds_cardnumber]
 

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

@@ -180,7 +180,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(body)
-        results  = {}
+        results = {}
         xml = Nokogiri::XML(body)
         resp = xml.xpath('//Response/Transaction/Identification')
         resp.children.each do |element|

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

@@ -146,9 +146,9 @@ module ActiveMerchant #:nodoc:
           post[:sg_Address] = address[:address1] if address[:address1]
           post[:sg_City] = address[:city] if address[:city]
           post[:sg_State] = address[:state]  if address[:state]
-          post[:sg_Zip] = address[:zip]  if address[:zip]
-          post[:sg_Country] = address[:country]  if address[:country]
-          post[:sg_Phone] = address[:phone]  if address[:phone]
+          post[:sg_Zip] = address[:zip] if address[:zip]
+          post[:sg_Country] = address[:country] if address[:country]
+          post[:sg_Phone] = address[:phone] if address[:phone]
         end
 
         post[:sg_Email] = options[:email]

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'Sage Payment Solutions'
       self.live_url = 'https://www.sagepayments.net/cgi-bin'
 
-      self.supported_countries =  ['US', 'CA']
+      self.supported_countries = ['US', 'CA']
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners_club]
 
       TRANSACTIONS = {
@@ -20,7 +20,7 @@ module ActiveMerchant #:nodoc:
       }
 
       SOURCE_CARD   = 'bankcard'
-      SOURCE_ECHECK =  'virtual_check'
+      SOURCE_ECHECK = 'virtual_check'
 
       def initialize(options = {})
         requires!(options, :login, :password)
@@ -115,7 +115,7 @@ module ActiveMerchant #:nodoc:
       # use the same method as in pay_conex
       def force_utf8(string)
         return nil unless string
-        binary = string.encode('BINARY', invalid: :replace, undef: :replace, replace: '?')   # Needed for Ruby 2.0 since #encode is a no-op if the string is already UTF-8. It's not needed for Ruby 2.1 and up since it's not a no-op there.
+        binary = string.encode('BINARY', invalid: :replace, undef: :replace, replace: '?') # Needed for Ruby 2.0 since #encode is a no-op if the string is already UTF-8. It's not needed for Ruby 2.1 and up since it's not a no-op there.
         binary.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?')
       end
 
@@ -227,7 +227,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_addresses(post, options)
-        billing_address   = options[:billing_address] || options[:address] || {}
+        billing_address = options[:billing_address] || options[:address] || {}
 
         post[:C_address]    = billing_address[:address1]
         post[:C_city]       = billing_address[:city]

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

@@ -379,11 +379,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_url(action)
-        endpoint = case action
-        when :purchase, :authorization then 'vspdirect-register'
-        when :store then 'directtoken'
-        else TRANSACTIONS[action].downcase
-        end
+        endpoint =
+          case action
+          when :purchase, :authorization then 'vspdirect-register'
+          when :store then 'directtoken'
+          else TRANSACTIONS[action].downcase
+          end
         "#{test? ? self.test_url : self.live_url}/#{endpoint}.vsp"
       end
 
@@ -393,7 +394,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def message_from(response)
-        response['Status'] == APPROVED ? 'Success' : (response['StatusDetail'] || 'Unspecified error')    # simonr 20080207 can't actually get non-nil blanks, so this is shorter
+        response['Status'] == APPROVED ? 'Success' : (response['StatusDetail'] || 'Unspecified error') # simonr 20080207 can't actually get non-nil blanks, so this is shorter
       end
 
       def post_data(action, parameters = {})

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

@@ -157,7 +157,7 @@ module ActiveMerchant #:nodoc:
             xml.tag! 'FIRSTNAME', creditcard.first_name
             xml.tag! 'LASTNAME', creditcard.last_name
             xml.tag! 'PHONE', address[:phone].to_s
-            xml.tag! 'STATE', address[:state].blank?  ? 'n/a' : address[:state]
+            xml.tag! 'STATE', address[:state].blank? ? 'n/a' : address[:state]
             xml.tag! 'ZIP', address[:zip].to_s
           end
         end
@@ -178,7 +178,7 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'LASTNAME', address[:last_name].to_s
             end
 
-            xml.tag! 'STATE', address[:state].blank?  ? 'n/a' : address[:state]
+            xml.tag! 'STATE', address[:state].blank? ? 'n/a' : address[:state]
             xml.tag! 'ZIP', address[:zip].to_s
           end
         else

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

@@ -159,7 +159,7 @@ module ActiveMerchant #:nodoc:
           post[:zip]     = address[:zip].to_s
           post[:city]    = address[:city].to_s
           post[:country] = address[:country].to_s
-          post[:state]   = address[:state].blank?  ? 'n/a' : address[:state]
+          post[:state]   = address[:state].blank? ? 'n/a' : address[:state]
         end
 
         if address = options[:shipping_address]
@@ -171,7 +171,7 @@ module ActiveMerchant #:nodoc:
           post[:ship_to_zip]     = address[:zip].to_s
           post[:ship_to_city]    = address[:city].to_s
           post[:ship_to_country] = address[:country].to_s
-          post[:ship_to_state]   = address[:state].blank?  ? 'n/a' : address[:state]
+          post[:ship_to_state]   = address[:state].blank? ? 'n/a' : address[:state]
         end
       end
 

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

@@ -375,7 +375,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_creditcard(post, creditcard)
-        post[:AccountNumber]  = creditcard.number
+        post[:AccountNumber] = creditcard.number
         post[:Month] = creditcard.month
         post[:Year] = creditcard.year
         post[:CVV2] = creditcard.verification_value if creditcard.verification_value?

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

@@ -144,7 +144,7 @@ module ActiveMerchant #:nodoc:
           post[prefix+'zip']        = address[:zip].to_s
           post[prefix+'city']       = address[:city].to_s
           post[prefix+'country']    = address[:country].to_s
-          post[prefix+'state']      = address[:state].blank?  ? 'n/a' : address[:state]
+          post[prefix+'state']      = address[:state].blank? ? 'n/a' : address[:state]
         end
       end
 
@@ -181,9 +181,9 @@ module ActiveMerchant #:nodoc:
           post[:customer_vault] = 'add_customer'
           post[:customer_vault_id] = options[:store] unless options[:store] == true
         end
-        post[:ccnumber]  = creditcard.number
+        post[:ccnumber] = creditcard.number
         post[:cvv] = creditcard.verification_value if creditcard.verification_value?
-        post[:ccexp]  = expdate(creditcard)
+        post[:ccexp] = expdate(creditcard)
         post[:firstname] = creditcard.first_name
         post[:lastname]  = creditcard.last_name
       end
@@ -225,7 +225,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, money, parameters)
-        parameters[:amount]  = localized_amount(money, parameters[:currency] || default_currency) if money
+        parameters[:amount] = localized_amount(money, parameters[:currency] || default_currency) if money
         response = parse(ssl_post(self.live_url, post_data(action, parameters)))
         Response.new(response['response'] == '1', message_from(response), response,
           :authorization => (response['transactionid'] || response['customer_vault_id']),
@@ -255,7 +255,7 @@ module ActiveMerchant #:nodoc:
 
       def post_data(action, parameters = {})
         post = {}
-        post[:username]      = @options[:login]
+        post[:username] = @options[:login]
         post[:password]   = @options[:password]
         post[:type]       = action if action