activemerchant 1.3.1 → 1.3.2

data/CHANGELOG

@@ -1,5 +1,20 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.3.2 (February 24, 2008)
+
+* Actually fix the bug by adding extdata element to Payflow Requests [cody]
+* Fix bug with adding name to Payflow requests [cody]
+* Gateways will now look for CreditCard#brand before looking for CreditCard#type [cody]
+* Make before_validate in CreditCard more clear [keith_du...@mac.com, cody]
+* Don't send full Australian state names to PayPal [cody]
+* Return last_digits that are less than 4 characters long [cody]
+* Fix Bug with Authorize.Net ARB Remote Test [patrick.t.joyce]
+* Add support for forcing test mode on Secure Pay AU gateway [cody]
+* Update Secure Pay Au to meet specs for MessageInfo elements [cody]
+* Add support for the Australian Secure Pay payment gateway [cody]
+* Allow LinkPoint cancellations for recurring billing. [yanagimoto.shin]
+* Add support for Åland Islands to the country list [cody]
+
 == Version 1.3.1 (January 28, 2008)
 
 * Rename BrainTreeGateway to BraintreeGateway, but keep alias to old naming for backwards compatibility [cody]

data/Rakefile

@@ -8,7 +8,7 @@ require File.dirname(__FILE__) + '/lib/tasks/cia'
 require File.dirname(__FILE__) + '/lib/support/gateway_support'
 
 
-PKG_VERSION = "1.3.1"
+PKG_VERSION = "1.3.2"
 PKG_NAME = "activemerchant"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 

data/lib/active_merchant/billing/credit_card.rb

@@ -112,7 +112,7 @@ module ActiveMerchant #:nodoc:
       def before_validate #:nodoc: 
         self.month = month.to_i
         self.year  = year.to_i
-        self.number.to_s.gsub!(/[^\d]/, "")
+        self.number = number.to_s.gsub(/[^\d]/, "")
         self.type.downcase! if type.respond_to?(:downcase)
         self.type = self.class.type?(number) if type.blank?
       end

data/lib/active_merchant/billing/credit_card_methods.rb

@@ -84,12 +84,12 @@ module ActiveMerchant #:nodoc:
           return nil
         end
         
-        def last_digits(number)          
-          number.to_s.slice(-4..-1) if number.to_s.length >= 4
+        def last_digits(number)     
+          number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1) 
         end
         
         def mask(number)
-          "XXXX-XXXX-XXXX-#{last_digits(number)}" if number.to_s.length >= 4
+          "XXXX-XXXX-XXXX-#{last_digits(number)}"
         end
         
         # Checks to see if the calculated type matches the specified type

data/lib/active_merchant/billing/gateway.rb

@@ -101,7 +101,16 @@ module ActiveMerchant #:nodoc:
       # Use this method to check if your gateway of interest supports a credit card of some type
       def self.supports?(card_type)
         supported_cardtypes.include?(card_type.to_sym)
-      end       
+      end
+      
+      def self.card_brand(source)
+        result = source.respond_to?(:brand) ? source.brand : source.type
+        result.to_s.downcase
+      end
+    
+      def card_brand(source)
+        self.class.card_brand(source)
+      end
     
       # Initialize a new gateway.
       # 
@@ -145,8 +154,8 @@ module ActiveMerchant #:nodoc:
       end
       
       def requires_start_date_or_issue_number?(credit_card)
-        return false if credit_card.type.blank?
-        DEBIT_CARDS.include?(credit_card.type.to_sym)
+        return false if card_brand(credit_card).blank?
+        DEBIT_CARDS.include?(card_brand(credit_card).to_sym)
       end
     end
   end

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

@@ -192,8 +192,8 @@ module ActiveMerchant #:nodoc:
       def determine_funding_source(source)
         case 
         when source.is_a?(String) then :vault
-        when CreditCard.card_companies.keys.include?(source.type) then :credit_card
-        when source.type == 'check' then :check
+        when CreditCard.card_companies.keys.include?(card_brand(source)) then :credit_card
+        when card_brand(source) == 'check' then :check
         else raise ArgumentError, "Unsupported funding source provided"
         end
       end

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

@@ -134,7 +134,7 @@ module ActiveMerchant #:nodoc:
         add_pair(post, :TransactionUnique, options[:order_id], :required => true)
         add_pair(post, :OrderDesc, options[:description] || options[:order_id], :required => true)
         
-        if [ 'american_express', 'diners_club' ].include?(credit_card.type.to_s)
+        if [ 'american_express', 'diners_club' ].include?(card_brand(credit_card).to_s)
           add_pair(post, :AEIT1Quantity,  1) 
           add_pair(post, :AEIT1Description,  (options[:description] || options[:order_id]).slice(0, 15)) 
           add_pair(post, :AEIT1GrossValue, amount(money))
@@ -159,7 +159,7 @@ module ActiveMerchant #:nodoc:
       end
       
       def format_issue_number(credit_card)
-        credit_card.type.to_s == 'solo' ? format(credit_card.issue_number, :two_digits) : credit_card.issue_number
+        card_brand(credit_card).to_s == 'solo' ? format(credit_card.issue_number, :two_digits) : credit_card.issue_number
       end
 
       def commit(action, parameters)

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

@@ -270,7 +270,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'expirationMonth', format(creditcard.month, :two_digits)
           xml.tag! 'expirationYear', format(creditcard.year, :four_digits)
           xml.tag!('cvNumber', creditcard.verification_value) unless (@options[:ignore_cvv] || creditcard.verification_value.blank? )
-          xml.tag! 'cardType', @@credit_card_codes[creditcard.type.to_sym]
+          xml.tag! 'cardType', @@credit_card_codes[card_brand(creditcard).to_sym]
         end
       end
 

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

@@ -275,7 +275,7 @@ module ActiveMerchant
           xml.tag! :expirydate, format_date(credit_card.month, credit_card.year)
           
           # optional values - for Solo etc
-          if [ 'switch', 'solo' ].include?(credit_card.type.to_s)
+          if [ 'switch', 'solo' ].include?(card_brand(credit_card).to_s)
             
             xml.tag! :issuenumber, credit_card.issue_number unless credit_card.issue_number.blank?
             

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

@@ -144,7 +144,7 @@ module ActiveMerchant #:nodoc:
         
         options.update(
           :ordertype => "SALE",
-          :action => "SUBMIT",
+          :action => options[:action] || "SUBMIT",
           :installments => options[:installments] || 12,
           :startdate => options[:startdate] || "immediate",
           :periodicity => options[:periodicity].to_s || "monthly",

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

@@ -126,20 +126,21 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'CardType', credit_card_type(credit_card)
           xml.tag! 'CardNum', credit_card.number
           xml.tag! 'ExpDate', expdate(credit_card)
-          xml.tag! 'NameOnCard', credit_card.name
+          xml.tag! 'NameOnCard', credit_card.first_name
           xml.tag! 'CVNum', credit_card.verification_value if credit_card.verification_value?
           
           if requires_start_date_or_issue_number?(credit_card)
             xml.tag!('ExtData', 'Name' => 'CardStart', 'Value' => startdate(credit_card)) unless credit_card.start_month.blank? || credit_card.start_year.blank?
             xml.tag!('ExtData', 'Name' => 'CardIssue', 'Value' => format(credit_card.issue_number, :two_digits)) unless credit_card.issue_number.blank?
           end
+          xml.tag! 'ExtData', 'Name' => 'LASTNAME', 'Value' =>  credit_card.last_name
         end
       end
       
       def credit_card_type(credit_card)
-        return '' if credit_card.type.blank?
+        return '' if card_brand(credit_card).blank?
         
-        CARD_MAPPING[credit_card.type.to_sym]
+        CARD_MAPPING[card_brand(credit_card).to_sym]
       end
       
       def expdate(creditcard)

data/lib/active_merchant/billing/gateways/payflow/payflow_common_api.rb

@@ -128,7 +128,7 @@ module ActiveMerchant #:nodoc:
       def add_address(xml, tag, address, options)  
         return if address.nil?
         xml.tag! tag do
-          xml.tag! 'Name', address[:name] unless options[:name].blank?
+          xml.tag! 'Name', address[:name] unless address[:name].blank?
           xml.tag! 'EMail', options[:email] unless options[:email].blank?
           xml.tag! 'Phone', address[:phone] unless address[:phone].blank?
           xml.tag! 'CustCode', options[:customer] if !options[:customer].blank? && tag == 'BillTo'
@@ -200,7 +200,7 @@ module ActiveMerchant #:nodoc:
         headers = build_headers(request.size)
         
     	  response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, request, headers))
-    	  
+
     	  build_response(response[:result] == "0", response[:message], response,
     	    :test => test?,
     	    :authorization => response[:pn_ref] || response[:rp_ref],

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

@@ -65,13 +65,13 @@ module ActiveMerchant #:nodoc:
       
       def add_credit_card(xml, credit_card, address, options)
         xml.tag! 'n2:CreditCard' do
-          xml.tag! 'n2:CreditCardType', credit_card_type(credit_card.type)
+          xml.tag! 'n2:CreditCardType', credit_card_type(card_brand(credit_card))
           xml.tag! 'n2:CreditCardNumber', credit_card.number
           xml.tag! 'n2:ExpMonth', format(credit_card.month, :two_digits)
           xml.tag! 'n2:ExpYear', format(credit_card.year, :four_digits)
           xml.tag! 'n2:CVV2', credit_card.verification_value
           
-          if [ 'switch', 'solo' ].include?(credit_card.type.to_s)
+          if [ 'switch', 'solo' ].include?(card_brand(credit_card).to_s)
             xml.tag! 'n2:StartMonth', format(credit_card.start_month, :two_digits) unless credit_card.start_month.blank?
             xml.tag! 'n2:StartYear', format(credit_card.start_year, :four_digits) unless credit_card.start_year.blank?
             xml.tag! 'n2:IssueNumber', format(credit_card.issue_number, :two_digits) unless credit_card.issue_number.blank?

data/lib/active_merchant/billing/gateways/paypal/paypal_common_api.rb

@@ -122,7 +122,7 @@ module ActiveMerchant #:nodoc:
         xml.target!        
       end
           
-      def build_capture_request(money, authorization, options)
+      def build_capture_request(money, authorization, options)   
         xml = Builder::XmlMarkup.new :indent => 2
         
         xml.tag! 'DoCaptureReq', 'xmlns' => PAYPAL_NAMESPACE do
@@ -168,7 +168,7 @@ module ActiveMerchant #:nodoc:
         xml.target!        
       end
       
-      def build_mass_pay_request(*args)
+      def build_mass_pay_request(*args)   
         default_options = args.last.is_a?(Hash) ? args.pop : {}
         recipients = args.first.is_a?(Array) ? args : [args]
         
@@ -269,25 +269,13 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'n2:Street1', address[:address1]
           xml.tag! 'n2:Street2', address[:address2]
           xml.tag! 'n2:CityName', address[:city]
-          xml.tag! 'n2:StateOrProvince', lookup_state(address)
+          xml.tag! 'n2:StateOrProvince', address[:state].blank? ? 'N/A' : address[:state]
           xml.tag! 'n2:Country', address[:country]
           xml.tag! 'n2:PostalCode', address[:zip]
           xml.tag! 'n2:Phone', address[:phone]
         end
       end
       
-      def lookup_state(address)
-        country = Country.find(address[:country]) rescue nil
-        return '' if country.nil?
-        
-        case country.code(:alpha2).to_s
-        when 'AU'
-          AUSTRALIAN_STATES[address[:state]] || address[:state] 
-        else
-          address[:state].blank? ? 'N/A' : address[:state]
-        end
-      end
-      
       def endpoint_url
         URLS[test? ? :test : :live][@options[:signature].blank? ? :certificate : :signature]
       end

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

@@ -188,9 +188,9 @@ module ActiveMerchant #:nodoc:
       end
       
       def map_card_type(credit_card)
-        raise ArgumentError, "The credit card type must be provided" if credit_card.type.blank?
+        raise ArgumentError, "The credit card type must be provided" if card_brand(credit_card).blank?
         
-        card_type = credit_card.type.to_sym
+        card_type = card_brand(credit_card).to_sym
         
         # Check if it is an electron card
         if card_type == :visa && credit_card.number =~ ELECTRON 
@@ -209,7 +209,7 @@ module ActiveMerchant #:nodoc:
       end
       
       def format_issue_number(credit_card)
-        credit_card.type.to_s == 'solo' ? format(credit_card.issue_number, :two_digits) : credit_card.issue_number
+        card_brand(credit_card).to_s == 'solo' ? format(credit_card.issue_number, :two_digits) : credit_card.issue_number
       end
 
       def commit(action, parameters)

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

@@ -107,7 +107,7 @@ module ActiveMerchant
           xml.tag! 'card' do
             xml.tag! 'number', credit_card.number
             xml.tag! 'expdate', expiry_date(credit_card)
-            xml.tag! 'type', CARD_MAPPING[credit_card.type.to_s]
+            xml.tag! 'type', CARD_MAPPING[card_brand(credit_card).to_s]
             xml.tag! 'chname', credit_card.name
             xml.tag! 'issueno', credit_card.issue_number
             

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

@@ -0,0 +1,155 @@
+require 'rexml/document'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class SecurePayAuGateway < Gateway
+      API_VERSION = 'xml-4.2'
+      
+      TEST_URL = 'https://www.securepay.com.au/test/payment'
+      LIVE_URL = 'https://www.securepay.com.au/xmlapi/payment'
+      
+      self.supported_countries = ['AU']
+      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb]
+      
+      # The homepage URL of the gateway
+      self.homepage_url = 'http://securepay.com.au'
+      
+      # The name of the gateway
+      self.display_name = 'SecurePay'
+      
+      class_inheritable_accessor :request_timeout
+      self.request_timeout = 60
+      
+      self.money_format = :cents
+      self.default_currency = 'AUD'
+      
+      # 0 Standard Payment
+      # 4 Refund 
+      # 6 Client Reversal (Void) 
+      # 10 Preauthorise 
+      # 11 Preauth Complete (Advice)        
+      TRANSACTIONS = {
+        :purchase => 0,
+        :authorization => 10,
+        :capture => 11,
+        :void => 6,
+        :credit => 4
+      }
+      
+      def initialize(options = {})
+        requires!(options, :login, :password)
+        @options = options
+        super
+      end
+      
+      def test?
+        @options[:test] || super
+      end
+      
+      def purchase(money, credit_card, options = {})
+        commit :purchase, build_purchase_request(money, credit_card, options)
+      end                       
+    
+      private
+      
+      def build_purchase_request(money, credit_card, options)
+        xml = Builder::XmlMarkup.new
+        
+        xml.tag! 'amount', amount(money)
+        xml.tag! 'currency', options[:currency] || currency(money)              
+        xml.tag! 'purchaseOrderNo', options[:order_id].to_s.gsub(/[ ']/, '')
+        
+        xml.tag! 'CreditCardInfo' do
+          xml.tag! 'cardNumber', credit_card.number
+          xml.tag! 'expiryDate', expdate(credit_card)
+          xml.tag! 'cvv', credit_card.verification_value if credit_card.verification_value?
+        end
+        
+        xml.target!
+      end
+      
+      def build_request(action, body)
+        xml = Builder::XmlMarkup.new
+        xml.instruct!
+        xml.tag! 'SecurePayMessage' do
+          xml.tag! 'MessageInfo' do
+            xml.tag! 'messageID', Utils.generate_unique_id.slice(0, 30)
+            xml.tag! 'messageTimestamp', generate_timestamp
+            xml.tag! 'timeoutValue', request_timeout
+            xml.tag! 'apiVersion', API_VERSION
+          end
+          
+          xml.tag! 'MerchantInfo' do
+            xml.tag! 'merchantID', @options[:login]
+            xml.tag! 'password', @options[:password]
+          end
+          
+          xml.tag! 'RequestType', 'Payment'
+          xml.tag! 'Payment' do
+            xml.tag! 'TxnList', "count" => 1 do
+              xml.tag! 'Txn', "ID" => 1 do
+                xml.tag! 'txnType', TRANSACTIONS[action]
+                xml.tag! 'txnSource', 23
+                xml << body
+              end
+            end
+          end
+        end
+        
+        xml.target!
+      end
+         
+      def commit(action, request)
+        response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, build_request(action, request)))
+        
+        Response.new(success?(response), message_from(response), response, 
+          :test => test?, 
+          :authorization => authorization_from(response)
+        )
+      end
+      
+      def success?(response)
+        response[:response_code] == "00"
+      end
+      
+      def authorization_from(response)
+        response[:txn_id]
+      end
+          
+      def message_from(response)
+        response[:response_text] || response[:status_description]
+      end
+      
+      def expdate(credit_card)
+        "#{format(credit_card.month, :two_digits)}/#{format(credit_card.year, :two_digits)}"
+      end
+      
+      def parse(body)
+        xml = REXML::Document.new(body)
+
+        response = {}
+        
+        xml.root.elements.to_a.each do |node|
+          parse_element(response, node)
+        end
+
+        response
+      end
+
+      def parse_element(response, node)
+        if node.has_elements?
+          node.elements.each{|element| parse_element(response, element) }
+        else
+          response[node.name.underscore.to_sym] = node.text
+        end
+      end
+      
+      # YYYYDDMMHHNNSSKKK000sOOO
+      def generate_timestamp
+        time = Time.now.utc
+        time.strftime("%Y%d%m%H%M%S#{time.usec}+000")
+      end  
+    end
+  end
+end
+

data/lib/active_merchant/lib/country.rb

@@ -63,7 +63,8 @@ module ActiveMerchant #:nodoc:
       { :alpha2 => 'AM', :name => 'Armenia', :alpha3 => 'ARM', :numeric => '051' }, 
       { :alpha2 => 'AW', :name => 'Aruba', :alpha3 => 'ABW', :numeric => '533' }, 
       { :alpha2 => 'AU', :name => 'Australia', :alpha3 => 'AUS', :numeric => '036' }, 
-      { :alpha2 => 'AT', :name => 'Austria', :alpha3 => 'AUT', :numeric => '040' }, 
+      { :alpha2 => 'AT', :name => 'Austria', :alpha3 => 'AUT', :numeric => '040' },
+      { :alpha2 => 'AX', :name => 'Åland Islands', :alpha3 => 'ALA', :numeric => '248' },
       { :alpha2 => 'AZ', :name => 'Azerbaijan', :alpha3 => 'AZE', :numeric => '031' }, 
       { :alpha2 => 'BS', :name => 'Bahamas', :alpha3 => 'BHS', :numeric => '044' }, 
       { :alpha2 => 'BH', :name => 'Bahrain', :alpha3 => 'BHR', :numeric => '048' }, 

data/test/fixtures.yml

@@ -244,6 +244,10 @@ secure_pay_tech:
   login: TESTDIGISPL1
   password: d557591484cb2cd12bba445aba420d2c69cd6a88
 
+secure_pay_au:
+  login:
+  password:
+
 #  Replace with your serial numbers for the skipjack test environment
 skipjack:
   login: X

data/test/remote/gateways/remote_authorize_net_test.rb

@@ -129,7 +129,7 @@ class AuthorizeNetTest < Test::Unit::TestCase
     subscription_id = response.authorization
 
     assert response = @gateway.update_recurring(:subscription_id => subscription_id, :amount => @amount * 2)
-    assert_success response.success?
+    assert_success response
 
     assert response = @gateway.cancel_recurring(subscription_id)
     assert_success response

data/test/remote/gateways/remote_paypal_test.rb

@@ -7,11 +7,11 @@ class PaypalTest < Test::Unit::TestCase
     @gateway = PaypalGateway.new(fixtures(:paypal_certificate))
 
     @creditcard = CreditCard.new(
-      :type                => "Visa",
+      :type                => "visa",
       :number              => "4381258770269608", # Use a generated CC from the paypal Sandbox
       :verification_value => "000",
       :month               => 1,
-      :year                => 2008,
+      :year                => Time.now.year + 1,
       :first_name          => 'Fred',
       :last_name           => 'Brooks'
     )
@@ -63,7 +63,7 @@ class PaypalTest < Test::Unit::TestCase
     response = @gateway.authorize(@amount, @creditcard, @params)
     assert_success response
     assert response.params['transaction_id']
-    assert_equal '3.00', response.params['amount']
+    assert_equal '1.00', response.params['amount']
     assert_equal 'USD', response.params['amount_currency_id']
   end
   
@@ -100,7 +100,7 @@ class PaypalTest < Test::Unit::TestCase
     response = @gateway.capture(@amount, auth.authorization)
     assert_success response
     assert response.params['transaction_id']
-    assert_equal '3.00', response.params['gross_amount']
+    assert_equal '1.00', response.params['gross_amount']
     assert_equal 'USD', response.params['gross_amount_currency_id']
   end
   
@@ -119,11 +119,11 @@ class PaypalTest < Test::Unit::TestCase
     assert_success credit
     assert credit.test?
     assert_equal 'USD',  credit.params['net_refund_amount_currency_id']
-    assert_equal '2.61', credit.params['net_refund_amount']
+    assert_equal '0.67', credit.params['net_refund_amount']
     assert_equal 'USD',  credit.params['gross_refund_amount_currency_id']
-    assert_equal '3.00', credit.params['gross_refund_amount']
+    assert_equal '1.00', credit.params['gross_refund_amount']
     assert_equal 'USD',  credit.params['fee_refund_amount_currency_id']
-    assert_equal '0.39', credit.params['fee_refund_amount']
+    assert_equal '0.33', credit.params['fee_refund_amount']
   end
   
   def test_failed_voiding

data/test/remote/gateways/remote_secure_pay_au_test.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+class RemoteSecurePayAuTest < Test::Unit::TestCase
+  
+  def setup
+    @gateway = SecurePayAuGateway.new(fixtures(:secure_pay_au))
+    
+    @amount = 100
+    @credit_card = credit_card('4444333322221111')
+
+    @options = { 
+      :order_id => '1',
+      :billing_address => address,
+      :description => 'Store Purchase'
+    }
+  end
+  
+  def test_successful_purchase
+    assert response = @gateway.purchase(@amount, @credit_card, @options)
+    assert_success response
+    assert_equal 'Approved', response.message
+  end
+
+  def test_unsuccessful_purchase
+    @credit_card.year = '2005'
+    assert response = @gateway.purchase(@amount, @credit_card, @options)
+    assert_failure response
+    assert_equal 'CARD EXPIRED', response.message
+  end
+
+  def test_invalid_login
+    gateway = SecurePayAuGateway.new(
+                :login => '',
+                :password => ''
+              )
+    assert response = gateway.purchase(@amount, @credit_card, @options)
+    assert_failure response
+    assert_equal "Invalid merchant ID", response.message
+  end
+end

data/test/unit/credit_card_test.rb

@@ -162,9 +162,9 @@ class CreditCardTest < Test::Unit::TestCase
     assert_equal 'XXXX-XXXX-XXXX-1234', CreditCard.new(:number => '111222233331234').display_number
     assert_equal 'XXXX-XXXX-XXXX-1234', CreditCard.new(:number => '1112223331234').display_number
 
-    assert_nil CreditCard.new(:number => nil).display_number
-    assert_nil CreditCard.new(:number => '').display_number
-    assert_nil CreditCard.new(:number => '123').display_number
+    assert_equal 'XXXX-XXXX-XXXX-', CreditCard.new(:number => nil).display_number
+    assert_equal 'XXXX-XXXX-XXXX-', CreditCard.new(:number => '').display_number
+    assert_equal 'XXXX-XXXX-XXXX-123', CreditCard.new(:number => '123').display_number
     assert_equal 'XXXX-XXXX-XXXX-1234', CreditCard.new(:number => '1234').display_number
     assert_equal 'XXXX-XXXX-XXXX-1234', CreditCard.new(:number => '01234').display_number
   end
@@ -222,6 +222,11 @@ class CreditCardTest < Test::Unit::TestCase
     assert_equal "8580", ccn.last_digits
   end
   
+  def test_bogus_last_digits
+    ccn = CreditCard.new(:number => "1")
+    assert_equal "1", ccn.last_digits
+  end
+  
   def test_should_be_true_when_credit_card_has_a_first_name
     c = CreditCard.new
     assert_false c.first_name?
@@ -291,4 +296,16 @@ class CreditCardTest < Test::Unit::TestCase
   def test_mask_number
     assert_equal 'XXXX-XXXX-XXXX-5100', CreditCard.mask('5105105105105100')
   end
+  
+  def test_strip_non_digit_characters
+    card = credit_card('4242-4242      %%%%%%4242......4242')
+    assert card.valid?
+    assert_equal "4242424242424242", card.number
+  end
+  
+  def test_before_validate_handles_blank_number
+    card = credit_card(nil)
+    assert !card.valid?
+    assert_equal "", card.number
+  end
 end

data/test/unit/gateways/gateway_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../../test_helper'
 
 class Gateway < Test::Unit::TestCase
- def test_should_detect_if_a_card_is_supported
+  def test_should_detect_if_a_card_is_supported
     Gateway.supported_cardtypes = [:visa, :bogus]
     assert [:visa, :bogus].all? { |supported_cardtype| Gateway.supports?(supported_cardtype) }
     
@@ -28,4 +28,14 @@ class Gateway < Test::Unit::TestCase
      Gateway.new.send(:amount, '10.34')
    end
   end
+  
+  def test_invalid_type
+    credit_card = stub(:type => "visa")    
+    assert_equal "visa", Gateway.card_brand(credit_card)
+  end
+  
+  def test_invalid_type  
+    credit_card = stub(:type => "String", :brand => "visa")
+    assert_equal "visa", Gateway.card_brand(credit_card)
+  end
 end

data/test/unit/gateways/payflow_test.rb

@@ -191,7 +191,7 @@ class PayflowTest < Test::Unit::TestCase
   def test_ensure_gateway_uses_safe_retry
     assert @gateway.retry_safe
   end
-  
+    
   private
   def successful_recurring_response
     <<-XML

data/test/unit/gateways/paypal_test.rb

@@ -94,26 +94,6 @@ class PaypalTest < Test::Unit::TestCase
     assert_equal '123456', express.options[:pem]
   end
   
-  def test_successful_state_lookup
-    assert_equal 'AB', @gateway.send(:lookup_state, { :country => 'CA', :state => 'AB'})
-  end
-  
-  def test_lookup_unknown_state
-    assert_equal '', @gateway.send(:lookup_state, { :country => 'XX', :state => 'NA'})
-  end
-  
-  def test_lookup_uk_with_state
-    assert_equal 'Avon', @gateway.send(:lookup_state, { :country => 'United Kingdom', :state => 'Avon'})
-  end
-  
-  def test_lookup_uk_with_no_state
-    assert_equal 'N/A', @gateway.send(:lookup_state, { :country => 'GB', :state => '' })
-  end
-  
-  def test_lookup_australian_state
-    assert_equal 'Australian Capital Territory', @gateway.send(:lookup_state, { :country => 'AU', :state => 'ACT'} )
-  end
-  
   def test_supported_countries
     assert_equal ['US'], PaypalGateway.supported_countries
   end

data/test/unit/gateways/secure_pay_au_test.rb

@@ -0,0 +1,150 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+class SecurePayAuTest < Test::Unit::TestCase
+  def setup
+    @gateway = SecurePayAuGateway.new(
+                 :login => 'login',
+                 :password => 'password'
+               )
+
+    @credit_card = credit_card
+    @amount = 100
+    
+    @options = { 
+      :order_id => '1',
+      :billing_address => address,
+      :description => 'Store Purchase'
+    }
+  end
+  
+  def test_successful_purchase
+    @gateway.expects(:ssl_post).returns(successful_purchase_response)
+    
+    assert response = @gateway.purchase(@amount, @credit_card, @options)
+    assert_instance_of Response, response
+    assert_success response
+    
+    assert_equal '024259', response.authorization
+    assert response.test?
+  end
+
+  def test_unsuccessful_purchase
+    @gateway.expects(:ssl_post).returns(failed_purchase_response)
+    
+    assert response = @gateway.purchase(@amount, @credit_card, @options)
+    assert_instance_of Response, response
+    assert_failure response
+    assert response.test?
+    assert_equal "CARD EXPIRED", response.message
+  end
+  
+  def test_failed_login
+    @gateway.expects(:ssl_post).returns(failed_login_response)
+    
+    assert response = @gateway.purchase(@amount, @credit_card, @options)
+    assert_instance_of Response, response
+    assert_failure response
+    assert_equal "Invalid merchant ID", response.message
+  end
+
+  private
+  
+  def failed_login_response
+    '<SecurePayMessage><Status><statusCode>504</statusCode><statusDescription>Invalid merchant ID</statusDescription></Status></SecurePayMessage>'
+  end
+  
+  def successful_purchase_response
+    <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<SecurePayMessage>
+  <MessageInfo>
+    <messageID>8af793f9af34bea0cf40f5fb5c630c</messageID>
+    <messageTimestamp>20080802041625665000+660</messageTimestamp>
+    <apiVersion>xml-4.2</apiVersion>
+  </MessageInfo>
+  <RequestType>Payment</RequestType>
+  <MerchantInfo>
+    <merchantID>XYZ0001</merchantID>
+  </MerchantInfo>
+  <Status>
+    <statusCode>000</statusCode>
+    <statusDescription>Normal</statusDescription>
+  </Status>
+  <Payment>
+    <TxnList count="1">
+      <Txn ID="1">
+        <txnType>0</txnType>
+        <txnSource>0</txnSource>
+        <amount>1000</amount>
+        <currency>AUD</currency>
+        <purchaseOrderNo>test</purchaseOrderNo>
+        <approved>Yes</approved>
+        <responseCode>00</responseCode>
+        <responseText>Approved</responseText>
+        <thinlinkResponseCode>100</thinlinkResponseCode>
+        <thinlinkResponseText>000</thinlinkResponseText>
+        <thinlinkEventStatusCode>000</thinlinkEventStatusCode>
+        <thinlinkEventStatusText>Normal</thinlinkEventStatusText>
+        <settlementDate>20080208</settlementDate>
+        <txnID>024259</txnID>
+        <CreditCardInfo>
+          <pan>424242...242</pan>
+          <expiryDate>07/11</expiryDate>
+          <cardType>6</cardType>
+          <cardDescription>Visa</cardDescription>
+        </CreditCardInfo>
+      </Txn>
+    </TxnList>
+  </Payment>
+</SecurePayMessage>
+    
+    XML
+  end
+  
+  def failed_purchase_response
+    <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<SecurePayMessage>
+  <MessageInfo>
+    <messageID>8af793f9af34bea0cf40f5fb5c630c</messageID>
+    <messageTimestamp>20080802040346380000+660</messageTimestamp>
+    <apiVersion>xml-4.2</apiVersion>
+  </MessageInfo>
+  <RequestType>Payment</RequestType>
+  <MerchantInfo>
+    <merchantID>XYZ0001</merchantID>
+  </MerchantInfo>
+  <Status>
+    <statusCode>000</statusCode>
+    <statusDescription>Normal</statusDescription>
+  </Status>
+  <Payment>
+    <TxnList count="1">
+      <Txn ID="1">
+        <txnType>0</txnType>
+        <txnSource>0</txnSource>
+        <amount>1000</amount>
+        <currency>AUD</currency>
+        <purchaseOrderNo>test</purchaseOrderNo>
+        <approved>No</approved>
+        <responseCode>907</responseCode>
+        <responseText>CARD EXPIRED</responseText>
+        <thinlinkResponseCode>300</thinlinkResponseCode>
+        <thinlinkResponseText>000</thinlinkResponseText>
+        <thinlinkEventStatusCode>981</thinlinkEventStatusCode>
+        <thinlinkEventStatusText>Error - Expired Card</thinlinkEventStatusText>
+        <settlementDate>        </settlementDate>
+        <txnID>000000</txnID>
+        <CreditCardInfo>
+          <pan>424242...242</pan>
+          <expiryDate>07/06</expiryDate>
+          <cardType>6</cardType>
+          <cardDescription>Visa</cardDescription>
+        </CreditCardInfo>
+      </Txn>
+    </TxnList>
+  </Payment>
+</SecurePayMessage>
+    XML
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activemerchant
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -30,7 +30,7 @@ cert_chain:
   hPaSTyVU0yCSnw==
   -----END CERTIFICATE-----
 
-date: 2008-01-28 00:00:00 -05:00
+date: 2008-02-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,6 +108,7 @@ files:
 - lib/active_merchant/billing/gateways/quickpay.rb
 - lib/active_merchant/billing/gateways/realex.rb
 - lib/active_merchant/billing/gateways/secure_pay.rb
+- lib/active_merchant/billing/gateways/secure_pay_au.rb
 - lib/active_merchant/billing/gateways/secure_pay_tech.rb
 - lib/active_merchant/billing/gateways/skip_jack.rb
 - lib/active_merchant/billing/gateways/trans_first.rb
@@ -206,6 +207,7 @@ files:
 - test/remote/gateways/remote_psl_card_test.rb
 - test/remote/gateways/remote_quickpay_test.rb
 - test/remote/gateways/remote_realex_test.rb
+- test/remote/gateways/remote_secure_pay_au_test.rb
 - test/remote/gateways/remote_secure_pay_tech_test.rb
 - test/remote/gateways/remote_secure_pay_test.rb
 - test/remote/gateways/remote_skipjack_test.rb
@@ -259,6 +261,7 @@ files:
 - test/unit/gateways/psl_card_test.rb
 - test/unit/gateways/quickpay_test.rb
 - test/unit/gateways/realex_test.rb
+- test/unit/gateways/secure_pay_au_test.rb
 - test/unit/gateways/secure_pay_tech_test.rb
 - test/unit/gateways/secure_pay_test.rb
 - test/unit/gateways/skip_jack_test.rb