activemerchant 1.45.0 → 1.126.0

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

@@ -5,10 +5,12 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://webservices.optimalpayments.com/creditcardWS/CreditCardServlet/v1'
 
       # The countries the gateway supports merchants from as 2 digit ISO country codes
-      self.supported_countries = ['CA', 'US', 'GB']
+      self.supported_countries = %w[CA US GB AU AT BE BG HR CY CZ DK
+                                    EE FI DE GR HU IE IT LV LT LU MT
+                                    NL NO PL PT RO SK SI ES SE CH]
 
       # The card types supported by the payment gateway
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :solo] # :switch?
+      self.supported_cardtypes = %i[visa master american_express discover diners_club]
 
       # The homepage URL of the gateway
       self.homepage_url = 'http://www.optimalpayments.com/'
@@ -17,13 +19,12 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'Optimal Payments'
 
       def initialize(options = {})
-
-        if(options[:login])
+        if options[:login]
           ActiveMerchant.deprecated("The 'login' option is deprecated in favor of 'store_id' and will be removed in a future version.")
           options[:store_id] = options[:login]
         end
 
-        if(options[:account])
+        if options[:account]
           ActiveMerchant.deprecated("The 'account' option is deprecated in favor of 'account_number' and will be removed in a future version.")
           options[:account_number] = options[:account]
         end
@@ -59,15 +60,35 @@ module ActiveMerchant #:nodoc:
         commit('ccSettlement', money, options)
       end
 
+      def verify(credit_card, options = {})
+        parse_card_or_auth(credit_card, options)
+        commit('ccVerification', 0, options)
+      end
+
+      def store(credit_card, options = {})
+        verify(credit_card, options)
+      end
+
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((%3CstorePwd%3E).*(%3C(%2F|/)storePwd%3E))i, '\1[FILTERED]\2').
+          gsub(%r((%3CcardNum%3E)\d*(%3C(%2F|/)cardNum%3E))i, '\1[FILTERED]\2').
+          gsub(%r((%3Ccvd%3E)\d*(%3C(%2F|/)cvd%3E))i, '\1[FILTERED]\2')
+      end
+
       private
 
       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
 
@@ -78,33 +99,33 @@ module ActiveMerchant #:nodoc:
       def commit(action, money, post)
         post[:order_id] ||= 'order_id'
 
-        xml = case action
-        when 'ccAuthorize', 'ccPurchase', 'ccVerification'
-          cc_auth_request(money, post)
-        when 'ccCredit', 'ccSettlement'
-          cc_post_auth_request(money, post)
-        when 'ccStoredDataAuthorize', 'ccStoredDataPurchase'
-          cc_stored_data_request(money, post)
-        when 'ccAuthorizeReversal'
-          cc_auth_reversal_request(post)
-        #when 'ccCancelSettle', 'ccCancelCredit', 'ccCancelPayment'
-        #  cc_cancel_request(money, post)
-        #when 'ccPayment'
-        #  cc_payment_request(money, post)
-        #when 'ccAuthenticate'
-        #  cc_authenticate_request(money, post)
-        else
-          raise 'Unknown Action'
-        end
+        xml =
+          case action
+          when 'ccAuthorize', 'ccPurchase', 'ccVerification'
+            cc_auth_request(money, post)
+          when 'ccCredit', 'ccSettlement'
+            cc_post_auth_request(money, post)
+          when 'ccStoredDataAuthorize', 'ccStoredDataPurchase'
+            cc_stored_data_request(money, post)
+          when 'ccAuthorizeReversal'
+            cc_auth_reversal_request(post)
+          # when 'ccCancelSettle', 'ccCancelCredit', 'ccCancelPayment'
+          #  cc_cancel_request(money, post)
+          # when 'ccPayment'
+          #  cc_payment_request(money, post)
+          # when 'ccAuthenticate'
+          #  cc_authenticate_request(money, post)
+          else
+            raise 'Unknown Action'
+          end
         txnRequest = escape_uri(xml)
         response = parse(ssl_post(test? ? self.test_url : self.live_url, "txnMode=#{action}&txnRequest=#{txnRequest}"))
 
         Response.new(successful?(response), message_from(response), hash_from_xml(response),
-          :test          => test?,
-          :authorization => authorization_from(response),
-          :avs_result => { :code => avs_result_from(response) },
-          :cvv_result => cvv_result_from(response)
-        )
+          test: test?,
+          authorization: authorization_from(response),
+          avs_result: { code: avs_result_from(response) },
+          cvv_result: cvv_result_from(response))
       end
 
       # The upstream is picky and so we can't use CGI.escape like we want to
@@ -118,9 +139,7 @@ module ActiveMerchant #:nodoc:
 
       def message_from(response)
         REXML::XPath.each(response, '//detail') do |detail|
-          if detail.is_a?(REXML::Element) && detail.elements['tag'].text == 'InternalResponseDescription'
-            return detail.elements['value'].text
-          end
+          return detail.elements['value'].text if detail.is_a?(REXML::Element) && detail.elements['tag'].text == 'InternalResponseDescription'
         end
         nil
       end
@@ -142,13 +161,13 @@ module ActiveMerchant #:nodoc:
         %w(confirmationNumber authCode
            decision code description
            actionCode avsResponse cvdResponse
-           txnTime duplicateFound
-        ).each do |tag|
+           txnTime duplicateFound).each do |tag|
           node = REXML::XPath.first(response, "//#{tag}")
           hsh[tag] = node.text if node
         end
         REXML::XPath.each(response, '//detail') do |detail|
           next unless detail.is_a?(REXML::Element)
+
           tag = detail.elements['tag'].text
           value = detail.elements['value'].text
           hsh[tag] = value
@@ -157,7 +176,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def xml_document(root_tag)
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.tag!(root_tag, schema) do
           yield xml
         end
@@ -166,14 +185,14 @@ module ActiveMerchant #:nodoc:
 
       def get_text_from_document(document, node)
         node = REXML::XPath.first(document, node)
-        node && node.text
+        node&.text
       end
 
       def cc_auth_request(money, opts)
         xml_document('ccAuthRequestV1') do |xml|
           build_merchant_account(xml)
           xml.merchantRefNum opts[:order_id]
-          xml.amount(money/100.0)
+          xml.amount(money / 100.0)
           build_card(xml, opts)
           build_billing_details(xml, opts)
           build_shipping_details(xml, opts)
@@ -194,7 +213,7 @@ module ActiveMerchant #:nodoc:
           build_merchant_account(xml)
           xml.confirmationNumber opts[:confirmationNumber]
           xml.merchantRefNum opts[:order_id]
-          xml.amount(money/100.0)
+          xml.amount(money / 100.0)
         end
       end
 
@@ -203,7 +222,7 @@ module ActiveMerchant #:nodoc:
           build_merchant_account(xml)
           xml.merchantRefNum opts[:order_id]
           xml.confirmationNumber opts[:confirmationNumber]
-          xml.amount(money/100.0)
+          xml.amount(money / 100.0)
         end
       end
 
@@ -237,31 +256,32 @@ module ActiveMerchant #:nodoc:
       def schema
         { 'xmlns' => 'http://www.optimalpayments.com/creditcard/xmlschema/v1',
           'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-          'xsi:schemaLocation' => 'http://www.optimalpayments.com/creditcard/xmlschema/v1'
-        }
+          'xsi:schemaLocation' => 'http://www.optimalpayments.com/creditcard/xmlschema/v1' }
       end
 
       def build_merchant_account(xml)
         xml.tag! 'merchantAccount' do
-          xml.tag! 'accountNum' , @options[:account_number]
-          xml.tag! 'storeID'    , @options[:store_id]
-          xml.tag! 'storePwd'   , @options[:password]
+          xml.tag! 'accountNum', @options[:account_number]
+          xml.tag! 'storeID',    @options[:store_id]
+          xml.tag! 'storePwd',   @options[:password]
         end
       end
 
       def build_card(xml, opts)
         xml.tag! 'card' do
-          xml.tag! 'cardNum'      , @credit_card.number
+          xml.tag! 'cardNum', @credit_card.number
           xml.tag! 'cardExpiry' do
-            xml.tag! 'month'      , @credit_card.month
-            xml.tag! 'year'       , @credit_card.year
+            xml.tag! 'month', @credit_card.month
+            xml.tag! 'year', @credit_card.year
           end
           if brand = card_type(@credit_card.brand)
-            xml.tag! 'cardType'     , brand
+            xml.tag! 'cardType', brand
           end
-          if @credit_card.verification_value
-            xml.tag! 'cvdIndicator' , '1' # Value Provided
-            xml.tag! 'cvd'          , @credit_card.verification_value
+          if @credit_card.verification_value?
+            xml.tag! 'cvdIndicator', '1' # Value Provided
+            xml.tag! 'cvd', @credit_card.verification_value
+          else
+            xml.tag! 'cvdIndicator', '0'
           end
         end
       end
@@ -269,45 +289,43 @@ module ActiveMerchant #:nodoc:
       def build_billing_details(xml, opts)
         xml.tag! 'billingDetails' do
           xml.tag! 'cardPayMethod', 'WEB'
-          build_address(xml, opts[:billing_address], opts[:email])
+          build_address(xml, opts[:billing_address]) if opts[:billing_address]
+          xml.tag! 'email', opts[:email] if opts[:email]
         end
       end
 
       def build_shipping_details(xml, opts)
         xml.tag! 'shippingDetails' do
-          build_address(xml, opts[:shipping_address], opts[:email])
+          build_address(xml, opts[:shipping_address])
+          xml.tag! 'email', opts[:email] if opts[:email]
         end if opts[:shipping_address].present?
       end
 
-      def build_address(xml, addr, email=nil)
+      def build_address(xml, addr)
         if addr[:name]
-          xml.tag! 'firstName', addr[:name].split(' ').first
-          xml.tag! 'lastName' , addr[:name].split(' ').last
+          first_name, last_name = split_names(addr[:name])
+          xml.tag! 'firstName', first_name
+          xml.tag! 'lastName', last_name
         end
-        xml.tag! 'street' , addr[:address1] if addr[:address1].present?
+        xml.tag! 'street', addr[:address1] if addr[:address1].present?
         xml.tag! 'street2', addr[:address2] if addr[:address2].present?
-        xml.tag! 'city'   , addr[:city]     if addr[:city].present?
+        xml.tag! 'city', addr[:city] if addr[:city].present?
         if addr[:state].present?
           state_tag = %w(US CA).include?(addr[:country]) ? 'state' : 'region'
           xml.tag! state_tag, addr[:state]
         end
-        xml.tag! 'country', addr[:country]  if addr[:country].present?
-        xml.tag! 'zip'    , addr[:zip]      if addr[:zip].present?
-        xml.tag! 'phone'  , addr[:phone]    if addr[:phone].present?
-        xml.tag! 'email', email if email
+        xml.tag! 'country', addr[:country] if addr[:country].present?
+        xml.tag! 'zip', addr[:zip] if addr[:zip].present?
+        xml.tag! 'phone', addr[:phone] if addr[:phone].present?
       end
 
       def card_type(key)
         { 'visa'            => 'VI',
           'master'          => 'MC',
-          'american_express'=> 'AM',
+          'american_express' => 'AM',
           'discover'        => 'DI',
-          'diners_club'     => 'DC',
-          #'switch'          => '',
-          'solo'            => 'SO'
-        }[key]
+          'diners_club'     => 'DC' }[key]
       end
-
     end
   end
 end

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

@@ -27,16 +27,14 @@ module ActiveMerchant #:nodoc:
       def validate
         errors = []
 
-        errors << [:merchant_name, "is required"] if self.merchant_name.blank?
-        errors << [:merchant_name, "is required to be 25 bytes or less"] if self.merchant_name.bytesize > 25
+        errors << [:merchant_name, 'is required'] if self.merchant_name.blank?
+        errors << [:merchant_name, 'is required to be 25 bytes or less'] if self.merchant_name.bytesize > 25
 
-        if(!empty?(self.merchant_phone) && !self.merchant_phone.match(PHONE_FORMAT_1) && !self.merchant_phone.match(PHONE_FORMAT_2))
-          errors << [:merchant_phone, "is required to follow \"NNN-NNN-NNNN\" or \"NNN-AAAAAAA\" format"]
-        end
+        errors << [:merchant_phone, 'is required to follow "NNN-NNN-NNNN" or "NNN-AAAAAAA" format'] if !empty?(self.merchant_phone) && !self.merchant_phone.match(PHONE_FORMAT_1) && !self.merchant_phone.match(PHONE_FORMAT_2)
 
-        [:merchant_email, :merchant_url].each do |attr|
+        %i[merchant_email merchant_url].each do |attr|
           unless self.send(attr).blank?
-            errors << [attr, "is required to be 13 bytes or less"] if(self.send(attr).bytesize > 13)
+            errors << [attr, 'is required to be 13 bytes or less'] if self.send(attr).bytesize > 13
           end
         end