activemerchant 1.79.2 → 1.80.0

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

@@ -119,7 +119,7 @@ module ActiveMerchant #:nodoc:
                       'KO' => 'N',
                       'NO' => 'R' }
 
-      SUCCESS_MESSAGE = "The transaction was successful"
+      SUCCESS_MESSAGE = 'The transaction was successful'
 
       THREE_D_SECURE_DISPLAY_WAYS = { :main_window => 'MAINW',  # display the identification page in the main window
                                                                 # (default value).
@@ -128,11 +128,11 @@ module ActiveMerchant #:nodoc:
                                       :pop_ix      => 'POPIX' } # display the identification page in a pop-up window
                                                                 # and remain in the pop-up window.
 
-      OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE   = "Signature usage will be the default for a future release of ActiveMerchant. You should either begin using it, or update your configuration to explicitly disable it (signature_encryptor: none)"
+      OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE   = 'Signature usage will be the default for a future release of ActiveMerchant. You should either begin using it, or update your configuration to explicitly disable it (signature_encryptor: none)'
       OGONE_STORE_OPTION_DEPRECATION_MESSAGE   = "The 'store' option has been renamed to 'billing_id', and its usage is deprecated."
 
-      self.test_url = "https://secure.ogone.com/ncol/test/"
-      self.live_url = "https://secure.ogone.com/ncol/prod/"
+      self.test_url = 'https://secure.ogone.com/ncol/test/'
+      self.live_url = 'https://secure.ogone.com/ncol/prod/'
 
       self.supported_countries = ['BE', 'DE', 'FR', 'NL', 'AT', 'CH']
       # also supports Airplus and UATP
@@ -150,7 +150,7 @@ module ActiveMerchant #:nodoc:
       # Verify and reserve the specified amount on the account, without actually doing the transaction.
       def authorize(money, payment_source, options = {})
         post = {}
-        action = (payment_source.brand == "mastercard") ? "PAU" : "RES"
+        action = (payment_source.brand == 'mastercard') ? 'PAU' : 'RES'
         add_invoice(post, options)
         add_payment_source(post, payment_source, options)
         add_address(post, payment_source, options)
@@ -235,12 +235,12 @@ module ActiveMerchant #:nodoc:
       private
 
       def reference_from(authorization)
-        authorization.split(";").first
+        authorization.split(';').first
       end
 
       def reference_transaction?(identifier)
         return false unless identifier.is_a?(String)
-        _, action = identifier.split(";")
+        _, action = identifier.split(';')
         !action.nil?
       end
 
@@ -286,7 +286,7 @@ module ActiveMerchant #:nodoc:
           THREE_D_SECURE_DISPLAY_WAYS[:main_window]
         add_pair post, 'WIN3DS', win_3ds
 
-        add_pair post, 'HTTP_ACCEPT',     options[:http_accept] || "*/*"
+        add_pair post, 'HTTP_ACCEPT',     options[:http_accept] || '*/*'
         add_pair post, 'HTTP_USER_AGENT', options[:http_user_agent] if options[:http_user_agent]
         add_pair post, 'ACCEPTURL',       options[:accept_url]      if options[:accept_url]
         add_pair post, 'DECLINEURL',      options[:decline_url]     if options[:decline_url]
@@ -339,7 +339,7 @@ module ActiveMerchant #:nodoc:
       def add_creditcard(post, creditcard)
         add_pair post, 'CN',     creditcard.name
         add_pair post, 'CARDNO', creditcard.number
-        add_pair post, 'ED',     "%02d%02s" % [creditcard.month, creditcard.year.to_s[-2..-1]]
+        add_pair post, 'ED',     '%02d%02s' % [creditcard.month, creditcard.year.to_s[-2..-1]]
         add_pair post, 'CVC',    creditcard.verification_value
       end
 
@@ -349,8 +349,8 @@ module ActiveMerchant #:nodoc:
 
         # Add HTML_ANSWER element (3-D Secure specific to the response's params)
         # Note: HTML_ANSWER is not an attribute so we add it "by hand" to the response
-        if html_answer = REXML::XPath.first(xml_root, "//HTML_ANSWER")
-          response["HTML_ANSWER"] = html_answer.text
+        if html_answer = REXML::XPath.first(xml_root, '//HTML_ANSWER')
+          response['HTML_ANSWER'] = html_answer.text
         end
 
         response
@@ -365,27 +365,27 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(url(parameters['PAYID']), post_data(action, parameters)))
 
         options = {
-          :authorization => [response["PAYID"], action].join(";"),
+          :authorization => [response['PAYID'], action].join(';'),
           :test          => test?,
-          :avs_result    => { :code => AVS_MAPPING[response["AAVCheck"]] },
-          :cvv_result    => CVV_MAPPING[response["CVCCheck"]]
+          :avs_result    => { :code => AVS_MAPPING[response['AAVCheck']] },
+          :cvv_result    => CVV_MAPPING[response['CVCCheck']]
         }
         OgoneResponse.new(successful?(response), message_from(response), response, options)
       end
 
       def url(payid)
-        (test? ? test_url : live_url) + (payid ? "maintenancedirect.asp" : "orderdirect.asp")
+        (test? ? test_url : live_url) + (payid ? 'maintenancedirect.asp' : 'orderdirect.asp')
       end
 
       def successful?(response)
-        response["NCERROR"] == "0"
+        response['NCERROR'] == '0'
       end
 
       def message_from(response)
         if successful?(response)
           SUCCESS_MESSAGE
         else
-          format_error_message(response["NCERRORPLUS"])
+          format_error_message(response['NCERRORPLUS'])
         end
       end
 
@@ -393,9 +393,9 @@ module ActiveMerchant #:nodoc:
         raw_message = message.to_s.strip
         case raw_message
         when /\|/
-          raw_message.split("|").join(", ").capitalize
+          raw_message.split('|').join(', ').capitalize
         when /\//
-          raw_message.split("/").first.to_s.capitalize
+          raw_message.split('/').first.to_s.capitalize
         else
           raw_message.to_s.capitalize
         end
@@ -409,7 +409,7 @@ module ActiveMerchant #:nodoc:
 
       def add_signature(parameters)
         if @options[:signature].blank?
-           ActiveMerchant.deprecated(OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE) unless(@options[:signature_encryptor] == "none")
+           ActiveMerchant.deprecated(OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE) unless(@options[:signature_encryptor] == 'none')
            return
         end
 
@@ -432,7 +432,7 @@ module ActiveMerchant #:nodoc:
 
         filtered_params = signed_parameters.select{|k,v| !v.blank?}
         sha_encryptor.hexdigest(
-          filtered_params.sort_by{|k,v| k.upcase}.map{|k, v| "#{k.upcase}=#{v}#{secret}"}.join("")
+          filtered_params.sort_by{|k,v| k.upcase}.map{|k, v| "#{k.upcase}=#{v}#{secret}"}.join('')
         ).upcase
       end
 
@@ -449,7 +449,7 @@ module ActiveMerchant #:nodoc:
               ALIAS
             ).map{|key| parameters[key]} +
             [secret]
-          ).join("")
+          ).join('')
         ).upcase
       end
 

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

@@ -182,7 +182,7 @@ module ActiveMerchant #:nodoc:
         key = options[:key] || @secret_key
         {
           'Content-Type'    => 'application/json;utf-8',
-          'Omise-Version'   => @api_version || "2014-07-27",
+          'Omise-Version'   => @api_version || '2014-07-27',
           'User-Agent'      => "ActiveMerchantBindings/#{ActiveMerchant::VERSION} Ruby/#{RUBY_VERSION}",
           'Authorization'   => 'Basic ' + Base64.encode64(key.to_s + ':').strip,
           'Accept-Encoding' => 'utf-8'
@@ -216,7 +216,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def json_error(raw_response)
-        msg  = "Invalid response received from Omise API. Please contact support@omise.co if you continue to receive this message."
+        msg  = 'Invalid response received from Omise API. Please contact support@omise.co if you continue to receive this message.'
         msg += "The raw response returned by the API was #{raw_response.inspect})"
         { message: msg }
       end
@@ -263,7 +263,7 @@ module ActiveMerchant #:nodoc:
         if successful?(response)
           'Success'
         else
-          (response['message'] ? response['message'] : response['failure_message'])
+          response['message'] || response['failure_message']
         end
       end
 

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

@@ -38,6 +38,7 @@ module ActiveMerchant #:nodoc:
       def capture(money, authorization, options = {})
         post = {}
         post[:amount] = amount(money) if money
+        post[:payments] = options[:payments] if options[:payments]
         commit(:post, "charges/#{CGI.escape(authorization)}/capture", post, options)
       end
 
@@ -114,6 +115,7 @@ module ActiveMerchant #:nodoc:
         post[:device_session_id] = options[:device_session_id]
         post[:currency] = (options[:currency] || currency(money)).upcase
         post[:use_card_points] = options[:use_card_points] if options[:use_card_points]
+        post[:payment_plan] = {payments: options[:payments]} if options[:payments]
         add_creditcard(post, creditcard, options)
         post
       end
@@ -163,10 +165,10 @@ module ActiveMerchant #:nodoc:
 
       def headers(options = {})
         {
-          "Content-Type" => "application/json",
-          "Authorization" => "Basic " + Base64.strict_encode64(@api_key.to_s + ":").strip,
-          "User-Agent" => "Openpay/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
-          "X-Openpay-Client-User-Agent" => user_agent
+          'Content-Type' => 'application/json',
+          'Authorization' => 'Basic ' + Base64.strict_encode64(@api_key.to_s + ':').strip,
+          'User-Agent' => "Openpay/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
+          'X-Openpay-Client-User-Agent' => user_agent
         }
       end
 

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

@@ -253,7 +253,7 @@ module ActiveMerchant #:nodoc:
           post[:card] = {
             holder: payment.name,
             number: payment.number,
-            expiryMonth: "%02d" % payment.month,
+            expiryMonth: '%02d' % payment.month,
             expiryYear: payment.year,
             cvv: payment.verification_value,
           }
@@ -297,8 +297,8 @@ module ActiveMerchant #:nodoc:
           parse(
             ssl_post(
               url,
-              post.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&"),
-              "Content-Type" => "application/x-www-form-urlencoded;charset=UTF-8"
+              post.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&'),
+              'Content-Type' => 'application/x-www-form-urlencoded;charset=UTF-8'
             )
           )
         rescue ResponseError => e
@@ -365,7 +365,7 @@ module ActiveMerchant #:nodoc:
           else
             h[k] = v
           end
-         end
+        end
       end
     end
   end

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

@@ -75,10 +75,10 @@ module ActiveMerchant #:nodoc:
       def parse_card_or_auth(card_or_auth, options)
         if card_or_auth.respond_to?(:number)
           @credit_card = card_or_auth
-          @stored_data = ""
+          @stored_data = ''
         else
           options[:confirmationNumber] = card_or_auth
-          @stored_data = "StoredData"
+          @stored_data = 'StoredData'
         end
       end
 

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

@@ -1,5 +1,5 @@
 require 'active_merchant/billing/gateways/orbital/orbital_soft_descriptors'
-require "rexml/document"
+require 'rexml/document'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -30,15 +30,15 @@ module ActiveMerchant #:nodoc:
     class OrbitalGateway < Gateway
       include Empty
 
-      API_VERSION = "7.1"
+      API_VERSION = '7.1'
 
       POST_HEADERS = {
-        "MIME-Version" => "1.1",
-        "Content-Type" => "application/PTI#{API_VERSION.gsub(/\./, '')}",
-        "Content-transfer-encoding" => "text",
-        "Request-number" => '1',
-        "Document-type" => "Request",
-        "Interface-Version" => "Ruby|ActiveMerchant|Proprietary Gateway"
+        'MIME-Version' => '1.1',
+        'Content-Type' => "application/PTI#{API_VERSION.gsub(/\./, '')}",
+        'Content-transfer-encoding' => 'text',
+        'Request-number' => '1',
+        'Document-type' => 'Request',
+        'Interface-Version' => 'Ruby|ActiveMerchant|Proprietary Gateway'
       }
 
       SUCCESS = '0'
@@ -65,14 +65,14 @@ module ActiveMerchant #:nodoc:
 
       class_attribute :secondary_test_url, :secondary_live_url
 
-      self.test_url = "https://orbitalvar1.chasepaymentech.com/authorize"
-      self.secondary_test_url = "https://orbitalvar2.chasepaymentech.com/authorize"
+      self.test_url = 'https://orbitalvar1.chasepaymentech.com/authorize'
+      self.secondary_test_url = 'https://orbitalvar2.chasepaymentech.com/authorize'
 
-      self.live_url = "https://orbital1.chasepaymentech.com/authorize"
-      self.secondary_live_url = "https://orbital2.chasepaymentech.com/authorize"
+      self.live_url = 'https://orbital1.chasepaymentech.com/authorize'
+      self.secondary_live_url = 'https://orbital2.chasepaymentech.com/authorize'
 
-      self.supported_countries = ["US", "CA"]
-      self.default_currency = "CAD"
+      self.supported_countries = ['US', 'CA']
+      self.default_currency = 'CAD'
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
 
       self.display_name = 'Orbital Paymentech'
@@ -83,45 +83,45 @@ module ActiveMerchant #:nodoc:
       AVS_SUPPORTED_COUNTRIES = ['US', 'CA', 'UK', 'GB']
 
       CURRENCY_CODES = {
-        "AUD" => '036',
-        "BRL" => '986',
-        "CAD" => '124',
-        "CLP" => '152',
-        "CZK" => '203',
-        "DKK" => '208',
-        "HKD" => '344',
-        "ICK" => '352',
-        "JPY" => '392',
-        "MXN" => '484',
-        "NZD" => '554',
-        "NOK" => '578',
-        "SGD" => '702',
-        "SEK" => '752',
-        "CHF" => '756',
-        "GBP" => '826',
-        "USD" => '840',
-        "EUR" => '978'
+        'AUD' => '036',
+        'BRL' => '986',
+        'CAD' => '124',
+        'CLP' => '152',
+        'CZK' => '203',
+        'DKK' => '208',
+        'HKD' => '344',
+        'ICK' => '352',
+        'JPY' => '392',
+        'MXN' => '484',
+        'NZD' => '554',
+        'NOK' => '578',
+        'SGD' => '702',
+        'SEK' => '752',
+        'CHF' => '756',
+        'GBP' => '826',
+        'USD' => '840',
+        'EUR' => '978'
       }
 
       CURRENCY_EXPONENTS = {
-        "AUD" => '2',
-        "BRL" => '2',
-        "CAD" => '2',
-        "CLP" => '2',
-        "CZK" => '2',
-        "DKK" => '2',
-        "HKD" => '2',
-        "ICK" => '2',
-        "JPY" => '0',
-        "MXN" => '2',
-        "NZD" => '2',
-        "NOK" => '2',
-        "SGD" => '2',
-        "SEK" => '2',
-        "CHF" => '2',
-        "GBP" => '2',
-        "USD" => '2',
-        "EUR" => '2'
+        'AUD' => '2',
+        'BRL' => '2',
+        'CAD' => '2',
+        'CLP' => '2',
+        'CZK' => '2',
+        'DKK' => '2',
+        'HKD' => '2',
+        'ICK' => '2',
+        'JPY' => '0',
+        'MXN' => '2',
+        'NZD' => '2',
+        'NOK' => '2',
+        'SGD' => '2',
+        'SEK' => '2',
+        'CHF' => '2',
+        'GBP' => '2',
+        'USD' => '2',
+        'EUR' => '2'
       }
 
       # INDUSTRY TYPES
@@ -243,7 +243,7 @@ module ActiveMerchant #:nodoc:
 
       def void(authorization, options = {}, deprecated = {})
         if(!options.kind_of?(Hash))
-          ActiveMerchant.deprecated("Calling the void method with an amount parameter is deprecated and will be removed in a future version.")
+          ActiveMerchant.deprecated('Calling the void method with an amount parameter is deprecated and will be removed in a future version.')
           return void(options, deprecated.merge(:amount => authorization))
         end
 
@@ -315,7 +315,7 @@ module ActiveMerchant #:nodoc:
       private
 
       def authorization_string(*args)
-        args.compact.join(";")
+        args.compact.join(';')
       end
 
       def split_authorization(authorization)
@@ -509,8 +509,8 @@ module ActiveMerchant #:nodoc:
       def parse(body)
         response = {}
         xml = REXML::Document.new(body)
-        root = REXML::XPath.first(xml, "//Response") ||
-               REXML::XPath.first(xml, "//ErrorResponse")
+        root = REXML::XPath.first(xml, '//Response') ||
+               REXML::XPath.first(xml, '//ErrorResponse')
         if root
           root.elements.to_a.each do |node|
             recurring_parse_element(response, node)
@@ -529,9 +529,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(order, message_type, trace_number=nil)
-        headers = POST_HEADERS.merge("Content-length" => order.size.to_s)
-        headers.merge!( "Trace-number" => trace_number.to_s,
-                        "Merchant-Id" => @options[:merchant_id] ) if @options[:retry_logic] && trace_number
+        headers = POST_HEADERS.merge('Content-length' => order.size.to_s)
+        headers.merge!( 'Trace-number' => trace_number.to_s,
+                        'Merchant-Id' => @options[:merchant_id] ) if @options[:retry_logic] && trace_number
         request = lambda{|url| parse(ssl_post(url, order, headers))}
 
         # Failover URL will be attempted in the event of a connection error
@@ -643,7 +643,7 @@ module ActiveMerchant #:nodoc:
       # RS - Subsequent Recurring Transactions
       def set_recurring_ind(xml, parameters)
         if parameters[:recurring_ind]
-          raise "RecurringInd must be set to either \"RF\" or \"RS\"" unless %w(RF RS).include?(parameters[:recurring_ind])
+          raise 'RecurringInd must be set to either "RF" or "RS"' unless %w(RF RS).include?(parameters[:recurring_ind])
           xml.tag! :RecurringInd, parameters[:recurring_ind]
         end
       end
@@ -745,7 +745,7 @@ module ActiveMerchant #:nodoc:
       # Field lengths should be limited by byte count instead of character count
       # Returns the truncated value or nil
       def byte_limit(value, byte_length)
-        limited_value = ""
+        limited_value = ''
 
         value.to_s.each_char do |c|
           break if((limited_value.bytesize + c.bytesize) > byte_length)
@@ -756,7 +756,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_customer_request_xml(creditcard, options = {})
-        ActiveMerchant.deprecated "Customer Profile support in Orbital is non-conformant to the ActiveMerchant API and will be removed in its current form in a future version. Please contact the ActiveMerchant maintainers if you have an interest in modifying it to conform to the store/unstore/update API."
+        ActiveMerchant.deprecated 'Customer Profile support in Orbital is non-conformant to the ActiveMerchant API and will be removed in its current form in a future version. Please contact the ActiveMerchant maintainers if you have an interest in modifying it to conform to the store/unstore/update API.'
         xml = xml_envelope
         xml.tag! :Request do
           xml.tag! :Profile do
@@ -793,7 +793,7 @@ module ActiveMerchant #:nodoc:
             end
 
             xml.tag! :CCAccountNum, creditcard.number if creditcard
-            xml.tag! :CCExpireDate, creditcard.expiry_date.expiration.strftime("%m%y") if creditcard
+            xml.tag! :CCExpireDate, creditcard.expiry_date.expiration.strftime('%m%y') if creditcard
 
             # This has to come after CCExpireDate.
             add_managed_billing(xml, options)