activemerchant 1.83.0 → 1.84.0

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
       self.default_currency = 'GBP'
       self.money_format = :cents
       self.supported_countries = %w(HK GB AU AD AR BE BR CA CH CN CO CR CY CZ DE DK ES FI FR GI GR HU IE IN IT JP LI LU MC MT MY MX NL NO NZ PA PE PL PT SE SG SI SM TR UM VA)
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :maestro, :laser, :switch]
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :maestro]
       self.currencies_without_fractions = %w(HUF IDR ISK JPY KRW)
       self.currencies_with_three_decimal_places = %w(BHD KWD OMR RSD TND)
       self.homepage_url = 'http://www.worldpay.com/'
@@ -20,9 +20,7 @@ module ActiveMerchant #:nodoc:
         'american_express' => 'AMEX-SSL',
         'jcb'              => 'JCB-SSL',
         'maestro'          => 'MAESTRO-SSL',
-        'laser'            => 'LASER-SSL',
         'diners_club'      => 'DINERS-SSL',
-        'switch'           => 'MAESTRO-SSL'
       }
 
       def initialize(options = {})
@@ -362,7 +360,6 @@ module ActiveMerchant #:nodoc:
           :authorization => authorization_from(raw),
           :error_code => error_code_from(success, raw),
           :test => test?)
-
       rescue ActiveMerchant::ResponseError => e
         if e.response.code.to_s == '401'
           return Response.new(false, 'Invalid credentials', {}, :test => test?)

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
       self.money_format = :cents
 
       self.supported_countries = %w(HK US GB BE CH CZ DE DK ES FI FR GR HU IE IT LU MT NL NO PL PT SE SG TR)
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :maestro, :laser, :switch]
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :maestro]
 
       self.homepage_url = 'http://online.worldpay.com'
       self.display_name = 'Worldpay Online Payments'
@@ -160,7 +160,6 @@ module ActiveMerchant #:nodoc:
             success = true
             response = {}
           end
-
         rescue ResponseError => e
           raw_response = e.response.body
           response = response_error(raw_response)
@@ -188,15 +187,13 @@ module ActiveMerchant #:nodoc:
       end
 
       def test?
-        @service_key[0]=='T' ? true : false
+        @service_key[0] == 'T'
       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)

data/lib/active_merchant/connection.rb

@@ -117,7 +117,6 @@ module ActiveMerchant
           result
         end
       end
-
     ensure
       info 'connection_request_total_time=%.4fs' % [Process.clock_gettime(Process::CLOCK_MONOTONIC) - request_start], tag
       http.finish if http.started?
@@ -162,7 +161,6 @@ module ActiveMerchant
       else
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
-
     end
 
     def configure_cert(http)

data/lib/active_merchant/country.rb

@@ -246,6 +246,7 @@ module ActiveMerchant #:nodoc:
       { alpha2: 'QA', name: 'Qatar', alpha3: 'QAT', numeric: '634' },
       { alpha2: 'RE', name: 'Reunion', alpha3: 'REU', numeric: '638' },
       { alpha2: 'RO', name: 'Romania', alpha3: 'ROM', numeric: '642' },
+      { alpha2: 'RO', name: 'Romania', alpha3: 'ROU', numeric: '642' },
       { alpha2: 'RU', name: 'Russian Federation', alpha3: 'RUS', numeric: '643' },
       { alpha2: 'RW', name: 'Rwanda', alpha3: 'RWA', numeric: '646' },
       { alpha2: 'BL', name: 'Saint Barthélemy', alpha3: 'BLM', numeric: '652' },

data/lib/active_merchant/net_http_ssl_connection.rb

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

data/lib/active_merchant/network_connection_retries.rb

@@ -69,6 +69,7 @@ module ActiveMerchant
     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/post_data.rb

@@ -17,6 +17,7 @@ module ActiveMerchant
     alias_method :to_s, :to_post_data
 
     private
+
     def required?(key)
       required_fields.include?(key)
     end

data/lib/active_merchant/posts_data.rb

@@ -1,6 +1,5 @@
 module ActiveMerchant #:nodoc:
   module PostsData  #:nodoc:
-
     def self.included(base)
       base.class_attribute :ssl_strict
       base.ssl_strict = true
@@ -89,6 +88,5 @@ module ActiveMerchant #:nodoc:
         raise ResponseError.new(response)
       end
     end
-
   end
 end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = '1.83.0'
+  VERSION = '1.84.0'
 end

data/lib/support/gateway_support.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'active_support'
 require 'active_merchant'
 
-
 class GatewaySupport #:nodoc:
   ACTIONS = [:purchase, :authorize, :capture, :void, :credit, :recurring]
 
@@ -32,13 +31,13 @@ class GatewaySupport #:nodoc:
     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|
-      print "#{g.display_name.ljust(width + 20)}"
+      print g.display_name.ljust(width + 20)
       ACTIONS.each do |f|
-        print "#{(g.instance_methods.include?(f.to_s) ? "Y" : "N").center(width)}"
+        print((g.instance_methods.include?(f.to_s) ? 'Y' : 'N').center(width))
       end
       puts
     end

data/lib/support/ssl_verify.rb

@@ -60,7 +60,6 @@ class SSLVerify
         puts d.name
       end
     end
-
   end
 
   def try_host(http, path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.83.0
+  version: 1.84.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport