activemerchant 1.83.0 → 1.84.0

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

@@ -27,14 +27,13 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_amount(post, amount)
         add_invoice(post, amount, options)
-        if (payment_method.respond_to?(:number))
+        if payment_method.respond_to?(:number)
           add_payment_method(post, payment_method, options)
           commit(:authorize, post)
         else
           add_ticket_id(post, payment_method)
           commit(:authorize_ticket, post)
         end
-
       end
 
       def capture(amount, authorization, options={})
@@ -110,15 +109,10 @@ module ActiveMerchant #:nodoc:
         post[:cvc] = payment_method.verification_value if payment_method.verification_value
         post[:expYear] = format(payment_method.year, :two_digits)
         post[:expMonth] = payment_method.month
-
-        post[:startMonth] = payment_method.start_month if payment_method.start_month
-        post[:startYear] = payment_method.start_year if payment_method.start_year
-        post[:issueNumber] = payment_method.issue_number if payment_method.issue_number
         post[:clientIp] = options[:ip] || '127.0.0.1'
         post[:test] = true if test?
       end
 
-
       def add_reference(post, authorization)
         post[:transactionId] = authorization
       end

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

@@ -163,7 +163,7 @@ module ActiveMerchant #:nodoc:
         post[:data][:attributes] = {
           merchantId: options[:merchant_id],
           name: payment.name,
-          externalId: "#{SecureRandom.hex(16)}"
+          externalId: SecureRandom.hex(16)
         }
 
         post

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

@@ -2,7 +2,6 @@ require 'rexml/document'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-
     class EfsnetGateway < Gateway
       self.supported_countries = ['US']
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
@@ -143,7 +142,6 @@ module ActiveMerchant #:nodoc:
         post[:expiration_year]  = sprintf('%.4i', creditcard.year)[-2..-1]
       end
 
-
       def commit(action, parameters)
         response = parse(ssl_post(test? ? self.test_url : self.live_url, post_data(action, parameters), 'Content-Type' => 'text/xml'))
 
@@ -169,9 +167,7 @@ module ActiveMerchant #:nodoc:
         xml = REXML::Document.new(xml)
 
         xml.elements.each('//Reply//TransactionReply/*') do |node|
-
           response[node.name.underscore.to_sym] = normalize(node.text)
-
         end unless xml.root.nil?
 
         response

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

@@ -251,7 +251,7 @@ module ActiveMerchant #:nodoc:
         end
 
         root.each do |node|
-          if (node.elements.empty?)
+          if node.elements.empty?
             response[node.name.downcase] = node.text
           else
             node_name = node.name.downcase

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

@@ -120,7 +120,6 @@ module ActiveMerchant #:nodoc:
           gsub(%r((&?cvc=)\d*(&?)), '\1[FILTERED]\2')
       end
 
-
       private
 
       def add_amount(post, money, options)
@@ -164,16 +163,16 @@ module ActiveMerchant #:nodoc:
 
         if action == :authorize
           Response.new response['accept'].to_i == 1,
-                       response['errortext'],
-                       response,
-                       :test => test?,
-                       :authorization => response['tid']
+            response['errortext'],
+            response,
+            :test => test?,
+            :authorization => response['tid']
         else
           Response.new response['result'] == 'true',
-                       messages(response['epay'], response['pbs']),
-                       response,
-                       :test => test?,
-                       :authorization => params[:transaction]
+            messages(response['epay'], response['pbs']),
+            response,
+            :test => test?,
+            :authorization => params[:transaction]
         end
       end
 

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

@@ -64,6 +64,7 @@ module ActiveMerchant #:nodoc:
       end
 
       private
+
       def requires_address!(options)
         raise ArgumentError.new('Missing eWay required parameters: address or billing_address') unless (options.has_key?(:address) or options.has_key?(:billing_address))
       end

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

@@ -136,7 +136,6 @@ module ActiveMerchant #:nodoc:
         post[:invoiceDescription] = options[:description]
       end
 
-
       # add credit card details to be stored by eway. NOTE eway requires "title" field
       def add_creditcard(post, creditcard)
         post[:CCNumber]  = creditcard.number
@@ -253,9 +252,9 @@ module ActiveMerchant #:nodoc:
               end
             end
             xml.tag! 'soap12:Body' do |x|
-              x.tag! "#{action}", {'xmlns' => 'https://www.eway.com.au/gateway/managedpayment'} do |y|
+              x.tag! action, {'xmlns' => 'https://www.eway.com.au/gateway/managedpayment'} do |y|
                 post.each do |key, value|
-                  y.tag! "#{key}", "#{value}"
+                  y.tag! key, value
                 end
               end
             end

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

@@ -13,7 +13,6 @@ module ActiveMerchant #:nodoc:
                        :capture       => '32',
                        :credit        => '34' }
 
-
       ENVELOPE_NAMESPACES = { 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
                               'xmlns:env' => 'http://schemas.xmlsoap.org/soap/envelope/',
                               'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance'
@@ -169,7 +168,6 @@ module ActiveMerchant #:nodoc:
            :avs_result => { :code => response[:avs] },
            :cvv_result => response[:cvv2]
          )
-
       rescue ResponseError => e
         case e.response.code
         when '401'

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

@@ -191,6 +191,5 @@ module ActiveMerchant
         }
       end
     end
-
   end
 end

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

@@ -172,17 +172,15 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(response)
-        begin
-          JSON.parse(response)
-        rescue JSON::ParserError
-          msg = 'Invalid JSON response received from Fat Zebra. Please contact support@fatzebra.com.au if you continue to receive this message.'
-          msg += "  (The raw response returned by the API was #{response.inspect})"
-          {
-            'successful' => false,
-            'response' => {},
-            'errors' => [msg]
-          }
-        end
+        JSON.parse(response)
+      rescue JSON::ParserError
+        msg = 'Invalid JSON response received from Fat Zebra. Please contact support@fatzebra.com.au if you continue to receive this message.'
+        msg += "  (The raw response returned by the API was #{response.inspect})"
+        {
+          'successful' => false,
+          'response' => {},
+          'errors' => [msg]
+        }
       end
 
       def get_url(uri)

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

@@ -134,7 +134,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def test?
-        (@options[:login].eql?('demo')) && (@options[:password].eql?('password'))
+        @options[:login].eql?('demo') && @options[:password].eql?('password')
       end
 
       def message_from(response)

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

@@ -107,7 +107,7 @@ module ActiveMerchant #:nodoc:
           (response['friendlyErrorMessage'] || response['verboseErrorMessage'] || response['acknowledgement']),
           response,
           authorization: response['transactionId'],
-          test: test?,
+          test: test?
         )
       end
 
@@ -133,8 +133,8 @@ module ActiveMerchant #:nodoc:
       def headers
         {
           'User-Agent'        => "ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
-          'JG_APPLICATIONKEY' => "#{@options[:application_key]}",
-          'JG_SECURITYTOKEN'  => "#{@options[:security_token]}"
+          'JG_APPLICATIONKEY' => @options[:application_key].to_s,
+          'JG_SECURITYTOKEN'  => @options[:security_token].to_s
         }
       end
     end

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

@@ -134,6 +134,7 @@ module ActiveMerchant #:nodoc:
           message_from(response),
           response,
           authorization: authorization_from(response),
+          error_code: error_code_from(response),
           test: test?
         )
       end
@@ -151,6 +152,10 @@ module ActiveMerchant #:nodoc:
         msg.downcase.capitalize if msg
       end
 
+      def error_code_from(response)
+        response['error']
+      end
+
       def authorization_from(response)
         response['reference_number'] || response['reference_number1']
       end

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

@@ -43,7 +43,7 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'FirstData Global Gateway e4'
 
       STANDARD_ERROR_CODE_MAPPING = {
-      # Bank error codes: https://firstdata.zendesk.com/entries/471297-First-Data-Global-Gateway-e4-Bank-Response-Codes
+        # Bank error codes: https://firstdata.zendesk.com/entries/471297-First-Data-Global-Gateway-e4-Bank-Response-Codes
         '201' => STANDARD_ERROR_CODE[:incorrect_number],
         '531' => STANDARD_ERROR_CODE[:invalid_cvc],
         '503' => STANDARD_ERROR_CODE[:invalid_cvc],
@@ -55,7 +55,7 @@ module ActiveMerchant #:nodoc:
         '401' => STANDARD_ERROR_CODE[:call_issuer],
         '402' => STANDARD_ERROR_CODE[:call_issuer],
         '501' => STANDARD_ERROR_CODE[:pickup_card],
-      # Ecommerce error codes -- https://firstdata.zendesk.com/entries/451980-ecommerce-response-codes-etg-codes
+        # Ecommerce error codes -- https://firstdata.zendesk.com/entries/451980-ecommerce-response-codes-etg-codes
         '22' => STANDARD_ERROR_CODE[:invalid_number],
         '25' => STANDARD_ERROR_CODE[:invalid_expiry_date],
         '31' => STANDARD_ERROR_CODE[:incorrect_cvc],

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

@@ -30,7 +30,6 @@ module ActiveMerchant #:nodoc:
         'JPY' => 392
       }
 
-
       def initialize(options = {})
         requires!(options, :login, :password, :terminal_id, :merchant_id)
         super
@@ -223,10 +222,10 @@ module ActiveMerchant #:nodoc:
         success = success?(response)
 
         Response.new(success,
-                     success ? 'Approved' : "Declined (Reason: #{response[:reason_code]} - #{response[:error_msg]} - #{response[:sys_err_msg]})",
-                     response,
-                     :test => test?,
-                     :authorization => response[:order_id])
+          success ? 'Approved' : "Declined (Reason: #{response[:reason_code]} - #{response[:error_msg]} - #{response[:sys_err_msg]})",
+          response,
+          :test => test?,
+          :authorization => response[:order_id])
       end
 
       def parse(body)

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

@@ -239,14 +239,13 @@ module ActiveMerchant #:nodoc:
 
         succeeded = success_from(response)
         Response.new(
-        succeeded,
-        message_from(succeeded, response),
-        response,
-        authorization: authorization_from(succeeded, response),
-        error_code: error_code_from(succeeded, response),
-        test: test?
+          succeeded,
+          message_from(succeeded, response),
+          response,
+          authorization: authorization_from(succeeded, response),
+          error_code: error_code_from(succeeded, response),
+          test: test?
         )
-
       end
 
       def headers(action, post, authorization = nil)

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

@@ -165,7 +165,7 @@ module ActiveMerchant #:nodoc:
 
       def commit(action, parameters)
         response = parse(ssl_post(url(action), post_data(action, parameters),
-         { 'Content-Type' => 'application/soap+xml; charset=utf-8'}))
+          { 'Content-Type' => 'application/soap+xml; charset=utf-8'}))
 
         Response.new(
           success_from(response),

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

@@ -99,6 +99,7 @@ module ActiveMerchant #:nodoc:
       alias_method :unstore, :delete
 
       private
+
       def add_customer_data(post, options)
         if options.has_key? :email
           post[:email] = options[:email]
@@ -181,7 +182,6 @@ module ActiveMerchant #:nodoc:
           :cvv_result => response['cvvresponse'],
           :avs_result => { :code => response['avsresponse'] }
         )
-
       end
 
       def message_from(response)
@@ -208,7 +208,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/ipp.rb

@@ -130,7 +130,7 @@ module ActiveMerchant #:nodoc:
           response,
           authorization: authorization_from(response),
           error_code: error_code_from(response),
-          test: test?,
+          test: test?
         )
       end
 

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

@@ -15,7 +15,7 @@ module ActiveMerchant #:nodoc:
       self.money_format = :cents
 
       # The card types supported by the payment gateway
-      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]
 
       # The homepage URL of the gateway
       self.homepage_url = 'http://www.iridiumcorp.co.uk/'
@@ -377,8 +377,8 @@ module ActiveMerchant #:nodoc:
       def commit(request, options)
         requires!(options, :action)
         response = parse(ssl_post(test? ? self.test_url : self.live_url, request,
-                              {'SOAPAction' => 'https://www.thepaymentgateway.net/' + options[:action],
-                               'Content-Type' => 'text/xml; charset=utf-8' }))
+          {'SOAPAction' => 'https://www.thepaymentgateway.net/' + options[:action],
+           'Content-Type' => 'text/xml; charset=utf-8' }))
 
         success = response[:transaction_result][:status_code] == '0'
         message = response[:transaction_result][:message]

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

@@ -187,7 +187,7 @@ module ActiveMerchant #:nodoc:
         vxml = Nokogiri::XML(body).remove_namespaces!.xpath('//Envelope/Body/ExecuteResponse/ExecuteResult').inner_text
         doc = Nokogiri::XML(vxml)
         doc.xpath('*').each do |node|
-          if (node.elements.empty?)
+          if node.elements.empty?
             parsed[underscore(node.name)] = node.text
           else
             node.elements.each do |childnode|

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

@@ -3,7 +3,7 @@ require 'json'
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class KomojuGateway < Gateway
-      self.test_url = 'https://sandbox.komoju.com/api/v1'
+      self.test_url = 'https://komoju.com/api/v1'
       self.live_url = 'https://komoju.com/api/v1'
       self.supported_countries = ['JP']
       self.default_currency = 'JPY'

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

@@ -186,15 +186,13 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(body)
-        begin
-          JSON.parse(body)
-        rescue JSON::ParserError
-          message = 'Invalid JSON response received from KushkiGateway. Please contact KushkiGateway if you continue to receive this message.'
-          message += " (The raw response returned by the API was #{body.inspect})"
-          {
-            'message' => message
-          }
-        end
+        JSON.parse(body)
+      rescue JSON::ParserError
+        message = 'Invalid JSON response received from KushkiGateway. Please contact KushkiGateway if you continue to receive this message.'
+        message += " (The raw response returned by the API was #{body.inspect})"
+        {
+          'message' => message
+        }
       end
 
       def success_from(response)

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

@@ -147,7 +147,6 @@ module ActiveMerchant #:nodoc:
           gsub(%r((\"cvv\\\":\\\")\d+), '\1[FILTERED]')
       end
 
-
       private
 
       def add_request_id(post)
@@ -302,27 +301,25 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(endpoint, post)
-        begin
-          raw_response = ssl_post(url() + endpoint, post_data(post), headers)
-          response = parse(raw_response)
-        rescue ResponseError => e
-          raw_response = e.response.body
-          response_error(raw_response)
-        rescue JSON::ParserError
-          unparsable_response(raw_response)
-        else
-          success = success_from(response)
-          Response.new(
-            success,
-            message_from(response),
-            response,
-            authorization: success ? authorization_from(response, post[:method]) : nil,
-            avs_result: success ? avs_from(response) : nil,
-            cvv_result: success ? cvv_from(response) : nil,
-            error_code: success ? nil : error_from(response),
-            test: test?
-          )
-        end
+        raw_response = ssl_post(url() + endpoint, post_data(post), headers)
+        response = parse(raw_response)
+      rescue ResponseError => e
+        raw_response = e.response.body
+        response_error(raw_response)
+      rescue JSON::ParserError
+        unparsable_response(raw_response)
+      else
+        success = success_from(response)
+        Response.new(
+          success,
+          message_from(response),
+          response,
+          authorization: success ? authorization_from(response, post[:method]) : nil,
+          avs_result: success ? avs_from(response) : nil,
+          cvv_result: success ? cvv_from(response) : nil,
+          error_code: success ? nil : error_from(response),
+          test: test?
+        )
       end
 
       def headers
@@ -392,18 +389,16 @@ module ActiveMerchant #:nodoc:
       end
 
       def response_error(raw_response)
-        begin
-          response = parse(raw_response)
-        rescue JSON::ParserError
-          unparsable_response(raw_response)
-        else
-          return Response.new(
-            false,
-            message_from(response),
-            response,
-            :test => test?
-          )
-        end
+        response = parse(raw_response)
+      rescue JSON::ParserError
+        unparsable_response(raw_response)
+      else
+        return Response.new(
+          false,
+          message_from(response),
+          response,
+          :test => test?
+        )
       end
 
       def unparsable_response(raw_response)