activemerchant 1.45.0 → 1.126.0

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

@@ -13,40 +13,64 @@ module ActiveMerchant #:nodoc:
       APPROVED = 'OK'
 
       TRANSACTIONS = {
-        :purchase => 'PAYMENT',
-        :credit => 'REFUND',
-        :authorization => 'DEFERRED',
-        :capture => 'RELEASE',
-        :void => 'VOID',
-        :abort => 'ABORT',
-        :store => 'TOKEN',
-        :unstore => 'REMOVETOKEN'
+        purchase: 'PAYMENT',
+        credit: 'REFUND',
+        authorization: 'DEFERRED',
+        capture: 'RELEASE',
+        void: 'VOID',
+        abort: 'ABORT',
+        store: 'TOKEN',
+        unstore: 'REMOVETOKEN',
+        repeat: 'REPEAT'
       }
 
       CREDIT_CARDS = {
-        :visa => "VISA",
-        :master => "MC",
-        :delta => "DELTA",
-        :solo => "SOLO",
-        :switch => "MAESTRO",
-        :maestro => "MAESTRO",
-        :american_express => "AMEX",
-        :electron => "UKE",
-        :diners_club => "DC",
-        :jcb => "JCB"
+        visa: 'VISA',
+        master: 'MC',
+        delta: 'DELTA',
+        maestro: 'MAESTRO',
+        american_express: 'AMEX',
+        electron: 'UKE',
+        diners_club: 'DC',
+        jcb: 'JCB'
       }
 
-      ELECTRON = /^(424519|42496[23]|450875|48440[6-8]|4844[1-5][1-5]|4917[3-5][0-9]|491880)\d{10}(\d{3})?$/
+      AVS_CODE = {
+        'NOTPROVIDED' => nil,
+        'NOTCHECKED' => 'X',
+        'MATCHED' => 'Y',
+        'NOTMATCHED' => 'N'
+      }
+
+      CVV_CODE = {
+        'NOTPROVIDED' => 'S',
+        'NOTCHECKED' => 'X',
+        'MATCHED' => 'M',
+        'NOTMATCHED' => 'N'
+      }
 
-      AVS_CVV_CODE = {
-        "NOTPROVIDED" => nil,
-        "NOTCHECKED" => 'X',
-        "MATCHED" => 'Y',
-        "NOTMATCHED" => 'N'
+      OPTIONAL_REQUEST_FIELDS = {
+        paypal_callback_url: :PayPalCallbackURL,
+        basket: :Basket,
+        gift_aid_payment: :GiftAidPayment,
+        apply_avscv2: :ApplyAVSCV2,
+        apply_3d_secure: :Apply3DSecure,
+        account_type: :AccountType,
+        billing_agreement: :BillingAgreement,
+        basket_xml: :BasketXML,
+        customer_xml: :CustomerXML,
+        surcharge_xml: :SurchargeXML,
+        vendor_data: :VendorData,
+        language: :Language,
+        website: :Website,
+        recipient_account_number: :FIRecipientAcctNumber,
+        recipient_surname: :FIRecipientSurname,
+        recipient_postcode: :FIRecipientPostcode,
+        recipient_dob: :FIRecipientDoB
       }
 
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :switch, :solo, :maestro, :diners_club]
-      self.supported_countries = ['GB', 'IE']
+      self.supported_countries = %w[GB IE]
+      self.supported_cardtypes = %i[visa master american_express discover jcb maestro diners_club]
       self.default_currency = 'GBP'
 
       self.homepage_url = 'http://www.sagepay.com'
@@ -69,7 +93,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_optional_data(post, options)
 
-        commit(:purchase, post)
+        commit((past_purchase_reference?(payment_method) ? :repeat : :purchase), post)
       end
 
       def authorize(money, payment_method, options = {})
@@ -112,7 +136,7 @@ module ActiveMerchant #:nodoc:
 
         post = {}
 
-        add_credit_reference(post, identification)
+        add_related_reference(post, identification)
         add_amount(post, money, options)
         add_invoice(post, options)
 
@@ -138,7 +162,37 @@ module ActiveMerchant #:nodoc:
         commit(:unstore, post)
       end
 
+      def verify(credit_card, options = {})
+        MultiResponse.run(:use_first_response) do |r|
+          r.process { authorize(100, credit_card, options) }
+          r.process(:ignore_result) { void(r.authorization, options) }
+        end
+      end
+
+      def supports_scrubbing
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(%r((&?CardNumber=)\d+(&?)), '\1[FILTERED]\2').
+          gsub(%r((&?CV2=)\d+(&?)), '\1[FILTERED]\2')
+      end
+
       private
+
+      def truncate(value, max_size)
+        return nil unless value
+        return value.to_s if CGI.escape(value.to_s).length <= max_size
+
+        if value.size > max_size
+          truncate(super(value, max_size), max_size)
+        else
+          truncate(value.to_s.chop, max_size)
+        end
+      end
+
       def add_reference(post, identification)
         order_id, transaction_id, authorization, security_key = identification.split(';')
 
@@ -148,7 +202,7 @@ module ActiveMerchant #:nodoc:
         add_pair(post, :SecurityKey, security_key)
       end
 
-      def add_credit_reference(post, identification)
+      def add_related_reference(post, identification)
         order_id, transaction_id, authorization, security_key = identification.split(';')
 
         add_pair(post, :RelatedVendorTxCode, order_id)
@@ -159,18 +213,18 @@ module ActiveMerchant #:nodoc:
 
       def add_amount(post, money, options)
         currency = options[:currency] || currency(money)
-        add_pair(post, :Amount, localized_amount(money, currency), :required => true)
-        add_pair(post, :Currency, currency, :required => true)
+        add_pair(post, :Amount, localized_amount(money, currency), required: true)
+        add_pair(post, :Currency, currency, required: true)
       end
 
       def add_currency(post, money, options)
         currency = options[:currency] || currency(money)
-        add_pair(post, :Currency, currency, :required => true)
+        add_pair(post, :Currency, currency, required: true)
       end
 
       # doesn't actually use the currency -- dodgy!
       def add_release_amount(post, money, options)
-        add_pair(post, :ReleaseAmount, amount(money), :required => true)
+        add_pair(post, :ReleaseAmount, amount(money), required: true)
       end
 
       def add_customer_data(post, options)
@@ -179,37 +233,35 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_optional_data(post, options)
-        add_pair(post, :GiftAidPayment, options[:gift_aid_payment]) unless options[:gift_aid_payment].blank?
-        add_pair(post, :Apply3DSecure, options[:apply_3d_secure]) unless options[:apply_3d_secure].blank?
         add_pair(post, :CreateToken, 1) unless options[:store].blank?
-        add_pair(post, :FIRecipientAcctNumber, options[:recipient_account_number])
-        add_pair(post, :FIRecipientSurname, options[:recipient_surname])
-        add_pair(post, :FIRecipientPostcode, options[:recipient_postcode])
-        add_pair(post, :FIRecipientDoB, options[:recipient_dob])
+
+        OPTIONAL_REQUEST_FIELDS.each do |gateway_option, sagepay_field|
+          add_pair(post, sagepay_field, options[gateway_option])
+        end
       end
 
       def add_address(post, options)
         if billing_address = options[:billing_address] || options[:address]
-          first_name, last_name = parse_first_and_last_name(billing_address[:name])
-          add_pair(post, :BillingSurname, last_name)
-          add_pair(post, :BillingFirstnames, first_name)
+          first_name, last_name = split_names(billing_address[:name])
+          add_pair(post, :BillingSurname, truncate(last_name, 20))
+          add_pair(post, :BillingFirstnames, truncate(first_name, 20))
           add_pair(post, :BillingAddress1, truncate(billing_address[:address1], 100))
           add_pair(post, :BillingAddress2, truncate(billing_address[:address2], 100))
           add_pair(post, :BillingCity, truncate(billing_address[:city], 40))
-          add_pair(post, :BillingState, truncate(billing_address[:state], 2)) if is_usa(billing_address[:country])
+          add_pair(post, :BillingState, truncate(billing_address[:state], 2)) if usa?(billing_address[:country])
           add_pair(post, :BillingCountry, truncate(billing_address[:country], 2))
           add_pair(post, :BillingPhone, sanitize_phone(billing_address[:phone]))
           add_pair(post, :BillingPostCode, truncate(billing_address[:zip], 10))
         end
 
         if shipping_address = options[:shipping_address] || billing_address
-          first_name, last_name = parse_first_and_last_name(shipping_address[:name])
-          add_pair(post, :DeliverySurname, last_name)
-          add_pair(post, :DeliveryFirstnames, first_name)
+          first_name, last_name = split_names(shipping_address[:name])
+          add_pair(post, :DeliverySurname, truncate(last_name, 20))
+          add_pair(post, :DeliveryFirstnames, truncate(first_name, 20))
           add_pair(post, :DeliveryAddress1, truncate(shipping_address[:address1], 100))
           add_pair(post, :DeliveryAddress2, truncate(shipping_address[:address2], 100))
           add_pair(post, :DeliveryCity, truncate(shipping_address[:city], 40))
-          add_pair(post, :DeliveryState, truncate(shipping_address[:state], 2)) if is_usa(shipping_address[:country])
+          add_pair(post, :DeliveryState, truncate(shipping_address[:state], 2)) if usa?(shipping_address[:country])
           add_pair(post, :DeliveryCountry, truncate(shipping_address[:country], 2))
           add_pair(post, :DeliveryPhone, sanitize_phone(shipping_address[:phone]))
           add_pair(post, :DeliveryPostCode, truncate(shipping_address[:zip], 10))
@@ -217,28 +269,27 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_invoice(post, options)
-        add_pair(post, :VendorTxCode, sanitize_order_id(options[:order_id]), :required => true)
+        add_pair(post, :VendorTxCode, sanitize_order_id(options[:order_id]), required: true)
         add_pair(post, :Description, truncate(options[:description] || options[:order_id], 100))
       end
 
       def add_payment_method(post, payment_method, options)
-        if payment_method.respond_to?(:number)
-          add_credit_card(post, payment_method)
+        if payment_method.is_a?(String)
+          if past_purchase_reference?(payment_method)
+            add_related_reference(post, payment_method)
+          else
+            add_token_details(post, payment_method, options)
+          end
         else
-          add_token_details(post, payment_method, options)
+          add_credit_card(post, payment_method)
         end
       end
 
       def add_credit_card(post, credit_card)
-        add_pair(post, :CardHolder, truncate(credit_card.name, 50), :required => true)
-        add_pair(post, :CardNumber, credit_card.number, :required => true)
-
-        add_pair(post, :ExpiryDate, format_date(credit_card.month, credit_card.year), :required => true)
+        add_pair(post, :CardHolder, truncate(credit_card.name, 50), required: true)
+        add_pair(post, :CardNumber, credit_card.number, required: true)
 
-        if requires_start_date_or_issue_number?(credit_card)
-          add_pair(post, :StartDate, format_date(credit_card.start_month, credit_card.start_year))
-          add_pair(post, :IssueNumber, credit_card.issue_number)
-        end
+        add_pair(post, :ExpiryDate, format_date(credit_card.month, credit_card.year), required: true)
         add_pair(post, :CardType, map_card_type(credit_card))
 
         add_pair(post, :CV2, credit_card.verification_value)
@@ -247,6 +298,7 @@ module ActiveMerchant #:nodoc:
       def add_token_details(post, token, options)
         add_token(post, token)
         add_pair(post, :StoreToken, options[:customer])
+        add_pair(post, :CV2, options[:verification_value])
       end
 
       def add_token(post, token)
@@ -260,26 +312,21 @@ module ActiveMerchant #:nodoc:
 
       def sanitize_phone(phone)
         return nil unless phone
+
         cleansed = phone.to_s.gsub(/[^0-9+]/, '')
         truncate(cleansed, 20)
       end
 
-      def truncate(value, max_size)
-        return nil unless value
-        value[0, max_size]
-      end
-
-      def is_usa(country)
+      def usa?(country)
         truncate(country, 2) == 'US'
       end
 
       def map_card_type(credit_card)
-        raise ArgumentError, "The credit card type must be provided" if card_brand(credit_card).blank?
+        raise ArgumentError, 'The credit card type must be provided' if card_brand(credit_card).blank?
 
         card_type = card_brand(credit_card).to_sym
 
-        # Check if it is an electron card
-        if card_type == :visa && credit_card.number =~ ELECTRON
+        if card_type == :visa && credit_card.electron?
           CREDIT_CARDS[:electron]
         else
           CREDIT_CARDS[card_type]
@@ -290,24 +337,23 @@ module ActiveMerchant #:nodoc:
       def format_date(month, year)
         return nil if year.blank? || month.blank?
 
-        year  = sprintf("%.4i", year)
-        month = sprintf("%.2i", month)
+        year  = sprintf('%.4i', year)
+        month = sprintf('%.2i', month)
 
         "#{month}#{year[-2..-1]}"
       end
 
       def commit(action, parameters)
-        response = parse( ssl_post(url_for(action), post_data(action, parameters)) )
-
-        Response.new(response["Status"] == APPROVED, message_from(response), response,
-          :test => test?,
-          :authorization => authorization_from(response, parameters, action),
-          :avs_result => {
-            :street_match => AVS_CVV_CODE[ response["AddressResult"] ],
-            :postal_match => AVS_CVV_CODE[ response["PostCodeResult"] ],
+        response = parse(ssl_post(url_for(action), post_data(action, parameters)))
+
+        Response.new(response['Status'] == APPROVED, message_from(response), response,
+          test: test?,
+          authorization: authorization_from(response, parameters, action),
+          avs_result: {
+            street_match: AVS_CODE[response['AddressResult']],
+            postal_match: AVS_CODE[response['PostCodeResult']]
           },
-          :cvv_result => AVS_CVV_CODE[ response["CV2Result"] ]
-        )
+          cvv_result: CVV_CODE[response['CV2Result']])
       end
 
       def authorization_from(response, params, action)
@@ -315,11 +361,11 @@ module ActiveMerchant #:nodoc:
         when :store
           response['Token']
         else
-         [ params[:VendorTxCode],
-           response["VPSTxId"],
-           response["TxAuthNo"],
-           response["SecurityKey"],
-           action ].join(";")
+          [params[:VendorTxCode],
+           response['VPSTxId'] || params[:VPSTxId],
+           response['TxAuthNo'],
+           response['SecurityKey'] || params[:SecurityKey],
+           action].join(';')
         end
       end
 
@@ -333,35 +379,34 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_url(action)
-        endpoint = case action
-          when :purchase, :authorization then "vspdirect-register"
+        endpoint =
+          case action
+          when :purchase, :authorization then 'vspdirect-register'
           when :store then 'directtoken'
           else TRANSACTIONS[action].downcase
-        end
+          end
         "#{test? ? self.test_url : self.live_url}/#{endpoint}.vsp"
       end
 
       def build_simulator_url(action)
-        endpoint = [ :purchase, :authorization ].include?(action) ? "VSPDirectGateway.asp" : "VSPServerGateway.asp?Service=Vendor#{TRANSACTIONS[action].capitalize}Tx"
+        endpoint = %i[purchase authorization].include?(action) ? 'VSPDirectGateway.asp' : "VSPServerGateway.asp?Service=Vendor#{TRANSACTIONS[action].capitalize}Tx"
         "#{self.simulator_url}/#{endpoint}"
       end
 
       def message_from(response)
-        response['Status'] == APPROVED ? 'Success' : (response['StatusDetail'] || 'Unspecified error')    # simonr 20080207 can't actually get non-nil blanks, so this is shorter
+        response['Status'] == APPROVED ? 'Success' : (response['StatusDetail'] || 'Unspecified error') # simonr 20080207 can't actually get non-nil blanks, so this is shorter
       end
 
       def post_data(action, parameters = {})
         parameters.update(
-          :Vendor => @options[:login],
-          :TxType => TRANSACTIONS[action],
-          :VPSProtocol => "3.00"
+          Vendor: @options[:login],
+          TxType: TRANSACTIONS[action],
+          VPSProtocol: @options.fetch(:protocol_version, '3.00')
         )
 
-        if(application_id && (application_id != Gateway.application_id))
-          parameters.update(:ReferrerID => application_id)
-        end
+        parameters.update(ReferrerID: application_id) if application_id && (application_id != Gateway.application_id)
 
-        parameters.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+        parameters.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
       # SagePay returns data in the following format
@@ -379,20 +424,11 @@ module ActiveMerchant #:nodoc:
         post[key] = value if !value.blank? || options[:required]
       end
 
-      def parse_first_and_last_name(value)
-        name = value.to_s.split(' ')
+      def past_purchase_reference?(payment_method)
+        return false unless payment_method.is_a?(String)
 
-        last_name = name.pop || ''
-        first_name = name.join(' ')
-        [ truncate(first_name, 20), truncate(last_name, 20) ]
-      end
-
-      def localized_amount(money, currency)
-        amount = amount(money)
-        CURRENCIES_WITHOUT_FRACTIONS.include?(currency.to_s) ? amount.split('.').first : amount
+        payment_method.split(';').last == 'purchase'
       end
     end
-
   end
 end
-

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['US']
 
       # The card types supported by the payment gateway
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       # The homepage URL of the gateway
       self.homepage_url = 'http://www.salliemae.com/'
@@ -21,7 +21,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def test?
-        @options[:login] == "TEST0"
+        @options[:login] == 'TEST0'
       end
 
       def authorize(money, creditcard, options = {})
@@ -94,11 +94,11 @@ module ActiveMerchant #:nodoc:
 
       def parse(body)
         h = {}
-        body.gsub!("<html><body><plaintext>", "")
+        body.gsub!('<html><body><plaintext>', '')
         body.
           split("\r\n").
           map do |i|
-            a = i.split("=")
+            a = i.split('=')
             h[a.first] = a.last unless a.first.nil?
           end
         h
@@ -111,33 +111,31 @@ module ActiveMerchant #:nodoc:
 
         case action
         when :sale
-          parameters[:action] = "ns_quicksale_cc"
+          parameters[:action] = 'ns_quicksale_cc'
         when :authonly
-          parameters[:action] = "ns_quicksale_cc"
+          parameters[:action] = 'ns_quicksale_cc'
           parameters[:authonly] = 1
         when :capture
-          parameters[:action] = "ns_quicksale_cc"
+          parameters[:action] = 'ns_quicksale_cc'
         end
 
-        response = parse(ssl_post(self.live_url, parameters.to_post_data) || "")
+        response = parse(ssl_post(self.live_url, parameters.to_post_data) || '')
         Response.new(successful?(response), message_from(response), response,
-          :test => test?,
-          :authorization => response["refcode"]
-        )
+          test: test?,
+          authorization: response['refcode'])
       end
 
       def successful?(response)
-        response["Status"] == "Accepted"
+        response['Status'] == 'Accepted'
       end
 
       def message_from(response)
         if successful?(response)
-          "Accepted"
+          'Accepted'
         else
-          response["Reason"].split(":")[2].capitalize unless response["Reason"].nil?
+          response['Reason'].split(':')[2].capitalize unless response['Reason'].nil?
         end
       end
     end
   end
 end
-