activemerchant 1.42.6 → 1.90.0

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://www.eway.com.au'
 
       self.money_format = :cents
-      self.supported_countries = ['AU', 'NZ', 'GB']
+      self.supported_countries = ['AU']
       self.supported_cardtypes = [:visa, :master, :american_express, :diners_club]
       self.homepage_url = 'http://www.eway.com.au/'
       self.display_name = 'eWAY'
@@ -52,15 +52,27 @@ module ActiveMerchant #:nodoc:
         commit(refund_url, money, post)
       end
 
+      def supports_scrubbing
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(%r((<ewayCardNumber>)\d+(</ewayCardNumber>))i, '\1[FILTERED]\2').
+          gsub(%r((<ewayCVN>)\d+(</ewayCVN>))i, '\1[FILTERED]\2')
+      end
+
       private
+
       def requires_address!(options)
-        raise ArgumentError.new("Missing eWay required parameters: address or billing_address") unless (options.has_key?(:address) or options.has_key?(:billing_address))
+        raise ArgumentError.new('Missing eWay required parameters: address or billing_address') unless options.has_key?(:address) or options.has_key?(:billing_address)
       end
 
       def add_creditcard(post, creditcard)
         post[:CardNumber]  = creditcard.number
-        post[:CardExpiryMonth]  = sprintf("%.2i", creditcard.month)
-        post[:CardExpiryYear] = sprintf("%.4i", creditcard.year)[-2..-1]
+        post[:CardExpiryMonth]  = sprintf('%.2i', creditcard.month)
+        post[:CardExpiryYear] = sprintf('%.4i', creditcard.year)[-2..-1]
         post[:CustomerFirstName] = creditcard.first_name
         post[:CustomerLastName]  = creditcard.last_name
         post[:CardHoldersName] = creditcard.name
@@ -108,7 +120,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def success?(response)
-        response[:ewaytrxnstatus] == "True"
+        response[:ewaytrxnstatus] == 'True'
       end
 
       def parse(xml)
@@ -123,7 +135,7 @@ module ActiveMerchant #:nodoc:
 
       def post_data(parameters = {})
         xml   = REXML::Document.new
-        root  = xml.add_element("ewaygateway")
+        root  = xml.add_element('ewaygateway')
 
         parameters.each do |key, value|
           root.add_element("eway#{key}").text = value
@@ -133,18 +145,7 @@ module ActiveMerchant #:nodoc:
 
       def message_from(message)
         return '' if message.blank?
-        MESSAGES[message[0,2]] || message
-      end
-
-      # Make a ruby type out of the response string
-      def normalize(field)
-        case field
-        when "true"   then true
-        when "false"  then false
-        when ""       then nil
-        when "null"   then nil
-        else field
-        end
+        MESSAGES[message[0, 2]] || message
       end
 
       def purchase_url(cvn)
@@ -159,66 +160,66 @@ module ActiveMerchant #:nodoc:
       end
 
       MESSAGES = {
-        "00" => "Transaction Approved",
-        "01" => "Refer to Issuer",
-        "02" => "Refer to Issuer, special",
-        "03" => "No Merchant",
-        "04" => "Pick Up Card",
-        "05" => "Do Not Honour",
-        "06" => "Error",
-        "07" => "Pick Up Card, Special",
-        "08" => "Honour With Identification",
-        "09" => "Request In Progress",
-        "10" => "Approved For Partial Amount",
-        "11" => "Approved, VIP",
-        "12" => "Invalid Transaction",
-        "13" => "Invalid Amount",
-        "14" => "Invalid Card Number",
-        "15" => "No Issuer",
-        "16" => "Approved, Update Track 3",
-        "19" => "Re-enter Last Transaction",
-        "21" => "No Action Taken",
-        "22" => "Suspected Malfunction",
-        "23" => "Unacceptable Transaction Fee",
-        "25" => "Unable to Locate Record On File",
-        "30" => "Format Error",
-        "31" => "Bank Not Supported By Switch",
-        "33" => "Expired Card, Capture",
-        "34" => "Suspected Fraud, Retain Card",
-        "35" => "Card Acceptor, Contact Acquirer, Retain Card",
-        "36" => "Restricted Card, Retain Card",
-        "37" => "Contact Acquirer Security Department, Retain Card",
-        "38" => "PIN Tries Exceeded, Capture",
-        "39" => "No Credit Account",
-        "40" => "Function Not Supported",
-        "41" => "Lost Card",
-        "42" => "No Universal Account",
-        "43" => "Stolen Card",
-        "44" => "No Investment Account",
-        "51" => "Insufficient Funds",
-        "52" => "No Cheque Account",
-        "53" => "No Savings Account",
-        "54" => "Expired Card",
-        "55" => "Incorrect PIN",
-        "56" => "No Card Record",
-        "57" => "Function Not Permitted to Cardholder",
-        "58" => "Function Not Permitted to Terminal",
-        "59" => "Suspected Fraud",
-        "60" => "Acceptor Contact Acquirer",
-        "61" => "Exceeds Withdrawal Limit",
-        "62" => "Restricted Card",
-        "63" => "Security Violation",
-        "64" => "Original Amount Incorrect",
-        "66" => "Acceptor Contact Acquirer, Security",
-        "67" => "Capture Card",
-        "75" => "PIN Tries Exceeded",
-        "82" => "CVV Validation Error",
-        "90" => "Cutoff In Progress",
-        "91" => "Card Issuer Unavailable",
-        "92" => "Unable To Route Transaction",
-        "93" => "Cannot Complete, Violation Of The Law",
-        "94" => "Duplicate Transaction",
-        "96" => "System Error"
+        '00' => 'Transaction Approved',
+        '01' => 'Refer to Issuer',
+        '02' => 'Refer to Issuer, special',
+        '03' => 'No Merchant',
+        '04' => 'Pick Up Card',
+        '05' => 'Do Not Honour',
+        '06' => 'Error',
+        '07' => 'Pick Up Card, Special',
+        '08' => 'Honour With Identification',
+        '09' => 'Request In Progress',
+        '10' => 'Approved For Partial Amount',
+        '11' => 'Approved, VIP',
+        '12' => 'Invalid Transaction',
+        '13' => 'Invalid Amount',
+        '14' => 'Invalid Card Number',
+        '15' => 'No Issuer',
+        '16' => 'Approved, Update Track 3',
+        '19' => 'Re-enter Last Transaction',
+        '21' => 'No Action Taken',
+        '22' => 'Suspected Malfunction',
+        '23' => 'Unacceptable Transaction Fee',
+        '25' => 'Unable to Locate Record On File',
+        '30' => 'Format Error',
+        '31' => 'Bank Not Supported By Switch',
+        '33' => 'Expired Card, Capture',
+        '34' => 'Suspected Fraud, Retain Card',
+        '35' => 'Card Acceptor, Contact Acquirer, Retain Card',
+        '36' => 'Restricted Card, Retain Card',
+        '37' => 'Contact Acquirer Security Department, Retain Card',
+        '38' => 'PIN Tries Exceeded, Capture',
+        '39' => 'No Credit Account',
+        '40' => 'Function Not Supported',
+        '41' => 'Lost Card',
+        '42' => 'No Universal Account',
+        '43' => 'Stolen Card',
+        '44' => 'No Investment Account',
+        '51' => 'Insufficient Funds',
+        '52' => 'No Cheque Account',
+        '53' => 'No Savings Account',
+        '54' => 'Expired Card',
+        '55' => 'Incorrect PIN',
+        '56' => 'No Card Record',
+        '57' => 'Function Not Permitted to Cardholder',
+        '58' => 'Function Not Permitted to Terminal',
+        '59' => 'Suspected Fraud',
+        '60' => 'Acceptor Contact Acquirer',
+        '61' => 'Exceeds Withdrawal Limit',
+        '62' => 'Restricted Card',
+        '63' => 'Security Violation',
+        '64' => 'Original Amount Incorrect',
+        '66' => 'Acceptor Contact Acquirer, Security',
+        '67' => 'Capture Card',
+        '75' => 'PIN Tries Exceeded',
+        '82' => 'CVV Validation Error',
+        '90' => 'Cutoff In Progress',
+        '91' => 'Card Issuer Unavailable',
+        '92' => 'Unable To Route Transaction',
+        '93' => 'Cannot Complete, Violation Of The Law',
+        '94' => 'Duplicate Transaction',
+        '96' => 'System Error'
       }
     end
   end

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

@@ -12,7 +12,7 @@ module ActiveMerchant #:nodoc:
 
       self.default_currency = 'AUD'
 
-      #accepted money format
+      # accepted money format
       self.money_format = :cents
 
       # The homepage URL of the gateway
@@ -46,7 +46,7 @@ module ActiveMerchant #:nodoc:
         add_address(post, billing_address)
         add_misc_fields(post, options)
 
-        commit("CreateCustomer", post)
+        commit('CreateCustomer', post)
       end
 
       def update(billing_id, creditcard, options={})
@@ -64,7 +64,7 @@ module ActiveMerchant #:nodoc:
         add_address(post, billing_address)
         add_misc_fields(post, options)
 
-        commit("UpdateCustomer", post)
+        commit('UpdateCustomer', post)
       end
 
       # Process a payment in the given amount against the stored credit card given by billing_id
@@ -86,7 +86,7 @@ module ActiveMerchant #:nodoc:
         post[:amount]=money
         add_invoice(post, options)
 
-        commit("ProcessPayment", post)
+        commit('ProcessPayment', post)
       end
 
       # Get customer's stored credit card details given by billing_id
@@ -98,7 +98,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         post[:managedCustomerID] = billing_id.to_s
 
-        commit("QueryCustomer", post)
+        commit('QueryCustomer', post)
       end
 
       # TODO: eWay API also provides QueryPayment
@@ -106,8 +106,8 @@ module ActiveMerchant #:nodoc:
       private
 
       def eway_requires!(hash)
-        raise ArgumentError.new("Missing eWay required parameter in `billing_address`: title") unless hash.has_key?(:title)
-        raise ArgumentError.new("Missing eWay required parameter in `billing_address`: country") unless hash.has_key?(:country)
+        raise ArgumentError.new('Missing eWay required parameter in `billing_address`: title') unless hash.has_key?(:title)
+        raise ArgumentError.new('Missing eWay required parameter in `billing_address`: country') unless hash.has_key?(:country)
       end
 
       def add_address(post, address)
@@ -136,12 +136,11 @@ module ActiveMerchant #:nodoc:
         post[:invoiceDescription] = options[:description]
       end
 
-
       # add credit card details to be stored by eway. NOTE eway requires "title" field
       def add_creditcard(post, creditcard)
         post[:CCNumber]  = creditcard.number
-        post[:CCExpiryMonth]  = sprintf("%.2i", creditcard.month)
-        post[:CCExpiryYear] = sprintf("%.4i", creditcard.year)[-2..-1]
+        post[:CCExpiryMonth]  = sprintf('%.2i', creditcard.month)
+        post[:CCExpiryYear] = sprintf('%.4i', creditcard.year)[-2..-1]
         post[:CCNameOnCard] = creditcard.name
         post[:FirstName] = creditcard.first_name
         post[:LastName]  = creditcard.last_name
@@ -150,8 +149,8 @@ module ActiveMerchant #:nodoc:
       def parse(body)
         reply = {}
         xml = REXML::Document.new(body)
-         if root = REXML::XPath.first(xml, "//soap:Fault") then
-           reply=parse_fault(root)
+        if root = REXML::XPath.first(xml, '//soap:Fault') then
+          reply=parse_fault(root)
         else
           if root = REXML::XPath.first(xml, '//ProcessPaymentResponse/ewayResponse') then
             # Successful payment
@@ -166,19 +165,19 @@ module ActiveMerchant #:nodoc:
                 reply[:success]=true
               else
                 if root = REXML::XPath.first(xml, '//UpdateCustomerResult') then
-                  if root.text.downcase == 'true' then
+                  if root.text.casecmp('true').zero? then
                     reply[:message]='OK'
                     reply[:success]=true
                   else
                     # ERROR: This state should never occur. If there is a problem,
                     #        a soap:Fault will be returned. The presence of this
                     #        element always means a success.
-                    raise StandardError, "Unexpected \"false\" in UpdateCustomerResult"
+                    raise StandardError, 'Unexpected "false" in UpdateCustomerResult'
                   end
                 else
                   # ERROR: This state should never occur currently. We have handled
                   #        responses for all the methods which we support.
-                  raise StandardError, "Unexpected response"
+                  raise StandardError, 'Unexpected response'
                 end
               end
             end
@@ -232,34 +231,34 @@ module ActiveMerchant #:nodoc:
       def soap_request(arguments, action)
         # eWay demands all fields be sent, but contain an empty string if blank
         post = case action
-                when 'QueryCustomer'
-                  arguments
-                when 'ProcessPayment'
-                  default_payment_fields.merge(arguments)
-                when 'CreateCustomer'
-                  default_customer_fields.merge(arguments)
-                when 'UpdateCustomer'
-                  default_customer_fields.merge(arguments)
+               when 'QueryCustomer'
+                 arguments
+               when 'ProcessPayment'
+                 default_payment_fields.merge(arguments)
+               when 'CreateCustomer'
+                 default_customer_fields.merge(arguments)
+               when 'UpdateCustomer'
+                 default_customer_fields.merge(arguments)
                end
 
         xml = Builder::XmlMarkup.new :indent => 2
-          xml.instruct!
-          xml.tag! 'soap12:Envelope', {'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema', 'xmlns:soap12' => 'http://www.w3.org/2003/05/soap-envelope'} do
-            xml.tag! 'soap12:Header' do
-              xml.tag! 'eWAYHeader', {'xmlns' => 'https://www.eway.com.au/gateway/managedpayment'} do
-                xml.tag! 'eWAYCustomerID', @options[:login]
-                xml.tag! 'Username', @options[:username]
-                xml.tag! 'Password', @options[:password]
-              end
+        xml.instruct!
+        xml.tag! 'soap12:Envelope', {'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema', 'xmlns:soap12' => 'http://www.w3.org/2003/05/soap-envelope'} do
+          xml.tag! 'soap12:Header' do
+            xml.tag! 'eWAYHeader', {'xmlns' => 'https://www.eway.com.au/gateway/managedpayment'} do
+              xml.tag! 'eWAYCustomerID', @options[:login]
+              xml.tag! 'Username', @options[:username]
+              xml.tag! 'Password', @options[:password]
             end
-            xml.tag! 'soap12:Body' do |x|
-              x.tag! "#{action}", {'xmlns' => 'https://www.eway.com.au/gateway/managedpayment'} do |y|
-                post.each do |key, value|
-                  y.tag! "#{key}", "#{value}"
-                end
+          end
+          xml.tag! 'soap12:Body' do |x|
+            x.tag! action, {'xmlns' => 'https://www.eway.com.au/gateway/managedpayment'} do |y|
+              post.each do |key, value|
+                y.tag! key, value
               end
             end
           end
+        end
         xml.target!
       end