activemerchant 1.2.1 → 1.3.0

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

@@ -35,11 +35,6 @@ module ActiveMerchant
       # Datacash success code
       DATACASH_SUCCESS = '1'
       
-      # Class attributes
-      attr_reader :url 
-      attr_reader :response
-      attr_reader :options
-      
       # Creates a new DataCashGateway
       # 
       # The gateway requires that a valid login and password be passed
@@ -65,13 +60,7 @@ module ActiveMerchant
       # * <tt>credit_card</tt> -- The CreditCard details for the transaction.
       # * <tt>options</tt> -- A hash of optional parameters.
       def purchase(money, credit_card, options = {})
-        if result = test_result_from_cc_number(credit_card.number)
-          return result
-        end
-      
-        request = build_purchase_or_authorization_request(AUTH_TYPE, money, credit_card, options)
-      
-        commit(request)
+        commit(build_purchase_or_authorization_request(AUTH_TYPE, money, credit_card, options))
       end
       
       # Performs an authorization, which reserves the funds on the customer's credit card, but does not 
@@ -83,13 +72,7 @@ module ActiveMerchant
       # * <tt>credit_card</tt> -- The CreditCard details for the transaction.
       # * <tt>options</tt> -- A hash of optional parameters.   
       def authorize(money, credit_card, options = {})
-        if result = test_result_from_cc_number(credit_card.number)
-          return result
-        end
-        
-        request = build_purchase_or_authorization_request(PRE_TYPE, money, credit_card, options)
-        
-        commit(request)
+        commit(build_purchase_or_authorization_request(PRE_TYPE, money, credit_card, options))
       end
       
       # Captures the funds from an authorized transaction.
@@ -99,9 +82,7 @@ module ActiveMerchant
       # * <tt>money</tt> -- The amount to be captured.  Either an Integer value in cents or a Money object.
       # * <tt>authorization</tt> -- The authorization returned from the previous authorize request.   
       def capture(money, authorization, options = {})
-        request = build_void_or_capture_request(FULFILL_TYPE, money, authorization, options)
-
-        commit(request)
+        commit(build_void_or_capture_request(FULFILL_TYPE, money, authorization, options))
       end                    
       
       # Void a previous transaction
@@ -117,7 +98,7 @@ module ActiveMerchant
       
       # Is the gateway running in test mode?
       def test?
-        @options[:test] || Base.gateway_mode == :test
+        @options[:test] || super
       end
     
       private                         
@@ -286,6 +267,7 @@ module ActiveMerchant
       #   -none: The results is stored in the passed xml document
       #   
       def add_credit_card(xml, credit_card, address)
+        
         xml.tag! :Card do
           
           # DataCash calls the CC number 'pan'
@@ -304,11 +286,13 @@ module ActiveMerchant
             
           xml.tag! :Cv2Avs do
             xml.tag! :cv2, credit_card.verification_value if credit_card.verification_value?
-            xml.tag! :street_address1, address[:address1] unless address[:address1].blank?
-            xml.tag! :street_address2, address[:address2] unless address[:address2].blank?
-            xml.tag! :street_address3, address[:address3] unless address[:address3].blank?
-            xml.tag! :street_address4, address[:address4] unless address[:address4].blank?
-            xml.tag! :postcode, address[:zip] unless address[:zip].blank?
+            if address
+              xml.tag! :street_address1, address[:address1] unless address[:address1].blank?
+              xml.tag! :street_address2, address[:address2] unless address[:address2].blank?
+              xml.tag! :street_address3, address[:address3] unless address[:address3].blank?
+              xml.tag! :street_address4, address[:address4] unless address[:address4].blank?
+              xml.tag! :postcode, address[:zip] unless address[:zip].blank?
+            end
             
             # The ExtendedPolicy defines what to do when the passed data 
             # matches, or not...
@@ -349,15 +333,11 @@ module ActiveMerchant
       #   - ActiveMerchant::Billing::Response object
       #   
       def commit(request)
-        url = test? ? TEST_URL : LIVE_URL
-  
-        @response = parse(ssl_post(url, request))      
-        success = @response[:status] == DATACASH_SUCCESS
-        message = @response[:reason]
-        
-        Response.new(success, message, @response,
-                     :test => test?,
-                     :authorization => "#{@response[:datacash_reference]};#{@response[:authcode]}"
+        response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, request))      
+
+        Response.new(response[:status] == DATACASH_SUCCESS, response[:reason], response,
+          :test => test?,
+          :authorization => "#{response[:datacash_reference]};#{response[:authcode]}"
         )
       end
       
@@ -412,7 +392,7 @@ module ActiveMerchant
       end
       
       def format_reference_number(number)
-        number.to_s.gsub(/[^A-Za-z0-9]/, '').rjust(6, "0")
+        number.to_s.gsub(/[^A-Za-z0-9]/, '').rjust(6, "0").first(30)
       end
     end
   end

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

@@ -4,10 +4,6 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
 
     class EfsnetGateway < Gateway
-      attr_reader :url 
-      attr_reader :response
-      attr_reader :options
- 
       self.supported_countries = ['US']
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
       self.homepage_url = 'http://www.concordefsnet.com/'
@@ -20,15 +16,12 @@ module ActiveMerchant #:nodoc:
       # password is your Store Key
       def initialize(options = {})
         requires!(options, :login, :password)
-      
         @options = options
-        @url = test? ? TEST_URL : LIVE_URL      
-        
         super      
       end
       
       def test?
-        @options[:test] || Base.gateway_mode == :test
+        @options[:test] || super
       end
       
       def authorize(money, creditcard, options = {})
@@ -61,7 +54,7 @@ module ActiveMerchant #:nodoc:
       def void(identification, options = {})
         requires!(options, :order_id)
         original_transaction_id, original_transaction_amount = identification.split(";")
-        commit(:void_transaction, {:reference_number => options[:order_id], :transaction_ID => original_transaction_id})
+        commit(:void_transaction, {:reference_number => format_reference_number(options[:order_id]), :transaction_ID => original_transaction_id})
       end
       
       def voice_authorize(money, authorization_code, creditcard, options = {})
@@ -88,7 +81,7 @@ module ActiveMerchant #:nodoc:
         requires!(options, :order_id)
 
         post = {
-          :reference_number => options[:order_id],
+          :reference_number => format_reference_number(options[:order_id]),
           :transaction_amount => amount(money),
           :original_transaction_amount => original_transaction_amount,
           :original_transaction_ID => original_transaction_id,
@@ -100,7 +93,7 @@ module ActiveMerchant #:nodoc:
         requires!(options, :order_id)
 
         post = {
-          :reference_number => options[:order_id],
+          :reference_number => format_reference_number(options[:order_id]),
           :authorization_number => options[:authorization_number],
           :transaction_amount => amount(money),
           :client_ip_address => options[:ip]
@@ -110,6 +103,10 @@ module ActiveMerchant #:nodoc:
         add_address(post,options)
         post
       end
+      
+      def format_reference_number(number)
+        number.to_s.slice(0,12)
+      end
     
       def add_address(post,options)
         if address = options[:billing_address] || options[:address]
@@ -146,49 +143,26 @@ module ActiveMerchant #:nodoc:
       end
 
   
-      def commit(action, parameters)                                 
-        if result = test_result_from_cc_number(parameters[:account_number])
-          return result
-        end
-
-        parameters.delete_if {|key,value| value.blank?}       
-
-        headers = { 'Content-Type' => 'text/xml' }
-        data = ssl_post @url, post_data(action, parameters), headers
-
-        @response = parse(data)
+      def commit(action, parameters)  
+        response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, post_data(action, parameters), 'Content-Type' => 'text/xml'))
 
-        success = (response[:response_code] and response[:response_code] == '0')
-        message = message_form(response[:result_message])
-        
-        authorization = [ response[:transaction_id], parameters[:transaction_amount] ].compact.join(';')
-        
-        Response.new(success, message, @response,
+        Response.new(success?(response), message_from(response[:result_message]), response,
           :test => test?,
-          :authorization => authorization
+          :authorization => authorization_from(response, parameters),
+          :avs_result => { :code => response[:avs_response_code] },
+          :cvv_result => response[:cvv_response_code]
         )
       end
+      
+      def success?(response)
+        response[:response_code] == '0'
+      end
+      
+      def authorization_from(response, params)
+        [ response[:transaction_id], params[:transaction_amount] ].compact.join(';')
+      end
                                                
-      # Parse response xml into a convinient hash
       def parse(xml)
-        #<Reply>
-        #<TransactionReply>
-        #<ResponseCode>0</ResponseCode>
-        #<ResultCode>00</ResultCode>
-        #<ResultMessage>APPROVED</ResultMessage>
-        #<TransactionID>200011125443</TransactionID>
-        #<AVSResponseCode>N</AVSResponseCode>
-        #<CVVResponseCode></CVVResponseCode>
-        #<ApprovalNumber>123456</ApprovalNumber>
-        #<AuthorizationNumber>123456</AuthorizationNumber>
-        #<TransactionDate>070728</TransactionDate>
-        #<TransactionTime>024734</TransactionTime>
-        #<ReferenceNumber>19786</ReferenceNumber>
-        #<AccountNumber>XXXXXXXXXXXX5454</AccountNumber>
-        #<TransactionAmount>1.00</TransactionAmount>
-        #</TransactionReply>
-        #</Reply>
-
         response = {}
 
         xml = REXML::Document.new(xml)          
@@ -217,7 +191,7 @@ module ActiveMerchant #:nodoc:
         xml.to_s
       end
     
-      def message_form(message)
+      def message_from(message)
         return 'Unspecified error' if message.blank?
         message.gsub(/[^\w]/, ' ').split.join(" ").capitalize
       end
@@ -237,7 +211,6 @@ module ActiveMerchant #:nodoc:
         ACTIONS
       end
 
-
       CREDIT_CARD_FIELDS =  [:authorization_number, :client_ip_address, :billing_address, :billing_city, :billing_state, :billing_postal_code, :billing_country, :billing_name, :card_verification_value, :expiration_month, :expiration_year, :reference_number, :transaction_amount, :account_number ]
 
       ACTIONS = {

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

@@ -129,10 +129,6 @@ module ActiveMerchant #:nodoc:
         "96" => "System Error"
       }
       
-      attr_reader :url 
-      attr_reader :response
-      attr_reader :options
-	
 	    self.money_format = :cents
       self.supported_countries = ['AU']
       self.supported_cardtypes = [:visa, :master]
@@ -195,27 +191,20 @@ module ActiveMerchant #:nodoc:
         post[:Option3] = nil     
       end
 
-      def commit(money, parameters)
-          
+      def commit(money, parameters)       
         parameters[:TotalAmount] = amount(money)
-        
-        if result = test_result_from_cc_number(parameters[:CardNumber])
-          return result
-        end
 
-        data = ssl_post gateway_url(parameters[:CVN], test?), post_data(parameters)
-        
-        @response = parse(data)
+        response = parse( ssl_post(gateway_url(parameters[:CVN], test?), post_data(parameters)) )
 
-        success = (response[:ewaytrxnstatus] == "True")
-        message = message_from(response[:ewaytrxnerror])
-        test = /\(Test( CVN)? Gateway\)/ === response[:ewaytrxnerror]
-    
-        Response.new(success, message, @response,
+        Response.new(success?(response), message_from(response[:ewaytrxnerror]), response,
           :authorization => response[:ewayauthcode],
-          :test => test
+          :test => /\(Test( CVN)? Gateway\)/ === response[:ewaytrxnerror]
         )      
       end
+      
+      def success?(response)
+        response[:ewaytrxnstatus] == "True"
+      end
                                              
       # Parse eway response xml into a convinient hash
       def parse(xml)

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

@@ -39,11 +39,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['CA', 'US']
       self.homepage_url = 'http://www.e-xact.com'
       self.display_name = 'E-xact'
-      
-      attr_reader :url
-      attr_reader :response
-      attr_reader :options
-
+  
       def initialize(options = {})
         requires!(options, :login, :password)
         @options = options
@@ -60,18 +56,10 @@ module ActiveMerchant #:nodoc:
       end
       
       def authorize(money, credit_card, options = {})
-        if result = test_result_from_cc_number(credit_card.number)
-          return result
-        end
-        
         commit(:authorization, build_sale_or_authorization_request(money, credit_card, options))
       end
       
       def purchase(money, credit_card, options = {})
-        if result = test_result_from_cc_number(credit_card.number)
-          return result
-        end
-        
         commit(:sale, build_sale_or_authorization_request(money, credit_card, options))
       end
     
@@ -176,22 +164,26 @@ module ActiveMerchant #:nodoc:
       end
       
       def commit(action, request)
-         data = ssl_post(URL, build_request(action, request), POST_HEADERS)
+         response = parse(ssl_post(URL, build_request(action, request), POST_HEADERS))
+      
+         Response.new(successful?(response), message_from(response), response,
+           :test => test?,
+           :authorization => authorization_from(response),
+           :avs_result => { :code => response[:avs] },
+           :cvv_result => response[:cvv2]
+         )
+      end
       
-         @response = parse(data)
+      def successful?(response)
+        response[:transaction_approved] == SUCCESS
+      end
       
-         success = @response[:transaction_approved] == SUCCESS
-         
-         authorization = if @response[:authorization_num] && @response[:transaction_tag]
+      def authorization_from(response)
+        if response[:authorization_num] && response[:transaction_tag]
            "#{response[:authorization_num]};#{response[:transaction_tag]}"        
-         else
+        else
            ''
-         end
-         
-         Response.new(success, message_from(@response), @response,
-           :test => test?,
-           :authorization => authorization
-         )
+        end
       end
       
       def message_from(response)

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

@@ -90,9 +90,6 @@ module ActiveMerchant #:nodoc:
     # LinkPoint's Items entity is not yet supported in this module.
     # 
     class LinkpointGateway < Gateway     
-      attr_reader :response
-      attr_reader :options
-      
       # Your global PEM file. This will be assigned to you by linkpoint
       # 
       # Example: 
@@ -216,34 +213,30 @@ module ActiveMerchant #:nodoc:
       end
     
       def test?
-        @options[:test] || Base.gateway_mode == :test
+        @options[:test] || super
       end
       
       private
       # Commit the transaction by posting the XML file to the LinkPoint server
       def commit(money, creditcard, options = {})
-        parameters = parameters(money, creditcard, options)
-        url = test? ? TEST_URL : LIVE_URL
-        
-        if creditcard and result = test_result_from_cc_number(parameters[:creditcard][:cardnumber])
-          return result
-        end
-        
-        data = ssl_post(url, post_data(parameters))
-                
-        @response = parse(data)
+        response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, post_data(money, creditcard, options)))
         
-        success = (@response[:approved] == "APPROVED")
-        message = response[:message]
-        
-        Response.new(success, message, @response, 
+        Response.new(successful?(response), response[:message], response, 
           :test => test?,
-          :authorization => response[:ordernum]
+          :authorization => response[:ordernum],
+          :avs_result => { :code => response[:avs].to_s[2,1] },
+          :cvv_result => response[:avs].to_s[3,1]
         )
       end
       
+      def successful?(response)
+        response[:approved] == "APPROVED"
+      end
+      
       # Build the XML file
-      def post_data(parameters = {})
+      def post_data(money, creditcard, options)
+        params = parameters(money, creditcard, options)
+        
         xml = REXML::Document.new
         order = xml.add_element("order")
         
@@ -251,11 +244,11 @@ module ActiveMerchant #:nodoc:
         merchantinfo = order.add_element("merchantinfo")
         merchantinfo.add_element("configfile").text = @options[:login]
         
-        # Loop over the parameters hash to construct the XML string
-        for key, value in parameters
+        # Loop over the params hash to construct the XML string
+        for key, value in params
           elem = order.add_element(key.to_s)
-          for k, v in parameters[key]
-            elem.add_element(k.to_s).text = parameters[key][k].to_s if parameters[key][k]
+          for k, v in params[key]
+            elem.add_element(k.to_s).text = params[key][k].to_s if params[key][k]
           end
           # Linkpoint doesn't understand empty elements: 
           order.delete(elem) if elem.size == 0
@@ -343,7 +336,7 @@ module ActiveMerchant #:nodoc:
           params[:billing][:email]     = options[:email] unless options[:email].blank?
         end                
 
-        if shipping_address = options[:shipping_address] || billing_address  
+        if shipping_address = options[:shipping_address] 
 
           params[:shipping] = {}
           params[:shipping][:name]      = shipping_address[:name] || creditcard ? creditcard.name : nil