activemerchant 1.28.0 → 1.29.0

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

@@ -68,7 +68,7 @@ module ActiveMerchant #:nodoc:
 
         requires!(options, :merchant_id, :user, :password, :merchant, :version)
 
-        @options = options
+        super
       end
 
       def authorize(money, creditcard, options = {})
@@ -101,10 +101,6 @@ module ActiveMerchant #:nodoc:
         build_response(:registerToken, @litle.register_token_request(to_pass), %w(801 802))
       end
 
-      def test?
-        super || @options[:test]
-      end
-
       private
 
       CARD_TYPE = {

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

@@ -1,157 +1,155 @@
 module ActiveMerchant #:nodoc:
-	module Billing #:nodoc:
-		class MerchantESolutionsGateway < Gateway
-
-			self.test_url = 'https://cert.merchante-solutions.com/mes-api/tridentApi'
-			self.live_url = 'https://api.merchante-solutions.com/mes-api/tridentApi'
-      
-			# The countries the gateway supports merchants from as 2 digit ISO country codes
-			self.supported_countries = ['US']
-      
-			# The card types supported by the payment gateway
-			self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb]
-      
-			# The homepage URL of the gateway
-			self.homepage_url = 'http://www.merchante-solutions.com/'
-      
-			# The name of the gateway
-			self.display_name = 'Merchant e-Solutions'
-      
-			def initialize(options = {})
-				requires!(options, :login, :password)
-				@options = options
-				super
-			end  
-      
-			def authorize(money, creditcard_or_card_id, options = {})
-				post = {}
-				add_invoice(post, options)
-				add_payment_source(post, creditcard_or_card_id, options)        
-				add_address(post, options)        
-				commit('P', money, post)
-			end
-
-			def purchase(money, creditcard_or_card_id, options = {})
-				post = {}
-				add_invoice(post, options)
-				add_payment_source(post, creditcard_or_card_id, options)        
-				add_address(post, options)   
-				commit('D', money, post)
-			end                       
-    
-			def capture(money, transaction_id, options = {})
-				post ={}
-				post[:transaction_id] = transaction_id
-				commit('S', money, post)
-			end
-	  
-			def store(creditcard, options = {})
-				post = {}
-				add_creditcard(post, creditcard, options) 
-				commit('T', nil, post)
-			end
-
-			def unstore(card_id)
-				post = {}
-				post[:card_id] = card_id
-				commit('X', nil, post)
-			end
-
-			def refund(money, identification, options = {})
-				commit('U', money, options.merge(:transaction_id => identification))
-			end
-
-			def credit(money, creditcard_or_card_id, options = {})
-				post = {}
-				add_payment_source(post, creditcard_or_card_id, options)
-				commit('C', money, post)
-			end
-
-			def void(transaction_id, options = {})
-				commit('V', nil, options.merge(:transaction_id => transaction_id))
-			end
-
-			private
-
-			def add_address(post, options)
-				if address = options[:billing_address] || options[:address]
-					post[:cardholder_street_address] = address[:address1].to_s.gsub(/[^\w.]/, '+')
-					post[:cardholder_zip] = address[:zip].to_s       
-				end
-			end
-
-			def add_invoice(post, options)
-				if options.has_key? :order_id
-					post[:invoice_number] = options[:order_id].to_s.gsub(/[^\w.]/, '')
-				end
-			end
-	  
-			def add_payment_source(post, creditcard_or_card_id, options) 
-				if creditcard_or_card_id.is_a?(String)  
-					# using stored card
-					post[:card_id] = creditcard_or_card_id
-					post[:card_exp_date] = options[:expiration_date] if options[:expiration_date]
-				else
-					# card info is provided
-					add_creditcard(post, creditcard_or_card_id, options)
-				end
-			end
-      
-			def add_creditcard(post, creditcard, options)  
-				post[:card_number]  = creditcard.number
-				post[:cvv2] = creditcard.verification_value if creditcard.verification_value?
-				post[:card_exp_date]  = expdate(creditcard)
-			end
-      
-			def parse(body)
-				results = {}
-				body.split(/&/).each do |pair|
-					key,val = pair.split(/=/)
-					results[key] = val
-				end
-				results
-			end        
-      
-			def commit(action, money, parameters)
-	  
-				url = test? ? self.test_url : self.live_url
-				parameters[:transaction_amount]  = amount(money) if money unless action == 'V'
-		
-				response = parse( ssl_post(url, post_data(action,parameters)) )
-
-				Response.new(response["error_code"] == "000", message_from(response), response, 
-					:authorization => response["transaction_id"],
-					:test => test?,
-					:cvv_result => response["cvv2_result"],
-					:avs_result => { :code => response["avs_result"] }
-				)
-
-			end
-	  
-			def expdate(creditcard)
-				year  = sprintf("%.4i", creditcard.year)
-				month = sprintf("%.2i", creditcard.month)
-				"#{month}#{year[-2..-1]}"
-			end
-
-			def message_from(response)
-				if response["error_code"] == "000"
-					"This transaction has been approved"
-				else
-					response["auth_response_text"]
-				end
-			end
-      
-			def post_data(action, parameters = {})
-				post = {}
-				post[:profile_id] = @options[:login]
-				post[:profile_key] = @options[:password]
-				post[:transaction_type] = action if action
-
-				request = post.merge(parameters).map {|key,value| "#{key}=#{CGI.escape(value.to_s)}"}.join("&")
-				request
-			end
-		end
-	end
+  module Billing #:nodoc:
+    class MerchantESolutionsGateway < Gateway
+      self.test_url = 'https://cert.merchante-solutions.com/mes-api/tridentApi'
+      self.live_url = 'https://api.merchante-solutions.com/mes-api/tridentApi'
+
+      # The countries the gateway supports merchants from as 2 digit ISO country codes
+      self.supported_countries = ['US']
+
+      # The card types supported by the payment gateway
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb]
+
+      # The homepage URL of the gateway
+      self.homepage_url = 'http://www.merchante-solutions.com/'
+
+      # The name of the gateway
+      self.display_name = 'Merchant e-Solutions'
+
+      def initialize(options = {})
+        requires!(options, :login, :password)
+        super
+      end
+
+      def authorize(money, creditcard_or_card_id, options = {})
+        post = {}
+        add_invoice(post, options)
+        add_payment_source(post, creditcard_or_card_id, options)
+        add_address(post, options)
+        commit('P', money, post)
+      end
+
+      def purchase(money, creditcard_or_card_id, options = {})
+        post = {}
+        add_invoice(post, options)
+        add_payment_source(post, creditcard_or_card_id, options)
+        add_address(post, options)
+        commit('D', money, post)
+      end
+
+      def capture(money, transaction_id, options = {})
+        post ={}
+        post[:transaction_id] = transaction_id
+        commit('S', money, post)
+      end
+
+      def store(creditcard, options = {})
+        post = {}
+        add_creditcard(post, creditcard, options)
+        commit('T', nil, post)
+      end
+
+      def unstore(card_id)
+        post = {}
+        post[:card_id] = card_id
+        commit('X', nil, post)
+      end
+
+      def refund(money, identification, options = {})
+        commit('U', money, options.merge(:transaction_id => identification))
+      end
+
+      def credit(money, creditcard_or_card_id, options = {})
+        post = {}
+        add_payment_source(post, creditcard_or_card_id, options)
+        commit('C', money, post)
+      end
+
+      def void(transaction_id, options = {})
+        commit('V', nil, options.merge(:transaction_id => transaction_id))
+      end
+
+      private
+
+      def add_address(post, options)
+        if address = options[:billing_address] || options[:address]
+          post[:cardholder_street_address] = address[:address1].to_s.gsub(/[^\w.]/, '+')
+          post[:cardholder_zip] = address[:zip].to_s
+        end
+      end
+
+      def add_invoice(post, options)
+        if options.has_key? :order_id
+          post[:invoice_number] = options[:order_id].to_s.gsub(/[^\w.]/, '')
+        end
+      end
+
+      def add_payment_source(post, creditcard_or_card_id, options)
+        if creditcard_or_card_id.is_a?(String)
+          # using stored card
+          post[:card_id] = creditcard_or_card_id
+          post[:card_exp_date] = options[:expiration_date] if options[:expiration_date]
+        else
+          # card info is provided
+          add_creditcard(post, creditcard_or_card_id, options)
+        end
+      end
+
+      def add_creditcard(post, creditcard, options)
+        post[:card_number]  = creditcard.number
+        post[:cvv2] = creditcard.verification_value if creditcard.verification_value?
+        post[:card_exp_date]  = expdate(creditcard)
+      end
+
+      def parse(body)
+        results = {}
+        body.split(/&/).each do |pair|
+          key,val = pair.split(/=/)
+          results[key] = val
+        end
+        results
+      end
+
+      def commit(action, money, parameters)
+
+        url = test? ? self.test_url : self.live_url
+        parameters[:transaction_amount]  = amount(money) if money unless action == 'V'
+
+        response = parse( ssl_post(url, post_data(action,parameters)) )
+
+        Response.new(response["error_code"] == "000", message_from(response), response,
+          :authorization => response["transaction_id"],
+          :test => test?,
+          :cvv_result => response["cvv2_result"],
+          :avs_result => { :code => response["avs_result"] }
+        )
+
+      end
+
+      def expdate(creditcard)
+        year  = sprintf("%.4i", creditcard.year)
+        month = sprintf("%.2i", creditcard.month)
+        "#{month}#{year[-2..-1]}"
+      end
+
+      def message_from(response)
+        if response["error_code"] == "000"
+          "This transaction has been approved"
+        else
+          response["auth_response_text"]
+        end
+      end
+
+      def post_data(action, parameters = {})
+        post = {}
+        post[:profile_id] = @options[:login]
+        post[:profile_key] = @options[:password]
+        post[:transaction_type] = action if action
+
+        request = post.merge(parameters).map {|key,value| "#{key}=#{CGI.escape(value.to_s)}"}.join("&")
+        request
+      end
+    end
+  end
 end
-	
+

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

@@ -2,18 +2,18 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class MerchantWareGateway < Gateway
       self.live_url = self.test_url = 'https://ps1.merchantware.net/MerchantWARE/ws/RetailTransaction/TXRetail.asmx'
-      
+
       self.supported_countries = ['US']
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
       self.homepage_url = 'http://merchantwarehouse.com/merchantware'
       self.display_name = 'MerchantWARE'
-      
+
       ENV_NAMESPACES = { "xmlns:xsi"  => "http://www.w3.org/2001/XMLSchema-instance",
                          "xmlns:xsd"  => "http://www.w3.org/2001/XMLSchema",
                          "xmlns:env" => "http://schemas.xmlsoap.org/soap/envelope/"
                        }
       TX_NAMESPACE = "http://merchantwarehouse.com/MerchantWARE/Client/TransactionRetail"
-      
+
       ACTIONS = {
         :purchase  => "IssueKeyedSale",
         :authorize => "IssueKeyedPreAuth",
@@ -22,12 +22,12 @@ module ActiveMerchant #:nodoc:
         :credit    => "IssueKeyedRefund",
         :reference_credit => "IssueRefundByReference"
       }
-      
+
       # Creates a new MerchantWareGateway
-      # 
+      #
       # The gateway requires that a valid login, password, and name be passed
       # in the +options+ hash.
-      # 
+      #
       # ==== Options
       #
       # * <tt>:login</tt> - The MerchantWARE SiteID.
@@ -35,25 +35,24 @@ module ActiveMerchant #:nodoc:
       # * <tt>:name</tt> - The MerchantWARE Name.
       def initialize(options = {})
         requires!(options, :login, :password, :name)
-        @options = options
         super
       end
 
       # Authorize a credit card for a given amount.
-      # 
+      #
       # ==== Parameters
       # * <tt>money</tt> - The amount to be authorized as an Integer value in cents.
       # * <tt>credit_card</tt> - The CreditCard details for the transaction.
       # * <tt>options</tt>
       #   * <tt>:order_id</tt> - A unique reference for this order (required).
-      #   * <tt>:billing_address</tt> - The billing address for the cardholder.      
+      #   * <tt>:billing_address</tt> - The billing address for the cardholder.
       def authorize(money, credit_card, options = {})
         request = build_purchase_request(:authorize, money, credit_card, options)
         commit(:authorize, request)
       end
-      
+
       # Authorize and immediately capture funds from a credit card.
-      # 
+      #
       # ==== Parameters
       # * <tt>money</tt> - The amount to be authorized as anInteger value in cents.
       # * <tt>credit_card</tt> - The CreditCard details for the transaction.
@@ -63,10 +62,10 @@ module ActiveMerchant #:nodoc:
       def purchase(money, credit_card, options = {})
         request = build_purchase_request(:purchase, money, credit_card, options)
         commit(:purchase, request)
-      end                       
+      end
 
       # Capture authorized funds from a credit card.
-      # 
+      #
       # ==== Parameters
       # * <tt>money</tt> - The amount to be captured as anInteger value in cents.
       # * <tt>authorization</tt> - The authorization string returned from the initial authorization.
@@ -76,20 +75,20 @@ module ActiveMerchant #:nodoc:
       end
 
       # Void a transaction.
-      # 
+      #
       # ==== Parameters
       # * <tt>authorization</tt> - The authorization string returned from the initial authorization or purchase.
       def void(authorization, options = {})
         reference, options[:order_id] = split_reference(authorization)
-        
+
         request = soap_request(:void) do |xml|
           add_reference(xml, reference)
         end
         commit(:void, request)
       end
-      
+
       # Refund an amount back a cardholder
-      # 
+      #
       # ==== Parameters
       #
       # * <tt>money</tt> - The amount to be refunded as an Integer value in cents.
@@ -97,7 +96,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>options</tt>
       #   * <tt>:order_id</tt> - A unique reference for this order (required when performing a non-referenced credit)
       def credit(money, identification, options = {})
-        if identification.is_a?(String)          
+        if identification.is_a?(String)
           deprecated CREDIT_DEPRECATION_MESSAGE
           refund(money, identification, options)
         else
@@ -109,9 +108,9 @@ module ActiveMerchant #:nodoc:
         perform_reference_credit(money, reference, options)
       end
 
-    
+
       private
-      
+
       def soap_request(action)
         xml = Builder::XmlMarkup.new :indent => 2
         xml.instruct!
@@ -125,10 +124,10 @@ module ActiveMerchant #:nodoc:
         end
         xml.target!
       end
-      
+
       def build_purchase_request(action, money, credit_card, options)
         requires!(options, :order_id)
-        
+
         request = soap_request(action) do |xml|
           add_invoice(xml, options)
           add_amount(xml, money)
@@ -136,17 +135,17 @@ module ActiveMerchant #:nodoc:
           add_address(xml, options)
         end
       end
-      
+
       def build_capture_request(action, money, identification, options)
         reference, options[:order_id] = split_reference(identification)
-        
+
         request = soap_request(action) do |xml|
           add_reference(xml, reference)
           add_invoice(xml, options)
           add_amount(xml, money)
         end
       end
-      
+
       def perform_reference_credit(money, identification, options)
         reference, options[:order_id] = split_reference(identification)
 
@@ -155,19 +154,19 @@ module ActiveMerchant #:nodoc:
           add_invoice(xml, options)
           add_amount(xml, money, "strOverrideAmount")
         end
-        
+
         commit(:reference_credit, request)
       end
-      
+
       def perform_credit(money, credit_card, options)
         requires!(options, :order_id)
-        
+
         request = soap_request(:credit) do |xml|
           add_invoice(xml, options)
           add_amount(xml, money)
           add_credit_card(xml, credit_card)
         end
-        
+
         commit(:credit, request)
       end
 
@@ -176,18 +175,18 @@ module ActiveMerchant #:nodoc:
         xml.tag! "strKey", @options[:password]
         xml.tag! "strName", @options[:name]
       end
-      
+
       def expdate(credit_card)
         year  = sprintf("%.4i", credit_card.year)
         month = sprintf("%.2i", credit_card.month)
 
         "#{month}#{year[-2..-1]}"
       end
-      
+
       def add_invoice(xml, options)
         xml.tag! "strOrderNumber", options[:order_id].to_s.gsub(/[^\w]/, '').slice(0, 25)
       end
-      
+
       def add_amount(xml, money, tag = "strAmount")
         xml.tag! tag, amount(money)
       end
@@ -195,48 +194,48 @@ module ActiveMerchant #:nodoc:
       def add_reference(xml, reference)
         xml.tag! "strReferenceCode", reference
       end
-      
+
       def add_address(xml, options)
         if address = options[:billing_address] || options[:address]
           xml.tag! "strAVSStreetAddress", address[:address1]
           xml.tag! "strAVSZipCode", address[:zip]
         end
       end
-      
+
       def add_credit_card(xml, credit_card)
         xml.tag! "strPAN", credit_card.number
         xml.tag! "strExpDate", expdate(credit_card)
         xml.tag! "strCardHolder", credit_card.name
         xml.tag! "strCVCode", credit_card.verification_value if credit_card.verification_value?
       end
-      
+
       def split_reference(reference)
         reference.to_s.split(";")
       end
-      
+
       def parse(action, data)
         response = {}
         xml = REXML::Document.new(data)
-      
+
         root = REXML::XPath.first(xml, "//#{ACTIONS[action]}Response/#{ACTIONS[action]}Result")
 
         root.elements.each do |element|
           response[element.name] = element.text
         end
-        
+
         status, code, message = response["ApprovalStatus"].split(";")
         response[:status] = status
-        
-        if response[:success] = status == "APPROVED"          
+
+        if response[:success] = status == "APPROVED"
           response[:message] = status
         else
           response[:message] = message
           response[:failure_code] = code
         end
 
-        response        
+        response
       end
-      
+
       def parse_error(http_response)
         response = {}
         response[:http_code] = http_response.code
@@ -246,11 +245,11 @@ module ActiveMerchant #:nodoc:
         document = REXML::Document.new(http_response.body)
 
         node     = REXML::XPath.first(document, "//soap:Fault")
-        
+
         node.elements.each do |element|
           response[element.name] = element.text
         end
-        
+
         response[:message] = response["faultstring"].to_s.gsub("\n", " ")
         response
       rescue REXML::ParseException => e
@@ -258,10 +257,10 @@ module ActiveMerchant #:nodoc:
         response[:message]          = "Failed to parse the failed response"
         response
       end
-            
+
       def commit(action, request)
         begin
-          data = ssl_post(self.live_url, request, 
+          data = ssl_post(self.live_url, request,
                    "Content-Type" => 'text/xml; charset=utf-8',
                    "SOAPAction"   => "http://merchantwarehouse.com/MerchantWARE/Client/TransactionRetail/#{ACTIONS[action]}"
                  )
@@ -269,15 +268,15 @@ module ActiveMerchant #:nodoc:
         rescue ActiveMerchant::ResponseError => e
           response = parse_error(e.response)
         end
-        
-        Response.new(response[:success], response[:message], response, 
-          :test => test?, 
+
+        Response.new(response[:success], response[:message], response,
+          :test => test?,
           :authorization => authorization_from(response),
           :avs_result => { :code => response["AVSResponse"] },
           :cvv_result => response["CVResponse"]
         )
       end
-      
+
       def authorization_from(response)
         if response[:success]
           [ response["ReferenceID"], response["OrderNumber"] ].join(";")