activemerchant 1.87.0 → 1.88.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c6735efd6b43a6792c15f372218c58388a7481e907f221b8ca401dcee3c9fc2
-  data.tar.gz: eaecbc6f7dfcae07746717eb79208ec5911f80bd15d73ed859fab38164f08d63
+  metadata.gz: 53339022ee833c22c93fb9958507b7650e40b9903cdeddf48bcac2874eeaa2bd
+  data.tar.gz: 3c0dfd77791def2e65522466a32a9f6aacf4289f1585f39322b226f5ed3a582c
 SHA512:
-  metadata.gz: 5c37662376465c08da0eafa7ca7a801efb37316b254ac81c234b52c6e780b204763b2c0fdef035a38a6a28e6b5377e2d384e621770719a7497f8e27a008518ca
-  data.tar.gz: 4d8ff4e910d7b93c9f21476be94acdcf25123db575c39614303a5b10ee7c5bf50b050ea1b7c1cb4e6a158c909f76bd82b83327904b8fd7b73f1093ad138e6d19
+  metadata.gz: a07c6a56d9b28ee1bef9f93985d05e4a25dbb9e85f0d1432e0a89f30d6af8e57cd5b6d9f4b8b43b66d984cdfd6edecf056d7eac94ad331364f05a5758df09833
+  data.tar.gz: 04a43d55813f193035fc7fc00d72597093cd8c2342a7fa880b283aab2db21d58c0516ae91f1f021189b8f805665e6502b41d38e1b8bc27306ce4cc2cf0e3938e

data/CHANGELOG

@@ -1,6 +1,11 @@
 = ActiveMerchant CHANGELOG
 
 == HEAD
+
+== Version 1.88.0 (November 30, 2018)
+* Added ActiveSupport/Rails master support [Edouard-chin] #3065
+
+== Version 1.87.0 (November 29, 2018)
 * Barclaycard Smartpay: Improves Error Handling [deedeelavinder] #3026
 * Braintree: Fix passing phone-only billing address [curiousepic] #3025
 * Litle: Capitalize check account type [curiousepic] #3028

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

@@ -837,7 +837,7 @@ module ActiveMerchant
         response = {action: action}
 
         response[:response_code] = if(element = doc.at_xpath('//transactionResponse/responseCode'))
-          (empty?(element.content) ? nil : element.content.to_i)
+                                     (empty?(element.content) ? nil : element.content.to_i)
         end
 
         if(element = doc.at_xpath('//errors/error'))
@@ -855,35 +855,35 @@ module ActiveMerchant
         end
 
         response[:avs_result_code] = if(element = doc.at_xpath('//avsResultCode'))
-          (empty?(element.content) ? nil : element.content)
+                                       (empty?(element.content) ? nil : element.content)
         end
 
         response[:transaction_id] = if(element = doc.at_xpath('//transId'))
-          (empty?(element.content) ? nil : element.content)
+                                      (empty?(element.content) ? nil : element.content)
         end
 
         response[:card_code] = if(element = doc.at_xpath('//cvvResultCode'))
-          (empty?(element.content) ? nil : element.content)
+                                 (empty?(element.content) ? nil : element.content)
         end
 
         response[:authorization_code] = if(element = doc.at_xpath('//authCode'))
-          (empty?(element.content) ? nil : element.content)
+                                          (empty?(element.content) ? nil : element.content)
         end
 
         response[:cardholder_authentication_code] = if(element = doc.at_xpath('//cavvResultCode'))
-          (empty?(element.content) ? nil : element.content)
+                                                      (empty?(element.content) ? nil : element.content)
         end
 
         response[:account_number] = if(element = doc.at_xpath('//accountNumber'))
-          (empty?(element.content) ? nil : element.content[-4..-1])
+                                      (empty?(element.content) ? nil : element.content[-4..-1])
         end
 
         response[:test_request] = if(element = doc.at_xpath('//testRequest'))
-          (empty?(element.content) ? nil : element.content)
+                                    (empty?(element.content) ? nil : element.content)
         end
 
         response[:full_response_code] = if(element = doc.at_xpath('//messages/message/code'))
-          (empty?(element.content) ? nil : element.content)
+                                          (empty?(element.content) ? nil : element.content)
         end
 
         response
@@ -900,28 +900,28 @@ module ActiveMerchant
         end
 
         response[:result_code] = if(element = doc.at_xpath('//messages/resultCode'))
-          (empty?(element.content) ? nil : element.content)
+                                   (empty?(element.content) ? nil : element.content)
         end
 
         response[:test_request] = if(element = doc.at_xpath('//testRequest'))
-          (empty?(element.content) ? nil : element.content)
+                                    (empty?(element.content) ? nil : element.content)
         end
 
         response[:customer_profile_id] = if(element = doc.at_xpath('//customerProfileId'))
-          (empty?(element.content) ? nil : element.content)
+                                           (empty?(element.content) ? nil : element.content)
         end
 
         response[:customer_payment_profile_id] = if(element = doc.at_xpath('//customerPaymentProfileIdList/numericString'))
-          (empty?(element.content) ? nil : element.content)
+                                                   (empty?(element.content) ? nil : element.content)
         end
 
         response[:customer_payment_profile_id] = if(element = doc.at_xpath('//customerPaymentProfileIdList/numericString') ||
                                                               doc.at_xpath('//customerPaymentProfileId'))
-          (empty?(element.content) ? nil : element.content)
+                                                   (empty?(element.content) ? nil : element.content)
         end
 
         response[:direct_response] = if(element = doc.at_xpath('//directResponse'))
-          (empty?(element.content) ? nil : element.content)
+                                       (empty?(element.content) ? nil : element.content)
         end
 
         response.merge!(parse_direct_response_elements(response, options))

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

@@ -380,18 +380,18 @@ module ActiveMerchant #:nodoc:
         requires!(options[:transaction], :type)
         case options[:transaction][:type]
         when :void
-            requires!(options[:transaction], :trans_id)
+          requires!(options[:transaction], :trans_id)
         when :refund
-            requires!(options[:transaction], :trans_id) &&
-              (
-                (options[:transaction][:customer_profile_id] && options[:transaction][:customer_payment_profile_id]) ||
-                options[:transaction][:credit_card_number_masked] ||
-                (options[:transaction][:bank_routing_number_masked] && options[:transaction][:bank_account_number_masked])
-              )
+          requires!(options[:transaction], :trans_id) &&
+            (
+              (options[:transaction][:customer_profile_id] && options[:transaction][:customer_payment_profile_id]) ||
+              options[:transaction][:credit_card_number_masked] ||
+              (options[:transaction][:bank_routing_number_masked] && options[:transaction][:bank_account_number_masked])
+            )
         when :prior_auth_capture
-            requires!(options[:transaction], :amount, :trans_id)
+          requires!(options[:transaction], :amount, :trans_id)
         else
-            requires!(options[:transaction], :amount, :customer_profile_id, :customer_payment_profile_id)
+          requires!(options[:transaction], :amount, :customer_profile_id, :customer_payment_profile_id)
         end
         request = build_request(:create_customer_profile_transaction, options)
         commit(:create_customer_profile_transaction, request)
@@ -666,33 +666,33 @@ module ActiveMerchant #:nodoc:
             # The amount to be billed to the customer
             case transaction[:type]
             when :void
-                tag_unless_blank(xml, 'customerProfileId', transaction[:customer_profile_id])
-                tag_unless_blank(xml, 'customerPaymentProfileId', transaction[:customer_payment_profile_id])
-                tag_unless_blank(xml, 'customerShippingAddressId', transaction[:customer_shipping_address_id])
-                xml.tag!('transId', transaction[:trans_id])
+              tag_unless_blank(xml, 'customerProfileId', transaction[:customer_profile_id])
+              tag_unless_blank(xml, 'customerPaymentProfileId', transaction[:customer_payment_profile_id])
+              tag_unless_blank(xml, 'customerShippingAddressId', transaction[:customer_shipping_address_id])
+              xml.tag!('transId', transaction[:trans_id])
             when :refund
-                xml.tag!('amount', transaction[:amount])
-                tag_unless_blank(xml, 'customerProfileId', transaction[:customer_profile_id])
-                tag_unless_blank(xml, 'customerPaymentProfileId', transaction[:customer_payment_profile_id])
-                tag_unless_blank(xml, 'customerShippingAddressId', transaction[:customer_shipping_address_id])
-                tag_unless_blank(xml, 'creditCardNumberMasked', transaction[:credit_card_number_masked])
-                tag_unless_blank(xml, 'bankRoutingNumberMasked', transaction[:bank_routing_number_masked])
-                tag_unless_blank(xml, 'bankAccountNumberMasked', transaction[:bank_account_number_masked])
-                add_order(xml, transaction[:order]) if transaction[:order].present?
-                xml.tag!('transId', transaction[:trans_id])
-                add_tax(xml, transaction[:tax]) if transaction[:tax]
-                add_duty(xml, transaction[:duty]) if transaction[:duty]
-                add_shipping(xml, transaction[:shipping]) if transaction[:shipping]
+              xml.tag!('amount', transaction[:amount])
+              tag_unless_blank(xml, 'customerProfileId', transaction[:customer_profile_id])
+              tag_unless_blank(xml, 'customerPaymentProfileId', transaction[:customer_payment_profile_id])
+              tag_unless_blank(xml, 'customerShippingAddressId', transaction[:customer_shipping_address_id])
+              tag_unless_blank(xml, 'creditCardNumberMasked', transaction[:credit_card_number_masked])
+              tag_unless_blank(xml, 'bankRoutingNumberMasked', transaction[:bank_routing_number_masked])
+              tag_unless_blank(xml, 'bankAccountNumberMasked', transaction[:bank_account_number_masked])
+              add_order(xml, transaction[:order]) if transaction[:order].present?
+              xml.tag!('transId', transaction[:trans_id])
+              add_tax(xml, transaction[:tax]) if transaction[:tax]
+              add_duty(xml, transaction[:duty]) if transaction[:duty]
+              add_shipping(xml, transaction[:shipping]) if transaction[:shipping]
             when :prior_auth_capture
-                xml.tag!('amount', transaction[:amount])
-                add_order(xml, transaction[:order]) if transaction[:order].present?
-                xml.tag!('transId', transaction[:trans_id])
+              xml.tag!('amount', transaction[:amount])
+              add_order(xml, transaction[:order]) if transaction[:order].present?
+              xml.tag!('transId', transaction[:trans_id])
             else
-                xml.tag!('amount', transaction[:amount])
-                xml.tag!('customerProfileId', transaction[:customer_profile_id])
-                xml.tag!('customerPaymentProfileId', transaction[:customer_payment_profile_id])
-                xml.tag!('approvalCode', transaction[:approval_code]) if transaction[:type] == :capture_only
-                add_order(xml, transaction[:order]) if transaction[:order].present?
+              xml.tag!('amount', transaction[:amount])
+              xml.tag!('customerProfileId', transaction[:customer_profile_id])
+              xml.tag!('customerPaymentProfileId', transaction[:customer_payment_profile_id])
+              xml.tag!('approvalCode', transaction[:approval_code]) if transaction[:type] == :capture_only
+              add_order(xml, transaction[:order]) if transaction[:order].present?
 
             end
             if [:auth_capture, :auth_only, :capture_only].include?(transaction[:type])

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

@@ -81,8 +81,8 @@ module ActiveMerchant #:nodoc:
 
       def verify(credit_card, options={})
         MultiResponse.run(:use_first_response) do |r|
-         r.process { authorize(100, credit_card, options) }
-         r.process(:ignore_result) { void(r.authorization, options) }
+          r.process { authorize(100, credit_card, options) }
+          r.process(:ignore_result) { void(r.authorization, options) }
         end
       end
 
@@ -282,14 +282,14 @@ module ActiveMerchant #:nodoc:
       def commit(action, source_type, parameters)
         response = parse(ssl_post(live_url, post_data(COMMANDS[source_type][action], parameters)))
 
-       Response.new(
-         (response[:status] == 'Approved'),
-         message_from(response),
-         response,
-         authorization: authorization_from(response, source_type),
-         avs_result: { code: response[:avs_result_code] },
-         cvv_result: response[:cvv_result_code]
-       )
+        Response.new(
+          (response[:status] == 'Approved'),
+          message_from(response),
+          response,
+          authorization: authorization_from(response, source_type),
+          avs_result: { code: response[:avs_result_code] },
+          cvv_result: response[:cvv_result_code]
+        )
       end
 
       def message_from(response)

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

@@ -683,23 +683,23 @@ module ActiveMerchant #:nodoc:
       # Where we actually build the full SOAP request using builder
       def build_request(body, options)
         xml = Builder::XmlMarkup.new :indent => 2
-          xml.instruct!
-          xml.tag! 's:Envelope', {'xmlns:s' => 'http://schemas.xmlsoap.org/soap/envelope/'} do
-            xml.tag! 's:Header' do
-              xml.tag! 'wsse:Security', {'s:mustUnderstand' => '1', 'xmlns:wsse' => 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd'} do
-                xml.tag! 'wsse:UsernameToken' do
-                  xml.tag! 'wsse:Username', @options[:login]
-                  xml.tag! 'wsse:Password', @options[:password], 'Type' => 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText'
-                end
+        xml.instruct!
+        xml.tag! 's:Envelope', {'xmlns:s' => 'http://schemas.xmlsoap.org/soap/envelope/'} do
+          xml.tag! 's:Header' do
+            xml.tag! 'wsse:Security', {'s:mustUnderstand' => '1', 'xmlns:wsse' => 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd'} do
+              xml.tag! 'wsse:UsernameToken' do
+                xml.tag! 'wsse:Username', @options[:login]
+                xml.tag! 'wsse:Password', @options[:password], 'Type' => 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText'
               end
             end
-            xml.tag! 's:Body', {'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema'} do
-              xml.tag! 'requestMessage', {'xmlns' => "urn:schemas-cybersource-com:transaction-data-#{XSD_VERSION}"} do
-                add_merchant_data(xml, options)
-                xml << body
-              end
+          end
+          xml.tag! 's:Body', {'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema'} do
+            xml.tag! 'requestMessage', {'xmlns' => "urn:schemas-cybersource-com:transaction-data-#{XSD_VERSION}"} do
+              add_merchant_data(xml, options)
+              xml << body
             end
           end
+        end
         xml.target!
       end
 

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

@@ -252,17 +252,17 @@ module ActiveMerchant #:nodoc:
       def xml_builder(params, soap_call)
         xml = Builder::XmlMarkup.new(:indent => 2)
         xml.instruct!
-          xml.tag! 'soap:Envelope', { 'xmlns:xsi' => 'http://schemas.xmlsoap.org/soap/envelope/',
-                                      'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
-                                      'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/' } do
-            xml.tag! 'soap:Body' do
-              xml.tag! soap_call, { 'xmlns' => "#{self.live_url}remote/payment" } do
-                xml.tag! 'merchantnumber', @options[:login]
-                xml.tag! 'transactionid', params[:transaction]
-                xml.tag! 'amount', params[:amount].to_s if soap_call != 'delete'
-              end
+        xml.tag! 'soap:Envelope', { 'xmlns:xsi' => 'http://schemas.xmlsoap.org/soap/envelope/',
+                                    'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
+                                    'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/' } do
+          xml.tag! 'soap:Body' do
+            xml.tag! soap_call, { 'xmlns' => "#{self.live_url}remote/payment" } do
+              xml.tag! 'merchantnumber', @options[:login]
+              xml.tag! 'transactionid', params[:transaction]
+              xml.tag! 'amount', params[:amount].to_s if soap_call != 'delete'
             end
           end
+        end
         xml.target!
       end
 

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

@@ -150,7 +150,7 @@ module ActiveMerchant #:nodoc:
         reply = {}
         xml = REXML::Document.new(body)
         if root = REXML::XPath.first(xml, '//soap:Fault') then
-           reply=parse_fault(root)
+          reply=parse_fault(root)
         else
           if root = REXML::XPath.first(xml, '//ProcessPaymentResponse/ewayResponse') then
             # Successful payment
@@ -232,33 +232,33 @@ module ActiveMerchant #:nodoc:
         # eWay demands all fields be sent, but contain an empty string if blank
         post = case action
                when 'QueryCustomer'
-                  arguments
+                 arguments
                when 'ProcessPayment'
-                  default_payment_fields.merge(arguments)
+                 default_payment_fields.merge(arguments)
                when 'CreateCustomer'
-                  default_customer_fields.merge(arguments)
+                 default_customer_fields.merge(arguments)
                when 'UpdateCustomer'
-                  default_customer_fields.merge(arguments)
+                 default_customer_fields.merge(arguments)
                end
 
         xml = Builder::XmlMarkup.new :indent => 2
-          xml.instruct!
-          xml.tag! 'soap12:Envelope', {'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema', 'xmlns:soap12' => 'http://www.w3.org/2003/05/soap-envelope'} do
-            xml.tag! 'soap12:Header' do
-              xml.tag! 'eWAYHeader', {'xmlns' => 'https://www.eway.com.au/gateway/managedpayment'} do
-                xml.tag! 'eWAYCustomerID', @options[:login]
-                xml.tag! 'Username', @options[:username]
-                xml.tag! 'Password', @options[:password]
-              end
+        xml.instruct!
+        xml.tag! 'soap12:Envelope', {'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema', 'xmlns:soap12' => 'http://www.w3.org/2003/05/soap-envelope'} do
+          xml.tag! 'soap12:Header' do
+            xml.tag! 'eWAYHeader', {'xmlns' => 'https://www.eway.com.au/gateway/managedpayment'} do
+              xml.tag! 'eWAYCustomerID', @options[:login]
+              xml.tag! 'Username', @options[:username]
+              xml.tag! 'Password', @options[:password]
             end
-            xml.tag! 'soap12:Body' do |x|
-              x.tag! action, {'xmlns' => 'https://www.eway.com.au/gateway/managedpayment'} do |y|
-                post.each do |key, value|
-                  y.tag! key, value
-                end
+          end
+          xml.tag! 'soap12:Body' do |x|
+            x.tag! action, {'xmlns' => 'https://www.eway.com.au/gateway/managedpayment'} do |y|
+              post.each do |key, value|
+                y.tag! key, value
               end
             end
           end
+        end
         xml.target!
       end
 

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

@@ -160,14 +160,14 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, request)
-         response = parse(ssl_post(self.live_url, build_request(action, request), POST_HEADERS))
-
-         Response.new(successful?(response), message_from(response), response,
-           :test => test?,
-           :authorization => authorization_from(response),
-           :avs_result => { :code => response[:avs] },
-           :cvv_result => response[:cvv2]
-         )
+        response = parse(ssl_post(self.live_url, build_request(action, request), POST_HEADERS))
+
+        Response.new(successful?(response), message_from(response), response,
+          :test => test?,
+          :authorization => authorization_from(response),
+          :avs_result => { :code => response[:avs] },
+          :cvv_result => response[:cvv2]
+        )
       rescue ResponseError => e
         case e.response.code
         when '401'
@@ -183,9 +183,9 @@ module ActiveMerchant #:nodoc:
 
       def authorization_from(response)
         if response[:authorization_num] && response[:transaction_tag]
-           "#{response[:authorization_num]};#{response[:transaction_tag]}"
+          "#{response[:authorization_num]};#{response[:transaction_tag]}"
         else
-           ''
+          ''
         end
       end
 

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

@@ -33,7 +33,7 @@ module ActiveMerchant #:nodoc:
             end
           end
         end
-       check?(payment_method) ? commit(:echeckSales, request, money) : commit(:sale, request, money)
+        check?(payment_method) ? commit(:echeckSales, request, money) : commit(:sale, request, money)
       end
 
       def authorize(money, payment_method, options={})

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

@@ -75,9 +75,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_creditcard(post, creditcard)
-       post['cvv'] = creditcard.verification_value
-       post['ccnumber'] = creditcard.number
-       post['ccexp'] = "#{sprintf("%02d", creditcard.month)}#{creditcard.year.to_s[-2, 2]}"
+        post['cvv'] = creditcard.verification_value
+        post['ccnumber'] = creditcard.number
+        post['ccexp'] = "#{sprintf("%02d", creditcard.month)}#{creditcard.year.to_s[-2, 2]}"
       end
 
       def commit(action, money, parameters={})

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

@@ -226,10 +226,10 @@ module ActiveMerchant #:nodoc:
         if credit_card.respond_to?(:track_data) && credit_card.track_data.present?
           xml.tag! 'trackData', credit_card.track_data
         else
-         xml.tag! 'strPAN', credit_card.number
-         xml.tag! 'strExpDate', expdate(credit_card)
-         xml.tag! 'strCardHolder', credit_card.name
-         xml.tag! 'strCVCode', credit_card.verification_value if credit_card.verification_value?
+          xml.tag! 'strPAN', credit_card.number
+          xml.tag! 'strExpDate', expdate(credit_card)
+          xml.tag! 'strCardHolder', credit_card.name
+          xml.tag! 'strCVCode', credit_card.verification_value if credit_card.verification_value?
         end
       end
 

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

@@ -224,7 +224,7 @@ module ActiveMerchant #:nodoc:
         when 'capture'
           "#{url}/charges/#{auth}/capture/"
         else
-         "#{url}/charges/"
+          "#{url}/charges/"
         end
       end
 

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

@@ -143,14 +143,14 @@ module ActiveMerchant #:nodoc:
           post[:bill_state]      = billing_address[:state]
         end
 
-       if shipping_address = options[:shipping_address]
-         post[:ship_name1], post[:ship_name2] = split_names(shipping_address[:name])
-         post[:ship_street]     = shipping_address[:address1]
-         post[:ship_zip]        = shipping_address[:zip]
-         post[:ship_city]       = shipping_address[:city]
-         post[:ship_country]    = shipping_address[:country]
-         post[:ship_state]      = shipping_address[:state]
-       end
+        if shipping_address = options[:shipping_address]
+          post[:ship_name1], post[:ship_name2] = split_names(shipping_address[:name])
+          post[:ship_street]     = shipping_address[:address1]
+          post[:ship_zip]        = shipping_address[:zip]
+          post[:ship_city]       = shipping_address[:city]
+          post[:ship_country]    = shipping_address[:country]
+          post[:ship_state]      = shipping_address[:state]
+        end
       end
 
       def add_invoice(post, options)