activemerchant 1.86.0 → 1.87.0

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

@@ -234,7 +234,7 @@ module ActiveMerchant #:nodoc:
       def parse(body)
         fields = {}
         for line in body.split('&')
-          key, value = *line.scan( %r{^(\w+)\=(.*)$} ).flatten
+          key, value = *line.scan(%r{^(\w+)\=(.*)$}).flatten
           fields[key] = CGI.unescape(value.to_s)
         end
 
@@ -253,7 +253,7 @@ module ActiveMerchant #:nodoc:
           :error_code       => fields['UMerrorcode'],
           :acs_url          => fields['UMacsurl'],
           :payload          => fields['UMpayload']
-        }.delete_if{|k, v| v.nil?}
+        }.delete_if { |k, v| v.nil? }
       end
 
       def commit(action, parameters)

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

@@ -82,8 +82,8 @@ module ActiveMerchant
           response[:error_message] = error['ErrorDescription']
           response[:error_codes] = error['ErrorCode']
         elsif error.kind_of?(Array)
-          error_str = error.map { |e| e['ErrorDescription']}.join('. ')
-          error_codes = error.map { |e| e['ErrorCode']}.join(', ')
+          error_str = error.map { |e| e['ErrorDescription'] }.join('. ')
+          error_codes = error.map { |e| e['ErrorCode'] }.join(', ')
           response[:error_message] = "#{error_str}."
           response[:error_codes] = error_codes
         end

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

@@ -192,7 +192,7 @@ module ActiveMerchant #:nodoc:
       def commit(trx_type, money, post)
         post[:amount] = amount(money)
 
-        response = parse( ssl_post(self.live_url, post_data(trx_type, post)) )
+        response = parse(ssl_post(self.live_url, post_data(trx_type, post)))
 
         Response.new(response[:response].to_i == SUCCESS, message_from(response), response,
           :test => test?,

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

@@ -73,12 +73,12 @@ module ActiveMerchant #:nodoc:
         form[:customer_code] = options[:customer].to_s.slice(0, 10) unless options[:customer].blank?
       end
 
-      def add_invoice(form,options)
+      def add_invoice(form, options)
         form[:invoice_number] = (options[:order_id] || options[:invoice]).to_s.slice(0, 10)
         form[:description] = options[:description].to_s.slice(0, 255)
       end
 
-      def add_address(form,options)
+      def add_address(form, options)
         billing_address = options[:billing_address] || options[:address]
 
         if billing_address
@@ -138,7 +138,7 @@ module ActiveMerchant #:nodoc:
         parameters[:amount] = amount(money)
         parameters[:transaction_type] = self.actions[action]
 
-        response = parse( ssl_post(test? ? self.test_url : self.live_url, post_data(parameters)) )
+        response = parse(ssl_post(test? ? self.test_url : self.live_url, post_data(parameters)))
 
         Response.new(response['result'] == APPROVED, message_from(response), response,
           :test => @options[:test] || test?,
@@ -165,7 +165,7 @@ module ActiveMerchant #:nodoc:
       # Parse the response message
       def parse(msg)
         resp = {}
-        msg.split(self.delimiter).collect{|li|
+        msg.split(self.delimiter).collect { |li|
           key, value = li.split('=')
           resp[key.strip.gsub(/^ssl_/, '')] = value.to_s.strip
         }

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

@@ -82,7 +82,7 @@ module ActiveMerchant #:nodoc:
 
       private
 
-      CURRENCY_CODES = Hash.new{|h,k| raise ArgumentError.new("Unsupported currency: #{k}")}
+      CURRENCY_CODES = Hash.new { |h, k| raise ArgumentError.new("Unsupported currency: #{k}") }
       CURRENCY_CODES['USD'] = 840
       CURRENCY_CODES['PEN'] = 604
 
@@ -166,9 +166,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def url(action, params, options={})
-        if (action == 'authorize')
+        if action == 'authorize'
           "#{base_url}/#{@options[:merchant_id]}"
-        elsif (action == 'refund')
+        elsif action == 'refund'
           "#{base_url}/#{@options[:merchant_id]}/#{action}/#{options[:transaction_id]}"
         else
           "#{base_url}/#{@options[:merchant_id]}/#{action}/#{params[:purchaseNumber]}"
@@ -176,7 +176,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def method(action)
-        (%w(authorize refund).include? action) ? :post : :put
+        %w(authorize refund).include?(action) ? :post : :put
       end
 
       def authorization_from(params, response, options)

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

@@ -140,7 +140,7 @@ module ActiveMerchant #:nodoc:
       private
 
       def clean_description(description)
-        description.to_s.slice(0,32).encode('US-ASCII', invalid: :replace, undef: :replace, replace: '?')
+        description.to_s.slice(0, 32).encode('US-ASCII', invalid: :replace, undef: :replace, replace: '?')
       end
 
       def prepare_options_hash(options)
@@ -343,7 +343,7 @@ module ActiveMerchant #:nodoc:
           end
 
           status.elements.to_a.each do |node|
-            if (node.elements.size == 0)
+            if node.elements.size == 0
               response[node.name.to_sym] = (node.text || '').strip
             else
               node.elements.each do |childnode|

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

@@ -30,8 +30,8 @@ module ActiveMerchant #:nodoc:
 
       def purchase(money, payment_method, options = {})
         MultiResponse.run do |r|
-          r.process{authorize(money, payment_method, options)}
-          r.process{capture(money, r.authorization, options.merge(:authorization_validated => true))}
+          r.process { authorize(money, payment_method, options) }
+          r.process { capture(money, r.authorization, options.merge(:authorization_validated => true)) }
         end
       end
 
@@ -42,19 +42,19 @@ module ActiveMerchant #:nodoc:
 
       def capture(money, authorization, options = {})
         MultiResponse.run do |r|
-          r.process{inquire_request(authorization, options, 'AUTHORISED')} unless options[:authorization_validated]
+          r.process { inquire_request(authorization, options, 'AUTHORISED') } unless options[:authorization_validated]
           if r.params
             authorization_currency = r.params['amount_currency_code']
             options = options.merge(:currency => authorization_currency) if authorization_currency.present?
           end
-          r.process{capture_request(money, authorization, options)}
+          r.process { capture_request(money, authorization, options) }
         end
       end
 
       def void(authorization, options = {})
         MultiResponse.run do |r|
-          r.process{inquire_request(authorization, options, 'AUTHORISED')} unless options[:authorization_validated]
-          r.process{cancel_request(authorization, options)}
+          r.process { inquire_request(authorization, options, 'AUTHORISED') } unless options[:authorization_validated]
+          r.process { cancel_request(authorization, options) }
         end
       end
 
@@ -67,7 +67,7 @@ module ActiveMerchant #:nodoc:
         return response if response.success?
         return response unless options[:force_full_refund_if_unsettled]
 
-        void(authorization, options ) if response.params['last_event'] == 'AUTHORISED'
+        void(authorization, options) if response.params['last_event'] == 'AUTHORISED'
       end
 
       # Credits only function on a Merchant ID/login/profile flagged for Payouts
@@ -175,7 +175,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def order_tag_attributes(options)
-        { 'orderCode' => options[:order_id], 'installationId' => options[:inst_id] || @options[:inst_id] }.reject{|_,v| !v}
+        { 'orderCode' => options[:order_id], 'installationId' => options[:inst_id] || @options[:inst_id] }.reject { |_, v| !v }
       end
 
       def build_capture_request(money, authorization, options)
@@ -212,7 +212,7 @@ module ActiveMerchant #:nodoc:
         }
 
         if options[:debit_credit_indicator]
-          amount_hash.merge!('debitCreditIndicator' => options[:debit_credit_indicator])
+          amount_hash['debitCreditIndicator'] = options[:debit_credit_indicator]
         end
 
         xml.tag! 'amount', amount_hash
@@ -248,10 +248,21 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'session', 'shopperIPAddress' => options[:ip] if options[:ip]
               xml.tag! 'session', 'id' => options[:session_id] if options[:session_id]
             end
+            add_stored_credential_options(xml, options) if options[:stored_credential_usage]
           end
         end
       end
 
+      def add_stored_credential_options(xml, options={})
+        if options[:stored_credential_initiated_reason]
+          xml.tag! 'storedCredentials', 'usage' => options[:stored_credential_usage], 'merchantInitiatedReason' => options[:stored_credential_initiated_reason] do
+            xml.tag! 'schemeTransactionIdentifier', options[:stored_credential_transaction_id] if options[:stored_credential_transaction_id]
+          end
+        else
+          xml.tag! 'storedCredentials', 'usage' => options[:stored_credential_usage]
+        end
+      end
+
       def add_email(xml, options)
         return unless options[:execute_threed] || options[:email]
         xml.tag! 'shopper' do
@@ -326,7 +337,7 @@ module ActiveMerchant #:nodoc:
         end
         if node.has_elements?
           raw[node.name.underscore.to_sym] = true unless node.name.blank?
-          node.elements.each{|e| parse_element(raw, e) }
+          node.elements.each { |e| parse_element(raw, e) }
         else
           raw[node.name.underscore.to_sym] = node.text unless node.text.nil?
         end
@@ -339,7 +350,7 @@ module ActiveMerchant #:nodoc:
           'Authorization' => encoded_credentials
         }
         if options[:cookie]
-          headers.merge!('Set-Cookie' => options[:cookie]) if options[:cookie]
+          headers['Set-Cookie'] = options[:cookie] if options[:cookie]
         end
         headers
       end
@@ -407,12 +418,12 @@ module ActiveMerchant #:nodoc:
 
       def required_status_message(raw, success_criteria)
         if(!success_criteria.include?(raw[:last_event]))
-          "A transaction status of #{success_criteria.collect{|c| "'#{c}'"}.join(" or ")} is required."
+          "A transaction status of #{success_criteria.collect { |c| "'#{c}'" }.join(" or ")} is required."
         end
       end
 
       def authorization_from(raw)
-        pair = raw.detect{|k,v| k.to_s =~ /_order_code$/}
+        pair = raw.detect { |k, v| k.to_s =~ /_order_code$/ }
         (pair ? pair.last : nil)
       end
 

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

@@ -139,7 +139,7 @@ module ActiveMerchant #:nodoc:
 
           raw_response = ssl_request(method, self.live_url + url, json, headers(options))
 
-          if (raw_response != '')
+          if raw_response != ''
             response = parse(raw_response)
             if type == 'token'
               success = response.key?('token')
@@ -163,7 +163,7 @@ module ActiveMerchant #:nodoc:
         rescue ResponseError => e
           raw_response = e.response.body
           response = response_error(raw_response)
-        rescue JSON::ParserError => e
+        rescue JSON::ParserError
           response = json_error(raw_response)
         end
 

data/lib/active_merchant/billing/response.rb

@@ -27,15 +27,15 @@ module ActiveMerchant #:nodoc:
         @emv_authorization = options[:emv_authorization]
 
         @avs_result = if options[:avs_result].kind_of?(AVSResult)
-          options[:avs_result].to_hash
-        else
-          AVSResult.new(options[:avs_result]).to_hash
+                        options[:avs_result].to_hash
+                      else
+                        AVSResult.new(options[:avs_result]).to_hash
         end
 
         @cvv_result = if options[:cvv_result].kind_of?(CVVResult)
-          options[:cvv_result].to_hash
-        else
-          CVVResult.new(options[:cvv_result]).to_hash
+                        options[:cvv_result].to_hash
+                      else
+                        CVVResult.new(options[:cvv_result]).to_hash
         end
       end
     end
@@ -70,7 +70,7 @@ module ActiveMerchant #:nodoc:
 
       def <<(response)
         if response.is_a?(MultiResponse)
-          response.responses.each{|r| @responses << r}
+          response.responses.each { |r| @responses << r }
         else
           @responses << response
         end

data/lib/active_merchant/country.rb

@@ -39,11 +39,11 @@ module ActiveMerchant #:nodoc:
 
     def initialize(options = {})
       @name = options.delete(:name)
-      @codes = options.collect{|k,v| CountryCode.new(v)}
+      @codes = options.collect { |k, v| CountryCode.new(v) }
     end
 
     def code(format)
-      @codes.detect{|c| c.format == format}
+      @codes.detect { |c| c.format == format }
     end
 
     def ==(other)
@@ -324,9 +324,9 @@ module ActiveMerchant #:nodoc:
       when 2, 3
         upcase_name = name.upcase
         country_code = CountryCode.new(name)
-        country = COUNTRIES.detect{|c| c[country_code.format] == upcase_name }
+        country = COUNTRIES.detect { |c| c[country_code.format] == upcase_name }
       else
-        country = COUNTRIES.detect{|c| c[:name].upcase == name.upcase }
+        country = COUNTRIES.detect { |c| c[:name].casecmp(name).zero? }
       end
       raise InvalidCountryCodeError, "No country could be found for the country #{name}" if country.nil?
       Country.new(country.dup)

data/lib/active_merchant/network_connection_retries.rb

@@ -28,7 +28,7 @@ module ActiveMerchant
         rescue OpenSSL::X509::CertificateError => e
           NetworkConnectionRetries.log(options[:logger], :error, e.message, options[:tag])
           raise ActiveMerchant::ClientCertificateError, 'The remote server did not accept the provided SSL certificate'
-        rescue Zlib::BufError => e
+        rescue Zlib::BufError
           raise ActiveMerchant::InvalidResponseError, 'The remote server replied with an invalid response'
         rescue *connection_errors.keys => e
           raise ActiveMerchant::ConnectionError.new(derived_error_message(connection_errors, e.class), e)
@@ -36,6 +36,12 @@ module ActiveMerchant
       end
     end
 
+    def self.log(logger, level, message, tag=nil)
+      tag ||= self.class.to_s
+      message = "[#{tag}] #{message}"
+      logger&.send(level, message)
+    end
+
     private
 
     def retry_network_exceptions(options = {})
@@ -62,14 +68,6 @@ module ActiveMerchant
       end
     end
 
-    def self.log(logger, level, message, tag=nil)
-      tag ||= self.class.to_s
-      message = "[#{tag}] #{message}"
-      logger&.send(level, message)
-    end
-
-    private
-
     def log_with_retry_details(logger, attempts, time, message, tag)
       NetworkConnectionRetries.log(logger, :info, 'connection_attempt=%d connection_request_time=%.4fs connection_msg="%s"' % [attempts, time, message], tag)
     end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = '1.86.0'
+  VERSION = '1.87.0'
 end

data/lib/support/gateway_support.rb

@@ -14,7 +14,7 @@ class GatewaySupport #:nodoc:
       filename = File.basename(f, '.rb')
       gateway_name = filename + '_gateway'
       begin
-        gateway_class = ('ActiveMerchant::Billing::' + gateway_name.camelize).constantize
+        ('ActiveMerchant::Billing::' + gateway_name.camelize).constantize
       rescue NameError
         puts 'Could not load gateway ' + gateway_name.camelize + ' from ' + f + '.'
       end
@@ -24,14 +24,14 @@ class GatewaySupport #:nodoc:
   end
 
   def each_gateway
-    @gateways.each{|g| yield g }
+    @gateways.each { |g| yield g }
   end
 
   def features
     width = 15
 
     print 'Name'.center(width + 20)
-    ACTIONS.each{|f| print f.to_s.capitalize.center(width) }
+    ACTIONS.each { |f| print f.to_s.capitalize.center(width) }
     puts
 
     each_gateway do |g|

data/lib/support/ssl_verify.rb

@@ -23,7 +23,7 @@ class SSLVerify
       end
 
       uri = URI.parse(g.live_url)
-      result,message = ssl_verify_peer?(uri)
+      result, message = ssl_verify_peer?(uri)
       case result
       when :success
         print '.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.86.0
+  version: 1.87.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -417,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: activemerchant
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Framework and tools for dealing with credit card transactions.