activemerchant 1.79.2 → 1.129.0

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

@@ -13,49 +13,47 @@ module ActiveMerchant #:nodoc:
       APPROVED = 'OK'
 
       TRANSACTIONS = {
-        :purchase => 'PAYMENT',
-        :credit => 'REFUND',
-        :authorization => 'DEFERRED',
-        :capture => 'RELEASE',
-        :void => 'VOID',
-        :abort => 'ABORT',
-        :store => 'TOKEN',
-        :unstore => 'REMOVETOKEN',
-        :repeat => 'REPEAT'
+        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'
       }
 
       AVS_CODE = {
-        "NOTPROVIDED" => nil,
-        "NOTCHECKED" => 'X',
-        "MATCHED" => 'Y',
-        "NOTMATCHED" => 'N'
+        'NOTPROVIDED' => nil,
+        'NOTCHECKED' => 'X',
+        'MATCHED' => 'Y',
+        'NOTMATCHED' => 'N'
       }
 
       CVV_CODE = {
-        "NOTPROVIDED" => 'S',
-        "NOTCHECKED" => 'X',
-        "MATCHED" => 'M',
-        "NOTMATCHED" => 'N'
+        'NOTPROVIDED' => 'S',
+        'NOTCHECKED' => 'X',
+        'MATCHED' => 'M',
+        'NOTMATCHED' => 'N'
       }
 
       OPTIONAL_REQUEST_FIELDS = {
         paypal_callback_url: :PayPalCallbackURL,
         basket: :Basket,
-        gift_aid_payment: :GiftAidPayment ,
-        apply_avscv2: :ApplyAVSCV2 ,
+        gift_aid_payment: :GiftAidPayment,
+        apply_avscv2: :ApplyAVSCV2,
         apply_3d_secure: :Apply3DSecure,
         account_type: :AccountType,
         billing_agreement: :BillingAgreement,
@@ -65,14 +63,14 @@ module ActiveMerchant #:nodoc:
         vendor_data: :VendorData,
         language: :Language,
         website: :Website,
-        recipient_account_number: :FIRecipientAcctNumber ,
-        recipient_surname: :FIRecipientSurname ,
-        recipient_postcode: :FIRecipientPostcode ,
+        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'
@@ -164,7 +162,7 @@ module ActiveMerchant #:nodoc:
         commit(:unstore, post)
       end
 
-      def verify(credit_card, options={})
+      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) }
@@ -183,6 +181,7 @@ module ActiveMerchant #:nodoc:
       end
 
       private
+
       def truncate(value, max_size)
         return nil unless value
         return value.to_s if CGI.escape(value.to_s).length <= max_size
@@ -214,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)
@@ -249,7 +248,7 @@ module ActiveMerchant #:nodoc:
           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))
@@ -262,7 +261,7 @@ module ActiveMerchant #:nodoc:
           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))
@@ -270,7 +269,7 @@ 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
 
@@ -287,15 +286,10 @@ module ActiveMerchant #:nodoc:
       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)
@@ -318,16 +312,17 @@ module ActiveMerchant #:nodoc:
 
       def sanitize_phone(phone)
         return nil unless phone
+
         cleansed = phone.to_s.gsub(/[^0-9+]/, '')
         truncate(cleansed, 20)
       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
 
@@ -342,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_CODE[ response["AddressResult"] ],
-            :postal_match => AVS_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 => CVV_CODE[ response["CV2Result"] ]
-        )
+          cvv_result: CVV_CODE[response['CV2Result']])
       end
 
       def authorization_from(response, params, action)
@@ -367,11 +361,11 @@ module ActiveMerchant #:nodoc:
         when :store
           response['Token']
         else
-         [ params[:VendorTxCode],
-           response["VPSTxId"] || params[:VPSTxId],
-           response["TxAuthNo"],
-           response["SecurityKey"] || params[:SecurityKey],
-           action ].join(";")
+          [params[:VendorTxCode],
+           response['VPSTxId'] || params[:VPSTxId],
+           response['TxAuthNo'],
+           response['SecurityKey'] || params[:SecurityKey],
+           action].join(';')
         end
       end
 
@@ -385,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 => @options.fetch(:protocol_version, '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
@@ -433,9 +426,9 @@ module ActiveMerchant #:nodoc:
 
       def past_purchase_reference?(payment_method)
         return false unless payment_method.is_a?(String)
-        payment_method.split(';').last == 'purchase'
+
+        %w(purchase repeat).include?(payment_method.split(';').last)
       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
-

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

@@ -1,25 +1,24 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class SecureNetGateway < Gateway
-
-      API_VERSION = "4.0"
+      API_VERSION = '4.0'
 
       TRANSACTIONS = {
-        :auth_only                      => "0000",
-        :auth_capture                   => "0100",
-        :prior_auth_capture             => "0200",
-        :void                           => "0400",
-        :credit                         => "0500"
+        auth_only:            '0000',
+        auth_capture:         '0100',
+        prior_auth_capture:   '0200',
+        void:                 '0400',
+        credit:               '0500'
       }
 
       XML_ATTRIBUTES = {
-                        'xmlns' => "http://gateway.securenet.com/API/Contracts",
-                        'xmlns:i' => "http://www.w3.org/2001/XMLSchema-instance"
-                       }
-      NIL_ATTRIBUTE = { 'i:nil' => "true" }
+        'xmlns' => 'http://gateway.securenet.com/API/Contracts',
+        'xmlns:i' => 'http://www.w3.org/2001/XMLSchema-instance'
+      }
+      NIL_ATTRIBUTE = { 'i:nil' => 'true' }
 
       self.supported_countries = ['US']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
       self.homepage_url = 'http://www.securenet.com/'
       self.display_name = 'SecureNet'
 
@@ -28,8 +27,8 @@ module ActiveMerchant #:nodoc:
 
       APPROVED, DECLINED = 1, 2
 
-      CARD_CODE_ERRORS = %w( N S )
-      AVS_ERRORS = %w( A E N R W Z )
+      CARD_CODE_ERRORS = %w(N S)
+      AVS_ERRORS = %w(A E N R W Z)
 
       def initialize(options = {})
         requires!(options, :login, :password)
@@ -77,22 +76,21 @@ module ActiveMerchant #:nodoc:
       def commit(request)
         xml = build_request(request)
         url = test? ? self.test_url : self.live_url
-        data = ssl_post(url, xml, "Content-Type" => "text/xml")
+        data = ssl_post(url, xml, 'Content-Type' => 'text/xml')
         response = parse(data)
 
         Response.new(success?(response), message_from(response), response,
-          :test => test?,
-          :authorization => build_authorization(response),
-          :avs_result => { :code => response[:avs_result_code] },
-          :cvv_result => response[:card_code_response_code]
-        )
+          test: test?,
+          authorization: build_authorization(response),
+          avs_result: { code: response[:avs_result_code] },
+          cvv_result: response[:card_code_response_code])
       end
 
       def build_request(request)
         xml = Builder::XmlMarkup.new
 
         xml.instruct!
-        xml.tag!("TRANSACTION", XML_ATTRIBUTES) do
+        xml.tag!('TRANSACTION', XML_ATTRIBUTES) do
           xml << request
         end
 
@@ -116,7 +114,7 @@ module ActiveMerchant #:nodoc:
         transaction_id, amount_in_ref, last_four = split_authorization(authorization)
 
         xml.tag! 'AMOUNT', amount(money) || amount_in_ref
-        xml.tag!("CARD") do
+        xml.tag!('CARD') do
           xml.tag! 'CARDNUMBER', last_four
         end
 
@@ -128,7 +126,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_credit_card(xml, creditcard)
-        xml.tag!("CARD") do
+        xml.tag!('CARD') do
           xml.tag! 'CARDCODE', creditcard.verification_value if creditcard.verification_value?
           xml.tag! 'CARDNUMBER', creditcard.number
           xml.tag! 'EXPDATE', expdate(creditcard)
@@ -136,20 +134,16 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_customer_data(xml, options)
-        if options.has_key? :customer
-          xml.tag! 'CUSTOMERID', options[:customer]
-        end
+        xml.tag! 'CUSTOMERID', options[:customer] if options.has_key? :customer
 
-        if options.has_key? :ip
-          xml.tag! 'CUSTOMERIP', options[:ip]
-        end
+        xml.tag! 'CUSTOMERIP', options[:ip] if options.has_key? :ip
       end
 
       def add_address(xml, creditcard, options)
         return unless creditcard
 
         if address = options[:billing_address] || options[:address]
-          xml.tag!("CUSTOMER_BILL") do
+          xml.tag!('CUSTOMER_BILL') do
             xml.tag! 'ADDRESS', address[:address1].to_s
             xml.tag! 'CITY', address[:city].to_s
             xml.tag! 'COMPANY', address[:company].to_s
@@ -161,13 +155,13 @@ module ActiveMerchant #:nodoc:
             xml.tag! 'FIRSTNAME', creditcard.first_name
             xml.tag! 'LASTNAME', creditcard.last_name
             xml.tag! 'PHONE', address[:phone].to_s
-            xml.tag! 'STATE', address[:state].blank?  ? 'n/a' : address[:state]
+            xml.tag! 'STATE', address[:state].blank? ? 'n/a' : address[:state]
             xml.tag! 'ZIP', address[:zip].to_s
           end
         end
 
         if address = options[:shipping_address]
-          xml.tag!("CUSTOMER_SHIP") do
+          xml.tag!('CUSTOMER_SHIP') do
             xml.tag! 'ADDRESS', address[:address1].to_s
             xml.tag! 'CITY', address[:city].to_s
             xml.tag! 'COMPANY', address[:company].to_s
@@ -182,18 +176,17 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'LASTNAME', address[:last_name].to_s
             end
 
-            xml.tag! 'STATE', address[:state].blank?  ? 'n/a' : address[:state]
+            xml.tag! 'STATE', address[:state].blank? ? 'n/a' : address[:state]
             xml.tag! 'ZIP', address[:zip].to_s
           end
         else
           xml.tag!('CUSTOMER_SHIP', NIL_ATTRIBUTE) do
           end
         end
-
       end
 
       def add_merchant_key(xml, options)
-        xml.tag!("MERCHANT_KEY") do
+        xml.tag!('MERCHANT_KEY') do
           xml.tag! 'GROUPID', 0
           xml.tag! 'SECUREKEY', @options[:password]
           xml.tag! 'SECURENETID', @options[:login]
@@ -236,7 +229,7 @@ module ActiveMerchant #:nodoc:
       def parse(xml)
         response = {}
         xml = REXML::Document.new(xml)
-        root = REXML::XPath.first(xml, "//GATEWAYRESPONSE")
+        root = REXML::XPath.first(xml, '//GATEWAYRESPONSE')
         if root
           root.elements.to_a.each do |node|
             recurring_parse_element(response, node)
@@ -248,21 +241,20 @@ module ActiveMerchant #:nodoc:
 
       def recurring_parse_element(response, node)
         if node.has_elements?
-          node.elements.each{|e| recurring_parse_element(response, e) }
+          node.elements.each { |e| recurring_parse_element(response, e) }
         else
           response[node.name.underscore.to_sym] = node.text
         end
       end
 
       def split_authorization(authorization)
-        transaction_id, amount, last_four = authorization.split("|")
+        transaction_id, amount, last_four = authorization.split('|')
         [transaction_id, amount, last_four]
       end
 
       def build_authorization(response)
-        [response[:transactionid], response[:transactionamount], response[:last4_digits]].join("|")
+        [response[:transactionid], response[:transactionamount], response[:last4_digits]].join('|')
       end
-
     end
   end
 end