activemerchant 1.79.2 → 1.80.0

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

@@ -1,12 +1,12 @@
-require "nokogiri"
+require 'nokogiri'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class WorldpayUsGateway < Gateway
       class_attribute :backup_url
 
-      self.display_name = "Worldpay US"
-      self.homepage_url = "http://www.worldpay.com/us"
+      self.display_name = 'Worldpay US'
+      self.homepage_url = 'http://www.worldpay.com/us'
 
       # No sandbox, just use test cards.
       self.live_url   = 'https://trans.worldpay.us/cgi-bin/process.cgi'
@@ -55,7 +55,7 @@ module ActiveMerchant #:nodoc:
         add_reference(post, authorization)
         add_customer_data(post, options)
 
-        commit("refund", options, post)
+        commit('refund', options, post)
       end
 
       def void(authorization, options={})
@@ -87,7 +87,7 @@ module ActiveMerchant #:nodoc:
       private
 
       def url(options)
-        options[:use_backup_url].to_s == "true" ? self.backup_url : self.live_url
+        options[:use_backup_url].to_s == 'true' ? self.backup_url : self.live_url
       end
 
       def add_customer_data(post, options)
@@ -138,8 +138,8 @@ module ActiveMerchant #:nodoc:
       end
 
       ACCOUNT_TYPES = {
-        "checking" => "1",
-        "savings" => "2",
+        'checking' => '1',
+        'savings' => '2',
       }
 
       def add_check(post, payment_method)
@@ -151,7 +151,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def split_authorization(authorization)
-        historyid, orderid = authorization.split("|")
+        historyid, orderid = authorization.split('|')
         [historyid, orderid]
       end
 
@@ -165,7 +165,7 @@ module ActiveMerchant #:nodoc:
       def parse(xml)
         response = {}
         doc = Nokogiri::XML(xml)
-        message = doc.xpath("//plaintext")
+        message = doc.xpath('//plaintext')
         message.text.split(/\r?\n/).each do |line|
           key, value = line.split(%r{=})
           response[key] = value if key
@@ -174,11 +174,11 @@ module ActiveMerchant #:nodoc:
       end
 
       ACTIONS = {
-        "purchase" => "ns_quicksale_cc",
-        "refund" => "ns_credit",
-        "authorize" => "ns_quicksale_cc",
-        "capture" => "ns_quicksale_cc",
-        "void" => "ns_void",
+        'purchase' => 'ns_quicksale_cc',
+        'refund' => 'ns_credit',
+        'authorize' => 'ns_quicksale_cc',
+        'capture' => 'ns_quicksale_cc',
+        'void' => 'ns_void',
       }
 
       def commit(action, options, post)
@@ -207,14 +207,14 @@ module ActiveMerchant #:nodoc:
 
       def message_from(succeeded, response)
         if succeeded
-          "Succeeded"
+          'Succeeded'
         else
-          (response['transresult'] || response['Reason'] || "Unable to read error message")
+          (response['transresult'] || response['Reason'] || 'Unable to read error message')
         end
       end
 
       def authorization_from(response)
-        [response['historyid'], response['orderid']].join("|")
+        [response['historyid'], response['orderid']].join('|')
       end
     end
   end

data/lib/active_merchant/billing/model.rb

@@ -1,5 +1,5 @@
-require "active_merchant/billing/compatibility"
-require "active_merchant/empty"
+require 'active_merchant/billing/compatibility'
+require 'active_merchant/empty'
 
 module ActiveMerchant
   module Billing

data/lib/active_merchant/billing/network_tokenization_credit_card.rb

@@ -32,7 +32,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def type
-        "network_tokenization"
+        'network_tokenization'
       end
     end
   end

data/lib/active_merchant/billing/rails.rb

@@ -1,3 +1,3 @@
-require "active_merchant/billing/compatibility"
+require 'active_merchant/billing/compatibility'
 
 ActiveMerchant::Billing::Compatibility.rails_required!

data/lib/active_merchant/connection.rb

@@ -14,8 +14,9 @@ module ActiveMerchant
     VERIFY_PEER = true
     CA_FILE = File.expand_path('../certs/cacert.pem', File.dirname(__FILE__))
     CA_PATH = nil
+    MIN_VERSION = :TLS1_1
     RETRY_SAFE = false
-    RUBY_184_POST_HEADERS = { "Content-Type" => "application/x-www-form-urlencoded" }
+    RUBY_184_POST_HEADERS = { 'Content-Type' => 'application/x-www-form-urlencoded' }
 
     attr_accessor :endpoint
     attr_accessor :open_timeout
@@ -51,7 +52,7 @@ module ActiveMerchant
       @ignore_http_status = false
       @ssl_version = nil
       if Net::HTTP.instance_methods.include?(:min_version=)
-        @min_version = nil
+        @min_version = MIN_VERSION
         @max_version = nil
       end
       @ssl_connection = {}
@@ -65,10 +66,11 @@ module ActiveMerchant
     end
 
     def request(method, body, headers = {})
-      headers['connection'] ||= 'close'
-
       request_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
+      headers = headers.dup
+      headers['connection'] ||= 'close'
+
       retry_exceptions(:max_retries => max_retries, :logger => logger, :tag => tag) do
         begin
           info "connection_http_method=#{method.to_s.upcase} connection_uri=#{endpoint}", tag
@@ -82,7 +84,7 @@ module ActiveMerchant
 
             result = case method
             when :get
-              raise ArgumentError, "GET requests do not support a request body" if body
+              raise ArgumentError, 'GET requests do not support a request body' if body
               http.get(endpoint.request_uri, headers)
             when :post
               debug body
@@ -110,14 +112,14 @@ module ActiveMerchant
             end
           end
 
-          info "--> %d %s (%d %.4fs)" % [result.code, result.message, result.body ? result.body.length : 0, realtime], tag
+          info '--> %d %s (%d %.4fs)' % [result.code, result.message, result.body ? result.body.length : 0, realtime], tag
           debug result.body
           result
         end
       end
 
     ensure
-      info "connection_request_total_time=%.4fs" % [Process.clock_gettime(Process::CLOCK_MONOTONIC) - request_start], tag
+      info 'connection_request_total_time=%.4fs' % [Process.clock_gettime(Process::CLOCK_MONOTONIC) - request_start], tag
       http.finish if http.started?
     end
 
@@ -144,7 +146,7 @@ module ActiveMerchant
     end
 
     def configure_ssl(http)
-      return unless endpoint.scheme == "https"
+      return unless endpoint.scheme == 'https'
 
       http.use_ssl = true
       http.ssl_version = ssl_version if ssl_version

data/lib/active_merchant/country.rb

@@ -317,7 +317,7 @@ module ActiveMerchant #:nodoc:
     ]
 
     def self.find(name)
-      raise InvalidCountryCodeError, "Cannot lookup country for an empty name" if name.blank?
+      raise InvalidCountryCodeError, 'Cannot lookup country for an empty name' if name.blank?
 
       case name.length
       when 2, 3

data/lib/active_merchant/net_http_ssl_connection.rb

@@ -3,6 +3,7 @@ require 'net/http'
 module NetHttpSslConnection
   refine Net::HTTP do
     def ssl_connection
+      return {} unless @socket.present?
       { version: @socket.io.ssl_version, cipher: @socket.io.cipher[0] }
     end
   end

data/lib/active_merchant/network_connection_retries.rb

@@ -4,13 +4,13 @@ module ActiveMerchant
   module NetworkConnectionRetries
     DEFAULT_RETRIES = 3
     DEFAULT_CONNECTION_ERRORS = {
-      EOFError               => "The remote server dropped the connection",
-      Errno::ECONNRESET      => "The remote server reset the connection",
-      Timeout::Error         => "The connection to the remote server timed out",
-      Errno::ETIMEDOUT       => "The connection to the remote server timed out",
-      SocketError            => "The connection to the remote server could not be established",
-      Errno::EHOSTUNREACH    => "The connection to the remote server could not be established",
-      OpenSSL::SSL::SSLError => "The SSL connection to the remote server could not be established"
+      EOFError               => 'The remote server dropped the connection',
+      Errno::ECONNRESET      => 'The remote server reset the connection',
+      Timeout::Error         => 'The connection to the remote server timed out',
+      Errno::ETIMEDOUT       => 'The connection to the remote server timed out',
+      SocketError            => 'The connection to the remote server could not be established',
+      Errno::EHOSTUNREACH    => 'The connection to the remote server could not be established',
+      OpenSSL::SSL::SSLError => 'The SSL connection to the remote server could not be established'
     }
 
     def self.included(base)
@@ -24,12 +24,12 @@ module ActiveMerchant
         begin
           yield
         rescue Errno::ECONNREFUSED => e
-          raise ActiveMerchant::RetriableConnectionError.new("The remote server refused the connection", e)
+          raise ActiveMerchant::RetriableConnectionError.new('The remote server refused the connection', e)
         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"
+          raise ActiveMerchant::ClientCertificateError, 'The remote server did not accept the provided SSL certificate'
         rescue Zlib::BufError => e
-          raise ActiveMerchant::InvalidResponseError, "The remote server replied with an invalid response"
+          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)
         end
@@ -46,7 +46,7 @@ module ActiveMerchant
       begin
         request_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         result = yield
-        log_with_retry_details(options[:logger], initial_retries-retries + 1, Process.clock_gettime(Process::CLOCK_MONOTONIC) - request_start, "success", options[:tag])
+        log_with_retry_details(options[:logger], initial_retries-retries + 1, Process.clock_gettime(Process::CLOCK_MONOTONIC) - request_start, 'success', options[:tag])
         result
       rescue ActiveMerchant::RetriableConnectionError => e
         retries -= 1
@@ -70,7 +70,7 @@ module ActiveMerchant
 
     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)
+      NetworkConnectionRetries.log(logger, :info, 'connection_attempt=%d connection_request_time=%.4fs connection_msg="%s"' % [attempts, time, message], tag)
     end
 
     def derived_error_message(errors, klass)

data/lib/active_merchant/post_data.rb

@@ -11,7 +11,7 @@ module ActiveMerchant
     end
 
     def to_post_data
-      collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+      collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
     end
 
     alias_method :to_s, :to_post_data

data/lib/active_merchant/posts_data.rb

@@ -9,7 +9,7 @@ module ActiveMerchant #:nodoc:
       base.ssl_version = nil
 
       base.class_attribute :min_version
-      base.min_version = nil
+      base.min_version = Connection::MIN_VERSION
 
       base.class_attribute :max_version
       base.max_version = nil

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.79.2"
+  VERSION = '1.80.0'
 end

data/lib/certs/cacert.pem

@@ -3949,3 +3949,40 @@ TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9
 61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G
 3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
 -----END CERTIFICATE-----
+
+COMODO RSA Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCB
+hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV
+BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMTE5
+MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgT
+EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR
+6FSS0gpWsawNJN3Fz0RndJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8X
+pz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZFGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC
+9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+5eNu/Nio5JIk2kNrYrhV
+/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pGx8cgoLEf
+Zd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z
++pUX2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7w
+qP/0uK3pN/u6uPQLOvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZah
+SL0896+1DSJMwBGB7FY79tOi4lu3sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVIC
+u9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+CGCe01a60y1Dma/RMhnEw6abf
+Fobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5WdYgGq/yapiq
+crxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
+FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB
+/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvl
+wFTPoCWOAvn9sKIN9SCYPBMtrFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM
+4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV
+2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSgtZx8jb8uk2Intzna
+FxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwWsRqZ
+CuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiK
+boHGhfKppC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmcke
+jkk9u+UJueBPSZI9FoJAzMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yL
+S0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHqZJx64SIDqZxubw5lT2yHh17zbqD5daWb
+QOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk527RH89elWsn2/x20Kk4yl
+0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7ILaZRfyHB
+NVOFBkpdn627G190
+-----END CERTIFICATE-----

data/lib/support/gateway_support.rb

@@ -17,7 +17,7 @@ class GatewaySupport #:nodoc:
       begin
         gateway_class = ('ActiveMerchant::Billing::' + gateway_name.camelize).constantize
       rescue NameError
-        puts "Could not load gateway " + gateway_name.camelize + " from " + f + "."
+        puts 'Could not load gateway ' + gateway_name.camelize + ' from ' + f + '.'
       end
     end
     @gateways = Gateway.implementations.sort_by(&:name)
@@ -31,7 +31,7 @@ class GatewaySupport #:nodoc:
   def features
     width = 15
 
-    print "Name".center(width + 20)
+    print 'Name'.center(width + 20)
     ACTIONS.each{|f| print "#{f.to_s.capitalize.center(width)}" }
     puts
 

data/lib/support/ssl_verify.rb

@@ -26,13 +26,13 @@ class SSLVerify
       result,message = ssl_verify_peer?(uri)
       case result
       when :success
-        print "."
+        print '.'
         success << g
       when :fail
-        print "F"
+        print 'F'
         failed << {:gateway => g, :message => message}
       when :error
-        print "E"
+        print 'E'
         errored << {:gateway => g, :message => message}
       end
     end
@@ -66,7 +66,7 @@ class SSLVerify
   def try_host(http, path)
     http.get(path)
   rescue Net::HTTPBadResponse, EOFError, SocketError
-    http.post(path, "")
+    http.post(path, '')
   end
 
   def ssl_verify_peer?(uri)
@@ -78,7 +78,7 @@ class SSLVerify
     http.read_timeout = 60
 
     if uri.path.blank?
-      try_host(http, "/")
+      try_host(http, '/')
     else
       try_host(http, uri.path)
     end

data/lib/support/ssl_version.rb

@@ -1,5 +1,5 @@
-require "active_merchant"
-require "support/gateway_support"
+require 'active_merchant'
+require 'support/gateway_support'
 
 class SSLVersion
   attr_accessor :success, :failed, :missing, :errored
@@ -10,7 +10,7 @@ class SSLVersion
   end
 
   def test_gateways(min_version = :TLS1_1)
-    raise "Requires Ruby 2.5 or better" unless Net::HTTP.instance_methods.include?(:min_version=)
+    raise 'Requires Ruby 2.5 or better' unless Net::HTTP.instance_methods.include?(:min_version=)
 
     puts "Verifying #{@gateways.count} gateways for SSL min_version=#{min_version}\n\n"
 
@@ -25,13 +25,13 @@ class SSLVersion
 
       case result
       when :success
-        print "."
+        print '.'
         success << g
       when :fail
-        print "F"
+        print 'F'
         failed << {:gateway => g, :message => message}
       when :error
-        print "E"
+        print 'E'
         errored << {:gateway => g, :message => message}
       end
     end
@@ -70,7 +70,7 @@ class SSLVersion
     http.open_timeout = 10
     http.read_timeout = 10
 
-    http.post("/", "")
+    http.post('/', '')
 
     return :success
   rescue Net::HTTPBadResponse

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.79.2
+  version: 1.80.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-03 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -235,10 +235,6 @@ files:
 - lib/active_merchant/billing/gateways/hdfc.rb
 - lib/active_merchant/billing/gateways/hps.rb
 - lib/active_merchant/billing/gateways/iats_payments.rb
-- lib/active_merchant/billing/gateways/ideal/ideal_base.rb
-- lib/active_merchant/billing/gateways/ideal/ideal_rabobank.pem
-- lib/active_merchant/billing/gateways/ideal/ideal_response.rb
-- lib/active_merchant/billing/gateways/ideal_rabobank.rb
 - lib/active_merchant/billing/gateways/in_context_paypal_express.rb
 - lib/active_merchant/billing/gateways/inspire.rb
 - lib/active_merchant/billing/gateways/instapay.rb
@@ -411,7 +407,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="