activemerchant 1.26.0 → 1.27.0

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

@@ -7,6 +7,8 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = SageBankcardGateway.supported_countries
       self.supported_cardtypes = SageBankcardGateway.supported_cardtypes
 
+      self.abstract_class = true
+
       # Creates a new SageGateway
       # 
       # The gateway requires that a valid login and password be passed

data/lib/active_merchant/billing/gateways/sage/sage_bankcard.rb

@@ -4,7 +4,7 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class SageBankcardGateway < Gateway #:nodoc:
       include SageCore
-      self.url = 'https://www.sagepayments.net/cgi-bin/eftBankcard.dll?transaction'
+      self.live_url = 'https://www.sagepayments.net/cgi-bin/eftBankcard.dll?transaction'
       self.source = 'bankcard'
           
       # Credit cards supported by Sage

data/lib/active_merchant/billing/gateways/sage/sage_core.rb

@@ -2,7 +2,6 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module SageCore #:nodoc:
       def self.included(base)
-        base.cattr_accessor :url
         base.cattr_accessor :source
         base.supported_countries = ['US', 'CA']
         base.homepage_url = 'http://www.sagepayments.com'
@@ -86,7 +85,7 @@ module ActiveMerchant #:nodoc:
       end
       
       def commit(action, params)
-        response = parse(ssl_post(url, post_data(action, params)))
+        response = parse(ssl_post(self.live_url, post_data(action, params)))
         
         Response.new(success?(response), response[:message], response, 
           :test => test?, 
@@ -113,4 +112,4 @@ module ActiveMerchant #:nodoc:
       end
     end
   end
-end
+end

data/lib/active_merchant/billing/gateways/sage/sage_virtual_check.rb

@@ -4,7 +4,7 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class SageVirtualCheckGateway < Gateway #:nodoc:
       include SageCore
-      self.url = 'https://www.sagepayments.net/cgi-bin/eftVirtualCheck.dll?transaction'
+      self.live_url = 'https://www.sagepayments.net/cgi-bin/eftVirtualCheck.dll?transaction'
       self.source = 'virtual_check'
       
       def purchase(money, credit_card, options = {})

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

@@ -3,10 +3,12 @@ module ActiveMerchant #:nodoc:
     class SagePayGateway < Gateway  
       cattr_accessor :simulate
       self.simulate = false
-      
-      TEST_URL = 'https://test.sagepay.com/gateway/service'
-      LIVE_URL = 'https://live.sagepay.com/gateway/service'
-      SIMULATOR_URL = 'https://test.sagepay.com/Simulator'
+
+      class_attribute :simulator_url
+
+      self.test_url = 'https://test.sagepay.com/gateway/service'
+      self.live_url = 'https://live.sagepay.com/gateway/service'
+      self.simulator_url = 'https://test.sagepay.com/Simulator'
       
       APPROVED = 'OK'
     
@@ -265,12 +267,12 @@ module ActiveMerchant #:nodoc:
       
       def build_url(action)
         endpoint = [ :purchase, :authorization ].include?(action) ? "vspdirect-register" : TRANSACTIONS[action].downcase
-        "#{test? ? TEST_URL : LIVE_URL}/#{endpoint}.vsp"
+        "#{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"
-        "#{SIMULATOR_URL}/#{endpoint}"
+        "#{self.simulator_url}/#{endpoint}"
       end
 
       def message_from(response)

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

@@ -1,7 +1,7 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class SallieMaeGateway < Gateway
-      URL = 'https://trans.salliemae.com/cgi-bin/process.cgi'
+      self.live_url = self.test_url = 'https://trans.salliemae.com/cgi-bin/process.cgi'
 
       # The countries the gateway supports merchants from as 2 digit ISO country codes
       self.supported_countries = ['US']
@@ -120,7 +120,7 @@ module ActiveMerchant #:nodoc:
           parameters[:action] = "ns_quicksale_cc"
         end
 
-        response = parse(ssl_post(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"]

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

@@ -44,9 +44,9 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'SecureNet'
 #      self.wiredump_device = STDOUT
 
-#      TEST_URL = 'https://certify.securenet.com/api/Gateway.svc'
-      TEST_URL = 'https://certify.securenet.com/API/gateway.svc/webHttp/ProcessTransaction'
-      LIVE_URL = 'https://gateway.securenet.com/api/Gateway.svc'
+#      self.test_url = 'https://certify.securenet.com/api/Gateway.svc'
+      self.test_url = 'https://certify.securenet.com/API/gateway.svc/webHttp/ProcessTransaction'
+      self.live_url = 'https://gateway.securenet.com/api/Gateway.svc'
 
       APPROVED, DECLINED, ERROR = 1, 2, 3
 
@@ -85,7 +85,7 @@ module ActiveMerchant #:nodoc:
       private
       def commit(request, money)
         xml = build_request(request, money)
-        data = ssl_post(TEST_URL, xml, "Content-Type" => "text/xml")
+        data = ssl_post(self.test_url, xml, "Content-Type" => "text/xml")
         response = parse(data)
 
         test_mode = test?

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

@@ -6,10 +6,13 @@ module ActiveMerchant #:nodoc:
       API_VERSION = 'xml-4.2'
       PERIODIC_API_VERSION = 'spxml-3.0'
 
-      TEST_URL = 'https://www.securepay.com.au/test/payment'
-      LIVE_URL = 'https://www.securepay.com.au/xmlapi/payment'
-      TEST_PERIODIC_URL = "https://test.securepay.com.au/xmlapi/periodic"
-      LIVE_PERIODIC_URL = "https://api.securepay.com.au/xmlapi/periodic"
+      class_attribute :test_periodic_url, :live_periodic_url
+
+      self.test_url = 'https://www.securepay.com.au/test/payment'
+      self.live_url = 'https://www.securepay.com.au/xmlapi/payment'
+
+      self.test_periodic_url = 'https://test.securepay.com.au/xmlapi/periodic'
+      self.live_periodic_url = 'https://api.securepay.com.au/xmlapi/periodic'
 
       self.supported_countries = ['AU']
       self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb]
@@ -169,7 +172,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, request)
-        response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, build_request(action, request)))
+        response = parse(ssl_post(test? ? self.test_url : self.live_url, build_request(action, request)))
 
         Response.new(success?(response), message_from(response), response,
           :test => test?,
@@ -227,7 +230,7 @@ module ActiveMerchant #:nodoc:
       def commit_periodic(request)
         my_request = build_periodic_request(request)
         #puts my_request
-        response = parse(ssl_post(test? ? TEST_PERIODIC_URL : LIVE_PERIODIC_URL, my_request))
+        response = parse(ssl_post(test? ? self.test_periodic_url : self.live_periodic_url, my_request))
 
         Response.new(success?(response), message_from(response), response,
           :test => test?,

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

@@ -5,7 +5,7 @@ module ActiveMerchant #:nodoc:
         self.required_fields = [ :OrderReference, :CardNumber, :CardExpiry, :CardHolderName, :CardType, :MerchantID, :MerchantKey, :Amount, :Currency ]
       end
 
-      URL = 'https://tx.securepaytech.com/web/HttpPostPurchase'
+      self.live_url = self.test_url = 'https://tx.securepaytech.com/web/HttpPostPurchase'
 
       PAYMENT_GATEWAY_RESPONSES = {
         1 => "Transaction OK",
@@ -83,7 +83,7 @@ module ActiveMerchant #:nodoc:
       end    
       
       def commit(action, post)
-        response = parse( ssl_post(URL, post_data(action, post) ) )
+        response = parse( ssl_post(self.live_url, post_data(action, post) ) )
 
         Response.new(response[:result_code] == 1, message_from(response), response, 
           :test => test?, 

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

@@ -6,8 +6,8 @@ module ActiveMerchant #:nodoc:
     class SkipJackGateway < Gateway
       API_VERSION = '?.?'
       
-      LIVE_HOST = "https://www.skipjackic.com" 
-      TEST_HOST = "https://developer.skipjackic.com"
+      self.live_url = "https://www.skipjackic.com" 
+      self.test_url = "https://developer.skipjackic.com"
       
       BASIC_PATH = "/scripts/evolvcc.dll"
       ADVANCED_PATH = "/evolvcc/evolvcc.aspx"
@@ -280,7 +280,7 @@ module ActiveMerchant #:nodoc:
       end
       
       def url_for(action)
-        result = test? ? TEST_HOST : LIVE_HOST
+        result = test? ? self.test_url : self.live_url
         result += advanced? && action == :authorization ? ADVANCED_PATH : BASIC_PATH
         result += "?#{ACTIONS[action]}"
       end

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

@@ -7,6 +7,8 @@ module ActiveMerchant #:nodoc:
       ##
       # This is the base gateway for processors who use the smartPS processing system
 
+      self.abstract_class = true
+
       def initialize(options = {})
         requires!(options, :login, :password)
         @options = options
@@ -218,7 +220,7 @@ module ActiveMerchant #:nodoc:
       
       def commit(action, money, parameters)
         parameters[:amount]  = amount(money) if money
-        response = parse( ssl_post(api_url, post_data(action,parameters)) )
+        response = parse( ssl_post(self.live_url, post_data(action,parameters)) )
         Response.new(response["response"] == "1", message_from(response), response, 
           :authorization => response["transactionid"],
           :test => test?,

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

@@ -3,7 +3,7 @@ require 'json'
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class StripeGateway < Gateway
-      LIVE_URL = 'https://api.stripe.com/v1/'
+      self.live_url = 'https://api.stripe.com/v1/'
 
       AVS_CODE_TRANSLATOR = {
         'line1: pass, zip: pass' => 'Y',
@@ -191,7 +191,7 @@ module ActiveMerchant #:nodoc:
         raw_response = response = nil
         success = false
         begin
-          raw_response = ssl_request(method, LIVE_URL + url, post_data(parameters), headers(meta))
+          raw_response = ssl_request(method, self.live_url + url, post_data(parameters), headers(meta))
           response = parse(raw_response)
           success = !response.key?("error")
         rescue ResponseError => e

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

@@ -1,7 +1,7 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class TransFirstGateway < Gateway
-      URL = 'https://webservices.primerchants.com/creditcard.asmx/CCSale'
+      self.live_url = self.test_url = 'https://webservices.primerchants.com/creditcard.asmx/CCSale'
 
       self.supported_countries = ['US']
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
@@ -90,7 +90,7 @@ module ActiveMerchant #:nodoc:
       end
       
       def commit(params) 
-        response = parse( ssl_post(URL, post_data(params)) )
+        response = parse( ssl_post(self.live_url, post_data(params)) )
 
         Response.new(response[:status] == "Authorized", message_from(response), response, 
           :test => test?, 

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

@@ -3,9 +3,7 @@ require File.join(File.dirname(__FILE__),'smart_ps.rb')
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class TransaxGateway < SmartPs
-      def api_url 
-        'https://secure.nelixtransax.net/api/transact.php'
-      end
+      self.live_url = self.test_url = 'https://secure.nelixtransax.net/api/transact.php'
       
       # The countries the gateway supports merchants from as 2 digit ISO country codes
       self.supported_countries = ['US']

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

@@ -65,7 +65,7 @@ module ActiveMerchant #:nodoc:
     # below and the rest of active_merchant's documentation, as well as Trust Commerce's user and developer documentation.
     
     class TrustCommerceGateway < Gateway
-      URL = 'https://vault.trustcommerce.com/trans/'
+      self.live_url = self.test_url = 'https://vault.trustcommerce.com/trans/'
       
       SUCCESS_TYPES = ["approved", "accepted"]
       
@@ -380,7 +380,7 @@ module ActiveMerchant #:nodoc:
         data = if tclink?
           TCLink.send(parameters)
         else
-          parse( ssl_post(URL, post_data(parameters)) )
+          parse( ssl_post(self.live_url, post_data(parameters)) )
         end
         
         # to be considered successful, transaction status must be either "approved" or "accepted"
@@ -420,4 +420,4 @@ module ActiveMerchant #:nodoc:
       
     end
   end
-end
+end

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

@@ -6,6 +6,8 @@ module ActiveMerchant #:nodoc:
     #
     class UsaEpayGateway < Gateway
 
+      self.abstract_class = true
+
       ##
       # Creates an instance of UsaEpayTransactionGateway by default, but if 
       # :software id or :live_url are passed in the options hash it will

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

@@ -64,11 +64,12 @@ module ActiveMerchant #:nodoc:
     class UsaEpayAdvancedGateway < Gateway
       API_VERSION = "1.4"
       
-      class_attribute :test_url, :live_url
-
       TEST_URL_BASE = 'https://sandbox.usaepay.com/soap/gate/' #:nodoc:
       LIVE_URL_BASE = 'https://www.usaepay.com/soap/gate/' #:nodoc:
 
+      self.test_url = TEST_URL_BASE
+      self.live_url = LIVE_URL_BASE
+
       FAILURE_MESSAGE = "Default Failure" #:nodoc:
       
       self.supported_countries = ['US']

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

@@ -2,7 +2,7 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
 
     class UsaEpayTransactionGateway < Gateway
-    	URL = 'https://www.usaepay.com/gate.php'
+      self.test_url = self.live_url = 'https://www.usaepay.com/gate.php'
 
       self.supported_cardtypes = [:visa, :master, :american_express]
       self.supported_countries = ['US']
@@ -66,6 +66,10 @@ module ActiveMerchant #:nodoc:
         commit(:void, post)
       end
 
+      def test?
+        @options[:test] || super
+      end
+
       private
 
       def add_amount(post, money)
@@ -169,7 +173,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, parameters)
-        response = parse( ssl_post(URL, post_data(action, parameters)) )
+        response = parse( ssl_post(self.live_url, post_data(action, parameters)) )
 
         Response.new(response[:status] == 'Approved', message_from(response), response,
           :test => test?,
@@ -196,10 +200,6 @@ module ActiveMerchant #:nodoc:
 
         parameters.collect { |key, value| "UM#{key}=#{CGI.escape(value.to_s)}" }.join("&")
       end
-
-      def test?
-        @options[:test] || super
-      end
     end
   end
 end

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

@@ -9,7 +9,7 @@ module ActiveMerchant #:nodoc:
           :company, :address1, :address2, :city, :state, :zip, :country, :phone ]   
       end
 
-      URL = 'https://secure.verifi.com/gw/api/transact.php'
+      self.live_url = self.test_url = 'https://secure.verifi.com/gw/api/transact.php'
             
       RESPONSE_CODE_MESSAGES = {
         "100" => "Transaction was Approved", 
@@ -200,7 +200,7 @@ module ActiveMerchant #:nodoc:
       def commit(trx_type, money, post)
         post[:amount] = amount(money)
         
-        response = parse( ssl_post(URL, post_data(trx_type, post)) )
+        response = parse( ssl_post(self.live_url, post_data(trx_type, post)) )
                          
         Response.new(response[:response].to_i == SUCCESS, message_from(response), response,
           :test => test?,

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

@@ -4,10 +4,10 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class WirecardGateway < Gateway
       # Test server location
-      TEST_URL = 'https://c3-test.wirecard.com/secure/ssl-gateway'
+      self.test_url = 'https://c3-test.wirecard.com/secure/ssl-gateway'
 
       # Live server location
-      LIVE_URL = 'https://c3.wirecard.com/secure/ssl-gateway'
+      self.live_url = 'https://c3.wirecard.com/secure/ssl-gateway'
 
       # The Namespaces are not really needed, because it just tells the System, that there's actually no namespace used.
       # It's just specified here for completeness.
@@ -109,11 +109,11 @@ module ActiveMerchant #:nodoc:
         headers = { 'Content-Type' => 'text/xml',
                     'Authorization' => encoded_credentials }
 
-        response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, request, headers))
+        response = parse(ssl_post(test? ? self.test_url : self.live_url, request, headers))
         # Pending Status also means Acknowledged (as stated in their specification)
         success = response[:FunctionResult] == "ACK" || response[:FunctionResult] == "PENDING"
         message = response[:Message]
-        authorization = (success && action == :authorization) ? response[:GuWID] : nil
+        authorization = response[:GuWID]
 
         Response.new(success, message, response,
           :test => test?,

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

@@ -1,13 +1,13 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class WorldpayGateway < Gateway
-      TEST_URL = 'https://secure-test.wp3.rbsworldpay.com/jsp/merchant/xml/paymentService.jsp'
-      LIVE_URL = 'https://secure.wp3.rbsworldpay.com/jsp/merchant/xml/paymentService.jsp'
+      self.test_url = 'https://secure-test.worldpay.com/jsp/merchant/xml/paymentService.jsp'
+      self.live_url = 'https://secure.worldpay.com/jsp/merchant/xml/paymentService.jsp'
 
       self.default_currency = 'GBP'
       self.money_format = :cents
       self.supported_countries = ['HK', 'US', 'GB', 'AU']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :maestro]
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :maestro, :laser]
       self.homepage_url = 'http://www.worldpay.com/'
       self.display_name = 'WorldPay'
 
@@ -33,34 +33,54 @@ module ActiveMerchant #:nodoc:
 
       def authorize(money, payment_method, options = {})
         requires!(options, :order_id)
-        commit 'authorize', build_authorization_request(money, payment_method, options)
+        authorize_request(money, payment_method, options)
       end
 
       def capture(money, authorization, options = {})
         MultiResponse.new.tap do |r|
-          r.process{inquire(authorization, options)} unless options[:authorization_validated]
-          r.process{commit('capture', build_capture_request(money, authorization, options))}
+          r.process{inquire_request(authorization, options, "AUTHORISED")} unless options[:authorization_validated]
+          r.process{capture_request(money, authorization, options)}
         end
       end
 
       def void(authorization, options = {})
         MultiResponse.new.tap do |r|
-          r.process{inquire(authorization, options)}
-          r.process{commit('cancel', build_void_request(authorization, options))}
+          r.process{inquire_request(authorization, options, "AUTHORISED")}
+          r.process{cancel_request(authorization, options)}
         end
       end
 
       def refund(money, authorization, options = {})
         MultiResponse.new.tap do |r|
-          r.process{inquire(authorization, options)}
-          r.process{commit('refund', build_refund_request(money, authorization, options))}
+          r.process{inquire_request(authorization, options, "CAPTURED")}
+          r.process{refund_request(money, authorization, options)}
         end
       end
 
+      def test?
+        @options[:test] || super  
+      end
+
       private
 
-      def inquire(authorization, options={})
-        commit('inquiry', build_order_inquiry_request(authorization, options))
+      def authorize_request(money, payment_method, options)
+        commit('authorize', build_authorization_request(money, payment_method, options), "AUTHORISED")
+      end
+
+      def capture_request(money, authorization, options)
+        commit('capture', build_capture_request(money, authorization, options), :ok)
+      end
+
+      def cancel_request(authorization, options)
+        commit('cancel', build_void_request(authorization, options), :ok)
+      end
+
+      def inquire_request(authorization, options, success_criteria)
+        commit('inquiry', build_order_inquiry_request(authorization, options), success_criteria)
+      end
+
+      def refund_request(money, authorization, options)
+        commit('inquiry', build_refund_request(money, authorization, options), :ok)
       end
 
       def build_request
@@ -204,8 +224,8 @@ module ActiveMerchant #:nodoc:
         raw
       end
 
-      def commit(action, request)
-        xmr = ssl_post((test? ? TEST_URL : LIVE_URL),
+      def commit(action, request, success_criteria)
+        xmr = ssl_post((test? ? self.test_url : self.live_url),
           request,
           'Content-Type' => 'text/xml',
           'Authorization' => encoded_credentials)
@@ -213,12 +233,11 @@ module ActiveMerchant #:nodoc:
         raw = parse(action, xmr)
 
         Response.new(
-          success_from(raw),
+          success_from(raw, success_criteria),
           message_from(raw),
           raw,
           :authorization => authorization_from(raw),
           :test => test?)
-
       rescue ActiveMerchant::ResponseError => e
         if e.response.code.to_s == "401"
           return Response.new(false, "Invalid credentials", {}, :test => test?)
@@ -227,8 +246,8 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def success_from(raw)
-        (raw[:last_event] == "AUTHORISED" ||
+      def success_from(raw, success_criteria)
+        (raw[:last_event] == success_criteria ||
           raw[:ok].present?)
       end