activemerchant 1.83.0 → 1.84.0

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

@@ -318,7 +318,7 @@ module ActiveMerchant #:nodoc:
       def authorize_response_map(body)
         lines = split_lines(body)
         keys, values = split_line(lines[0]), split_line(lines[1])
-        Hash[*(keys.zip(values).flatten)].symbolize_keys
+        Hash[*keys.zip(values).flatten].symbolize_keys
       end
 
       def parse_authorization_response(body)
@@ -333,7 +333,7 @@ module ActiveMerchant #:nodoc:
         keys = [ :szSerialNumber, :szErrorCode, :szNumberRecords]
         values = split_line(lines[0])[0..2]
 
-        result = Hash[*(keys.zip(values).flatten)]
+        result = Hash[*keys.zip(values).flatten]
 
         result[:szErrorMessage] = ''
         result[:success] = (result[:szErrorCode] == '0')

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

@@ -106,7 +106,6 @@ module ActiveMerchant #:nodoc:
         commit('update', nil, post)
       end
 
-
       def delete(vault_id)
         post = {}
         post[:customer_vault] = 'delete_customer'
@@ -128,6 +127,7 @@ module ActiveMerchant #:nodoc:
       alias_method :unstore, :delete
 
       private
+
       def add_customer_data(post, options)
         if options.has_key? :email
           post[:email] = options[:email]
@@ -237,7 +237,6 @@ module ActiveMerchant #:nodoc:
           :cvv_result => response['cvvresponse'],
           :avs_result => { :code => response['avsresponse'] }
         )
-
       end
 
       def expdate(creditcard)
@@ -247,7 +246,6 @@ module ActiveMerchant #:nodoc:
         "#{month}#{year[-2..-1]}"
       end
 
-
       def message_from(response)
         case response['responsetext']
         when 'SUCCESS', 'Approved', nil # This is dubious, but responses from UPDATE are nil.
@@ -272,7 +270,7 @@ module ActiveMerchant #:nodoc:
       def determine_funding_source(source)
         case
         when source.is_a?(String) then :vault
-        when CreditCard.card_companies.keys.include?(card_brand(source)) then :credit_card
+        when CreditCard.card_companies.include?(card_brand(source)) then :credit_card
         when card_brand(source) == 'check' then :check
         else raise ArgumentError, 'Unsupported funding source provided'
         end

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

@@ -10,7 +10,7 @@ module ActiveMerchant #:nodoc:
         'MT', 'NL', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'SE', 'GB',
         'IS', 'NO', 'CH'
       ]
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :maestro, :jcb, :solo, :diners_club]
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :maestro, :jcb, :diners_club]
       self.homepage_url = 'http://www.soeasypay.com/'
       self.display_name = 'SoEasyPay'
 
@@ -162,10 +162,10 @@ module ActiveMerchant #:nodoc:
         response_string = ssl_post(test? ? self.test_url : self.live_url, soap, headers)
         response = parse(response_string, soap_action)
         return Response.new(response['errorcode'] == '000',
-                            response['errormessage'],
-                            response,
-                            :test => test?,
-                            :authorization => response['transaction_id'])
+          response['errormessage'],
+          response,
+          :test => test?,
+          :authorization => response['transaction_id'])
       end
 
       def build_soap(request)

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

@@ -88,7 +88,6 @@ module ActiveMerchant #:nodoc:
         commit("transactions/#{authorization}/void.xml", '')
       end
 
-
       # Public: Determine whether a credit card is chargeable card and available for purchases.
       #
       # payment_method - The CreditCard or the Spreedly payment method token.
@@ -231,7 +230,7 @@ module ActiveMerchant #:nodoc:
 
         doc = Nokogiri::XML(xml)
         doc.root.xpath('*').each do |node|
-          if (node.elements.empty?)
+          if node.elements.empty?
             response[node.name.downcase.to_sym] = node.text
           else
             node.elements.each do |childnode|

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

@@ -136,6 +136,7 @@ module ActiveMerchant #:nodoc:
       def void(identification, options = {})
         post = {}
         post[:metadata] = options[:metadata] if options[:metadata]
+        post[:reason] = options[:reason] if options[:reason]
         post[:expand] = [:charge]
         commit(:post, "charges/#{CGI.escape(identification)}/refunds", post, options)
       end
@@ -323,6 +324,7 @@ module ActiveMerchant #:nodoc:
         add_application_fee(post, options)
         add_exchange_rate(post, options)
         add_destination(post, options)
+        add_level_three(post, options)
         post
       end
 
@@ -348,6 +350,21 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_level_three(post, options)
+        level_three = {}
+
+        copy_when_present(level_three, [:merchant_reference], options)
+        copy_when_present(level_three, [:customer_reference], options)
+        copy_when_present(level_three, [:shipping_address_zip], options)
+        copy_when_present(level_three, [:shipping_from_zip], options)
+        copy_when_present(level_three, [:shipping_amount], options)
+        copy_when_present(level_three, [:line_items], options)
+
+        unless level_three.empty?
+          post[:level3] = level_three
+        end
+      end
+
       def add_expand_parameters(post, options)
         post[:expand] ||= []
         post[:expand].concat(Array.wrap(options[:expand]).map(&:to_sym)).uniq!
@@ -490,25 +507,39 @@ module ActiveMerchant #:nodoc:
 
       def post_data(params)
         return nil unless params
+        flatten_params([], params).join('&')
+      end
 
-        params.map do |key, value|
+      def flatten_params(flattened, params, prefix = nil)
+        params.each do |key, value|
           next if value != false && value.blank?
+          flattened_key = prefix.nil? ? key : "#{prefix}[#{key}]"
           if value.is_a?(Hash)
-            h = {}
-            value.each do |k, v|
-              h["#{key}[#{k}]"] = v unless v.blank?
-            end
-            post_data(h)
+            flatten_params(flattened, value, flattened_key)
           elsif value.is_a?(Array)
-            value.map { |v| "#{key}[]=#{CGI.escape(v.to_s)}" }.join('&')
+            flatten_array(flattened, value, flattened_key)
+          else
+            flattened << "#{flattened_key}=#{CGI.escape(value.to_s)}"
+          end
+        end
+        flattened
+      end
+
+      def flatten_array(flattened, array, prefix)
+        array.each_with_index do |item, idx|
+          key = "#{prefix}[#{idx}]"
+          if item.is_a?(Hash)
+            flatten_params(flattened, item, key)
+          elsif item.is_a?(Array)
+            flatten_array(flattened, item, key)
           else
-            "#{key}=#{CGI.escape(value.to_s)}"
+            flattened << "#{key}=#{CGI.escape(item.to_s)}"
           end
-        end.compact.join('&')
+        end
       end
 
       def headers(options = {})
-        key     = options[:key] || @api_key
+        key = options[:key] || @api_key
         idempotency_key = options[:idempotency_key]
 
         headers = {
@@ -589,11 +620,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def response_error(raw_response)
-        begin
-          parse(raw_response)
-        rescue JSON::ParserError
-          json_error(raw_response)
-        end
+        parse(raw_response)
+      rescue JSON::ParserError
+        json_error(raw_response)
       end
 
       def json_error(raw_response)
@@ -682,6 +711,22 @@ module ActiveMerchant #:nodoc:
         return 100 unless options[:currency]
         return MINIMUM_AUTHORIZE_AMOUNTS[options[:currency].upcase] || 100
       end
+
+      def copy_when_present(dest, dest_path, source, source_path = nil)
+        source_path ||= dest_path
+        source_path.each do |key|
+          return nil unless source[key]
+          source = source[key]
+        end
+
+        if source
+          dest_path.first(dest_path.size - 1).each do |key|
+            dest[key] ||= {}
+            dest = dest[key]
+          end
+          dest[dest_path.last] = source
+        end
+      end
     end
   end
 end

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

@@ -11,7 +11,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['AE', 'IN', 'SA']
       self.default_currency = 'AED'
       self.money_format = :dollars
-      self.supported_cardtypes = [:visa, :master, :american_express, :maestro, :solo, :jcb]
+      self.supported_cardtypes = [:visa, :master, :american_express, :maestro, :jcb]
 
       CVC_CODE_TRANSLATOR = {
         'Y' => 'M',
@@ -87,9 +87,9 @@ module ActiveMerchant #:nodoc:
 
       def scrub(transcript)
         transcript.
-        gsub(%r((<Number>)[^<]+(<))i, '\1[FILTERED]\2').
-        gsub(%r((<CVV>)[^<]+(<))i, '\1[FILTERED]\2').
-        gsub(%r((<Key>)[^<]+(<))i, '\1[FILTERED]\2')
+          gsub(%r((<Number>)[^<]+(<))i, '\1[FILTERED]\2').
+          gsub(%r((<CVV>)[^<]+(<))i, '\1[FILTERED]\2').
+          gsub(%r((<Key>)[^<]+(<))i, '\1[FILTERED]\2')
       end
 
       private
@@ -190,7 +190,6 @@ module ActiveMerchant #:nodoc:
       def build_xml_request
         builder = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
           xml.remote do |doc|
-
             add_authentication(doc)
             yield(doc)
           end
@@ -220,7 +219,7 @@ module ActiveMerchant #:nodoc:
             response[node.name.downcase.to_sym] = node.text
           else
             node.elements.each do |childnode|
-              name = "#{childnode.name.downcase}"
+              name = childnode.name.downcase
               response[name.to_sym] = childnode.text
             end
           end

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

@@ -15,7 +15,7 @@ module ActiveMerchant
       self.homepage_url = 'http://www.tnsi.com/'
       self.supported_countries = %w(AR AU BR FR DE HK MX NZ SG GB US)
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb, :maestro, :laser]
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb, :maestro]
 
     end
   end

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

@@ -1,5 +1,4 @@
 module ActiveMerchant #:nodoc:
-
   module Billing #:nodoc:
     class TransFirstGateway < Gateway
       self.test_url = 'https://ws.cert.transfirst.com'

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

@@ -90,6 +90,7 @@ module ActiveMerchant #:nodoc:
           gsub(/(number\\?":\\?")(\d*)/, '\1[FILTERED]').
           gsub(/(cvc\\?":\\?")(\d*)/, '\1[FILTERED]')
       end
+
       private
 
       def add_amount(post, money, options)
@@ -170,11 +171,11 @@ module ActiveMerchant #:nodoc:
       
         response = body['response']
         Response.new(
-         true,
-         response['status_message'],
-         body,
-         authorization: token(response),
-         test: test?
+          true,
+          response['status_message'],
+          body,
+          authorization: token(response),
+          test: test?
         )
       end
 

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

@@ -304,6 +304,7 @@ module ActiveMerchant #:nodoc:
       end
 
       private
+
       def add_payment_source(params, source)
         if source.is_a?(String)
           add_billing_id(params, source)

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

@@ -1563,12 +1563,12 @@ module ActiveMerchant #:nodoc:
 
         success, message, authorization, avs, cvv = false, FAILURE_MESSAGE, nil, nil, nil
 
-        fault = (!response) || (response.length < 1) || response.has_key?('faultcode')
+        fault = !response || (response.length < 1) || response.has_key?('faultcode')
         return [response, success, response['faultstring'], authorization, avs, cvv] if fault
 
         if response.respond_to?(:[]) && p = response["#{action}_return"]
           if p.respond_to?(:key?) && p.key?('result_code')
-            success = p['result_code'] == 'A' ? true : false
+            success = p['result_code'] == 'A'
             authorization = p['ref_num']
             avs = AVS_RESULTS[p['avs_result_code']]
             cvv = p['card_code_result_code']

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

@@ -1,6 +1,5 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-
     class UsaEpayTransactionGateway < Gateway
       self.live_url = 'https://www.usaepay.com/gate'
       self.test_url = 'https://sandbox.usaepay.com/gate'

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

@@ -52,7 +52,7 @@ module ActiveMerchant
 
         doc = Nokogiri::XML(xml)
         doc.root.xpath('*').each do |node|
-          if (node.elements.empty?)
+          if node.elements.empty?
             response[node.name.downcase.to_sym] = node.text
           else
             node.elements.each do |childnode|

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

@@ -63,6 +63,7 @@ module ActiveMerchant #:nodoc:
       end
 
       private
+
       def add_test_mode(form, options)
         form[:test_mode] = 'TRUE' if options[:test_mode]
       end

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

@@ -140,24 +140,22 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, params, options={})
-        begin
-          raw_response = ssl_request(method(action), url(action, params, options), params.to_json, headers)
-          response = parse(raw_response)
-        rescue ResponseError => e
-          raw_response = e.response.body
-          response_error(raw_response, options, action)
-        rescue JSON::ParserError
-          unparsable_response(raw_response)
-        else
-          Response.new(
-            success_from(response),
-            message_from(response, options, action),
-            response,
-            :test => test?,
-            :authorization => authorization_from(params, response, options),
-            :error_code => response['errorCode']
-          )
-        end
+        raw_response = ssl_request(method(action), url(action, params, options), params.to_json, headers)
+        response = parse(raw_response)
+      rescue ResponseError => e
+        raw_response = e.response.body
+        response_error(raw_response, options, action)
+      rescue JSON::ParserError
+        unparsable_response(raw_response)
+      else
+        Response.new(
+          success_from(response),
+          message_from(response, options, action),
+          response,
+          :test => test?,
+          :authorization => authorization_from(params, response, options),
+          :error_code => response['errorCode']
+        )
       end
 
       def headers
@@ -211,20 +209,18 @@ module ActiveMerchant #:nodoc:
       end
 
       def response_error(raw_response, options, action)
-        begin
-          response = parse(raw_response)
-        rescue JSON::ParserError
-          unparsable_response(raw_response)
-        else
-          return Response.new(
-            false,
-            message_from(response, options, action),
-            response,
-            :test => test?,
-            :authorization => response['transactionUUID'],
-            :error_code => response['errorCode']
-          )
-        end
+        response = parse(raw_response)
+      rescue JSON::ParserError
+        unparsable_response(raw_response)
+      else
+        return Response.new(
+          false,
+          message_from(response, options, action),
+          response,
+          :test => test?,
+          :authorization => response['transactionUUID'],
+          :error_code => response['errorCode']
+        )
       end
 
       def unparsable_response(raw_response)

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

@@ -190,7 +190,6 @@ module ActiveMerchant #:nodoc:
           authorization: authorization_from(response, params),
           test: test?
         )
-
       rescue JSON::ParserError
         return unparsable_response(response)
       end

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

@@ -26,7 +26,7 @@ module ActiveMerchant #:nodoc:
       # number 5551234 within area code 202 (country code 1).
       VALID_PHONE_FORMAT = /\+\d{1,3}(\(?\d{3}\)?)?\d{3}-\d{4}-\d{3}/
 
-      self.supported_cardtypes = [ :visa, :master, :american_express, :diners_club, :jcb, :switch ]
+      self.supported_cardtypes = [ :visa, :master, :american_express, :diners_club, :jcb ]
       self.supported_countries = %w(AD CY GI IM MT RO CH AT DK GR IT MC SM TR BE EE HU LV NL SK GB BG FI IS LI NO SI VA FR IL LT PL ES CZ DE IE LU PT SE)
       self.homepage_url = 'http://www.wirecard.com'
       self.display_name = 'Wirecard'
@@ -138,6 +138,7 @@ module ActiveMerchant #:nodoc:
       end
 
       private
+
       def clean_description(description)
         description.to_s.slice(0,32).encode('US-ASCII', invalid: :replace, undef: :replace, replace: '?')
       end