activemerchant 1.85.0 → 1.86.0

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

@@ -64,7 +64,7 @@ module ActiveMerchant #:nodoc:
 
         add_amount(post, money)
         add_invoice(post, options)
-        add_payment(post, payment)
+        add_payment(post, payment, options)
         unless payment.respond_to?(:track_data) && payment.track_data.present?
           add_address(post, payment, options)
           add_customer_data(post, options)
@@ -195,8 +195,9 @@ module ActiveMerchant #:nodoc:
         post[:description]  = options[:description]
       end
 
-      def add_payment(post, payment)
+      def add_payment(post, payment, options={})
         if payment.respond_to?(:routing_number)
+          post[:checkformat] = options[:check_format] if options[:check_format]
           post[:account] = payment.account_number
           post[:routing] = payment.routing_number
           post[:name]    = payment.name unless payment.name.blank?

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

@@ -113,9 +113,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def scrub(transcript)
-        transcript
-          .gsub(%r{(<CARDNUMBER>\d{6})\d+(\d{4}</CARDNUMBER>)}, '\1...\2')
-          .gsub(%r{(<CVV>)\d+(</CVV)}, '\1...\2')
+        transcript.
+          gsub(%r{(<CARDNUMBER>\d{6})\d+(\d{4}</CARDNUMBER>)}, '\1...\2').
+          gsub(%r{(<CVV>)\d+(</CVV)}, '\1...\2')
       end
 
       private

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

@@ -92,21 +92,21 @@ module ActiveMerchant #:nodoc:
       end
 
       def create_post_for_auth_or_purchase(token, money, options)
-      {
-        'token' => token,
-        'orderDescription' => options[:description] || 'Worldpay Order',
-        'amount' => money,
-        'currencyCode' => options[:currency] || default_currency,
-        'name' => options[:billing_address]&&options[:billing_address][:name] ? options[:billing_address][:name] : '',
-        'billingAddress' => {
-          'address1'=>options[:billing_address]&&options[:billing_address][:address1] ? options[:billing_address][:address1] : '',
-          'address2'=>options[:billing_address]&&options[:billing_address][:address2] ? options[:billing_address][:address2] : '',
-          'address3'=>'',
-          'postalCode'=>options[:billing_address]&&options[:billing_address][:zip] ? options[:billing_address][:zip] : '',
-          'city'=>options[:billing_address]&&options[:billing_address][:city] ? options[:billing_address][:city] : '',
-          'state'=>options[:billing_address]&&options[:billing_address][:state] ? options[:billing_address][:state] : '',
-          'countryCode'=>options[:billing_address]&&options[:billing_address][:country] ? options[:billing_address][:country] : ''
-          },
+        {
+          'token' => token,
+          'orderDescription' => options[:description] || 'Worldpay Order',
+          'amount' => money,
+          'currencyCode' => options[:currency] || default_currency,
+          'name' => options[:billing_address]&&options[:billing_address][:name] ? options[:billing_address][:name] : '',
+          'billingAddress' => {
+            'address1'=>options[:billing_address]&&options[:billing_address][:address1] ? options[:billing_address][:address1] : '',
+            'address2'=>options[:billing_address]&&options[:billing_address][:address2] ? options[:billing_address][:address2] : '',
+            'address3'=>'',
+            'postalCode'=>options[:billing_address]&&options[:billing_address][:zip] ? options[:billing_address][:zip] : '',
+            'city'=>options[:billing_address]&&options[:billing_address][:city] ? options[:billing_address][:city] : '',
+            'state'=>options[:billing_address]&&options[:billing_address][:state] ? options[:billing_address][:state] : '',
+            'countryCode'=>options[:billing_address]&&options[:billing_address][:country] ? options[:billing_address][:country] : ''
+           },
           'customerOrderCode' => options[:order_id],
           'orderType' => 'ECOM',
           'authorizeOnly' => options[:authorizeOnly] ? true : false

data/lib/active_merchant/connection.rb

@@ -61,7 +61,7 @@ module ActiveMerchant
     end
 
     def wiredump_device=(device)
-      raise ArgumentError, "can't wiredump to frozen #{device.class}" if device && device.frozen?
+      raise ArgumentError, "can't wiredump to frozen #{device.class}" if device&.frozen?
       @wiredump_device = device
     end
 
@@ -189,7 +189,7 @@ module ActiveMerchant
 
     def log(level, message, tag)
       message = "[#{tag}] #{message}" if tag
-      logger.send(level, message) if logger
+      logger&.send(level, message)
     end
   end
 end

data/lib/active_merchant/network_connection_retries.rb

@@ -65,7 +65,7 @@ module ActiveMerchant
     def self.log(logger, level, message, tag=nil)
       tag ||= self.class.to_s
       message = "[#{tag}] #{message}"
-      logger.send(level, message) if logger
+      logger&.send(level, message)
     end
 
     private

data/lib/active_merchant/posts_data.rb

@@ -45,8 +45,8 @@ module ActiveMerchant #:nodoc:
     end
 
     def raw_ssl_request(method, endpoint, data, headers = {})
-      logger.warn "#{self.class} using ssl_strict=false, which is insecure" if logger unless ssl_strict
-      logger.warn "#{self.class} posting to plaintext endpoint, which is insecure" if logger unless endpoint.to_s =~ /^https:/
+      logger&.warn "#{self.class} using ssl_strict=false, which is insecure" unless ssl_strict
+      logger&.warn "#{self.class} posting to plaintext endpoint, which is insecure" unless endpoint.to_s =~ /^https:/
 
       connection = new_connection(endpoint)
       connection.open_timeout = open_timeout

data/lib/active_merchant/version.rb

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

data/lib/activemerchant.rb

@@ -1 +1 @@
-require 'active_merchant'
+require 'active_merchant'

data/lib/support/gateway_support.rb

@@ -67,4 +67,3 @@ class GatewaySupport #:nodoc:
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.85.0
+  version: 1.86.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-28 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport