activemerchant 1.28.0 → 1.29.0

data/lib/active_merchant/billing/gateways/ideal/ideal_base.rb

@@ -19,14 +19,10 @@ module ActiveMerchant #:nodoc:
       SUB_ID = '0'
       API_VERSION = '1.1.0'
 
-      attr_reader :url
-
       def initialize(options = {})
         requires!(options, :login, :password, :pem)
-        @options = options
 
-        @options[:pem_password] = options[:password]
-        @url = test? ? test_url : live_url
+        options[:pem_password] = options[:password]
         super
       end
 
@@ -49,11 +45,12 @@ module ActiveMerchant #:nodoc:
         commit(build_directory_request)
       end
 
-      def test?
-        @options[:test] || Base.gateway_mode == :test
+      private
+
+      def url
+        (test? ? test_url : live_url)
       end
 
-      private
       def token
         if @token.nil?
           @token = create_fingerprint(@options[:pem])

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

@@ -3,16 +3,17 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class InspireGateway < Gateway
       self.live_url = self.test_url = 'https://secure.inspiregateway.net/api/transact.php'
-    
+
       self.supported_countries = ['US']
       self.supported_cardtypes = [:visa, :master, :american_express]
       self.homepage_url = 'http://www.inspiregateway.com'
       self.display_name = 'Inspire Commerce'
-      # Creates a new InspireGateway 
-      # 
+
+      # Creates a new InspireGateway
+      #
       # The gateway requires that a valid login and password be passed
       # in the +options+ hash.
-      # 
+      #
       # ==== Options
       #
       # * <tt>:login</tt> -- The Inspire Username.
@@ -20,48 +21,47 @@ module ActiveMerchant #:nodoc:
       # See the Inspire Integration Guide for details. (default: +false+)
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
-      end  
-      
-      # Pass :store => true in the options to store the 
-      # payment info at Inspire Gateway and get a generated 
-      # customer_vault_id in the response.  
+      end
+
+      # Pass :store => true in the options to store the
+      # payment info at Inspire Gateway and get a generated
+      # customer_vault_id in the response.
       # Pass :store => some_number_or_string to specify the
       # customer_vault_id InspireGateway should use (make sure it's
       # unique).
       def authorize(money, creditcard, options = {})
         post = {}
         add_invoice(post, options)
-        add_payment_source(post, creditcard,options)        
-        add_address(post, creditcard, options)        
+        add_payment_source(post, creditcard,options)
+        add_address(post, creditcard, options)
         add_customer_data(post, options)
-        
+
         commit('auth', money, post)
       end
-      
+
       def purchase(money, payment_source, options = {})
         post = {}
         add_invoice(post, options)
-        add_payment_source(post, payment_source, options)        
-        add_address(post, payment_source, options)   
+        add_payment_source(post, payment_source, options)
+        add_address(post, payment_source, options)
         add_customer_data(post, options)
-             
+
         commit('sale', money, post)
-      end                       
-    
+      end
+
       def capture(money, authorization, options = {})
         post ={}
         post[:transactionid] = authorization
         commit('capture', money, post)
       end
-      
+
       def void(authorization, options = {})
         post ={}
         post[:transactionid] = authorization
         commit('void', nil, post)
       end
-      
+
       # Update the values (such as CC expiration) stored at
       # InspireGateway.  The CC number must be supplied in the
       # CreditCard object.
@@ -69,30 +69,30 @@ module ActiveMerchant #:nodoc:
         post = {}
         post[:customer_vault] = "update_customer"
         add_customer_vault_id(post, vault_id)
-        add_creditcard(post, creditcard, options)        
-        add_address(post, creditcard, options)   
+        add_creditcard(post, creditcard, options)
+        add_address(post, creditcard, options)
         add_customer_data(post, options)
-             
+
         commit(nil, nil, post)
       end
-    
+
       def delete(vault_id)
         post = {}
         post[:customer_vault] = "delete_customer"
-        add_customer_vault_id(post, vault_id)         
+        add_customer_vault_id(post, vault_id)
         commit(nil, nil, post)
       end
-    
+
       # To match the other stored-value gateways, like TrustCommerce,
       # store and unstore need to be defined
       def store(creditcard, options = {})
         billing_id = options.delete(:billing_id).to_s || true
         authorize(100, creditcard, options.merge(:store => billing_id))
       end
-      
+
       alias_method :unstore, :delete
 
-      private                             
+      private
       def add_customer_data(post, options)
         if options.has_key? :email
           post[:email] = options[:email]
@@ -100,27 +100,27 @@ module ActiveMerchant #:nodoc:
 
         if options.has_key? :ip
           post[:ipaddress] = options[:ip]
-        end        
+        end
       end
 
-      def add_address(post, creditcard, options)     
+      def add_address(post, creditcard, options)
         if address = options[:billing_address] || options[:address]
           post[:address1]    = address[:address1].to_s
           post[:address2]    = address[:address2].to_s unless address[:address2].blank?
           post[:company]    = address[:company].to_s
           post[:phone]      = address[:phone].to_s
-          post[:zip]        = address[:zip].to_s       
+          post[:zip]        = address[:zip].to_s
           post[:city]       = address[:city].to_s
           post[:country]    = address[:country].to_s
           post[:state]      = address[:state].blank?  ? 'n/a' : address[:state]
-        end         
+        end
       end
 
       def add_invoice(post, options)
         post[:orderid] = options[:order_id].to_s.gsub(/[^\w.]/, '')
         post[:orderdescription] = options[:description]
       end
-      
+
       def add_payment_source(params, source, options={})
         case determine_funding_source(source)
         when :vault       then add_customer_vault_id(params, source)
@@ -128,13 +128,13 @@ module ActiveMerchant #:nodoc:
         when :check       then add_check(params, source)
         end
       end
-      
+
       def add_customer_vault_id(params,vault_id)
         params[:customer_vault_id] = vault_id
       end
-      
+
       def add_creditcard(post, creditcard,options)
-        if options[:store]  
+        if options[:store]
           post[:customer_vault] = "add_customer"
           post[:customer_vault_id] = options[:store] unless options[:store] == true
         end
@@ -142,9 +142,9 @@ module ActiveMerchant #:nodoc:
         post[:cvv] = creditcard.verification_value if creditcard.verification_value?
         post[:ccexp]  = expdate(creditcard)
         post[:firstname] = creditcard.first_name
-        post[:lastname]  = creditcard.last_name   
+        post[:lastname]  = creditcard.last_name
       end
-      
+
       def add_check(post, check)
         post[:payment] = 'check' # Set transaction to ACH
         post[:checkname] = check.name # The name on the customer's Checking Account
@@ -153,38 +153,38 @@ module ActiveMerchant #:nodoc:
         post[:account_holder_type] = check.account_holder_type # The customer's type of ACH account
         post[:account_type] = check.account_type # The customer's type of ACH account
       end
-      
+
       def parse(body)
         results = {}
         body.split(/&/).each do |pair|
           key,val = pair.split(/=/)
           results[key] = val
         end
-        
+
         results
-      end     
-      
+      end
+
       def commit(action, money, parameters)
         parameters[:amount]  = amount(money) if money
-        
+
         response = parse( ssl_post(self.live_url, post_data(action,parameters)) )
 
-        Response.new(response["response"] == "1", message_from(response), response, 
+        Response.new(response["response"] == "1", message_from(response), response,
           :authorization => response["transactionid"],
           :test => test?,
           :cvv_result => response["cvvresponse"],
           :avs_result => { :code => response["avsresponse"] }
         )
-        
+
       end
-      
+
       def expdate(creditcard)
         year  = sprintf("%.4i", creditcard.year)
         month = sprintf("%.2i", creditcard.month)
 
         "#{month}#{year[-2..-1]}"
       end
-      
+
 
       def message_from(response)
         case response["responsetext"]
@@ -196,7 +196,7 @@ module ActiveMerchant #:nodoc:
           response["responsetext"]
         end
       end
-      
+
       def post_data(action, parameters = {})
         post = {}
         post[:username]      = @options[:login]
@@ -204,11 +204,11 @@ module ActiveMerchant #:nodoc:
         post[:type]       = action if action
 
         request = post.merge(parameters).map {|key,value| "#{key}=#{CGI.escape(value.to_s)}"}.join("&")
-        request        
+        request
       end
-      
+
       def determine_funding_source(source)
-        case 
+        case
         when source.is_a?(String) then :vault
         when CreditCard.card_companies.keys.include?(card_brand(source)) then :credit_card
         when card_brand(source) == 'check' then :check

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

@@ -15,13 +15,12 @@ module ActiveMerchant #:nodoc:
 
       # The name of the gateway
       self.display_name = 'InstaPay'
-      
+
       SUCCESS         = "Accepted"
       SUCCESS_MESSAGE = "The transaction has been approved"
 
       def initialize(options = {})
         requires!(options, :login)
-        @options = options
         super
       end
 
@@ -47,24 +46,24 @@ module ActiveMerchant #:nodoc:
 
         commit('ns_quicksale_cc', post)
       end
-      
+
       def capture(money, authorization, options = {})
         post = {}
         add_amount(post, money)
-        add_reference(post, authorization)        
+        add_reference(post, authorization)
         commit('ns_quicksale_cc', post)
       end
 
       private
-      
+
       def add_amount(post, money)
         post[:amount] = amount(money)
       end
-      
+
       def add_reference(post, reference)
         post[:postonly] = reference
       end
-        
+
       def add_customer_data(post, options)
         post[:ci_email]       = options[:email]
         post["ci_IP Address"] = options[:ip]
@@ -87,7 +86,7 @@ module ActiveMerchant #:nodoc:
           post[:ci_shipcity]    = address[:city]
           post[:ci_shipstate]   = address[:state]
           post[:ci_shipzip]     = address[:zip]
-          post[:ci_shipcountry] = address[:country]  
+          post[:ci_shipcountry] = address[:country]
         end
       end
 
@@ -108,10 +107,10 @@ module ActiveMerchant #:nodoc:
       def parse(body)
         results = {}
         fields = body.split("\r\n")
-        
-        response = fields[1].split('=')        
+
+        response = fields[1].split('=')
         response_data = response[1].split(':')
-        
+
         if response[0] == SUCCESS
           results[:success] = true
           results[:message] = SUCCESS_MESSAGE

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

@@ -3,27 +3,27 @@ module ActiveMerchant #:nodoc:
     # For more information on the Iridium Gateway please download the
     # documentation from their Merchant Management System.
     #
-    # The login and password are not the username and password you use to 
-    # login to the Iridium Merchant Management System. Instead, you will 
+    # The login and password are not the username and password you use to
+    # login to the Iridium Merchant Management System. Instead, you will
     # use the API username and password you were issued separately.
     class IridiumGateway < Gateway
-      self.live_url = self.test_url = 'https://gw1.iridiumcorp.net/'      
+      self.live_url = self.test_url = 'https://gw1.iridiumcorp.net/'
 
       # The countries the gateway supports merchants from as 2 digit ISO country codes
       self.supported_countries = ['GB', 'ES']
       self.default_currency = 'EUR'
       self.money_format = :cents
-      
+
       # The card types supported by the payment gateway
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
-      
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :maestro, :jcb, :solo, :diners_club]
+
       # The homepage URL of the gateway
       self.homepage_url = 'http://www.iridiumcorp.co.uk/'
-      
+
       # The name of the gateway
       self.display_name = 'Iridium'
-      
-      CURRENCY_CODES = { 
+
+      CURRENCY_CODES = {
         "AUD" => '036',
         "CAD" => '124',
         "EUR" => '978',
@@ -32,31 +32,30 @@ module ActiveMerchant #:nodoc:
         "NZD" => '554',
         "USD" => '840',
       }
-      
+
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
-      end  
-      
+      end
+
       def authorize(money, creditcard, options = {})
         commit(build_purchase_request('PREAUTH', money, creditcard, options), options)
       end
-      
+
       def purchase(money, payment_source, options = {})
         setup_address_hash(options)
-        
+
         if payment_source.respond_to?(:number)
           commit(build_purchase_request('SALE', money, payment_source, options), options)
         else
           commit(build_reference_request('SALE', money, payment_source, options), options)
         end
-      end                       
-    
+      end
+
       def capture(money, authorization, options = {})
         commit(build_reference_request('COLLECTION', money, authorization, options), options)
       end
-      
+
       def credit(money, authorization, options={})
         deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, authorization, options)
@@ -65,12 +64,12 @@ module ActiveMerchant #:nodoc:
       def refund(money, authorization, options={})
         commit(build_reference_request('REFUND', money, authorization, options), options)
       end
-      
+
       def void(authorization, options={})
         commit(build_reference_request('VOID', nil, authorization, options), options)
       end
-      
-      private                       
+
+      private
 
       def build_purchase_request(type, money, creditcard, options)
         options.merge!(:action => 'CardDetailsTransaction')
@@ -80,7 +79,7 @@ module ActiveMerchant #:nodoc:
           add_customerdetails(xml, creditcard, options[:billing_address], options)
         end
       end
-      
+
       def build_reference_request(type, money, authorization, options)
         options.merge!(:action => 'CrossReferenceTransaction')
         order_id, cross_reference, auth_id = authorization.split(";")
@@ -96,13 +95,13 @@ module ActiveMerchant #:nodoc:
           end
         end
       end
-      
+
       def build_request(options)
         requires!(options, :action)
         xml = Builder::XmlMarkup.new :indent => 2
         xml.instruct!(:xml, :version => '1.0', :encoding => 'utf-8')
-        xml.tag! 'soap:Envelope', { 'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/', 
-                                    'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 
+        xml.tag! 'soap:Envelope', { 'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/',
+                                    'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
                                     'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema'} do
           xml.tag! 'soap:Body' do
             xml.tag! options[:action], {'xmlns' => "https://www.thepaymentgateway.net/"} do
@@ -120,7 +119,7 @@ module ActiveMerchant #:nodoc:
         options[:billing_address] = options[:billing_address] || options[:address] || {}
         options[:shipping_address] = options[:shipping_address] || {}
       end
-      
+
       def add_purchase_data(xml, type, money, options)
         requires!(options, :order_id)
         xml.tag! 'TransactionDetails', {'Amount' => amount(money), 'CurrencyCode' => currency_code(options[:currency] || currency(money))} do
@@ -150,13 +149,13 @@ module ActiveMerchant #:nodoc:
             end
             xml.tag! 'PhoneNumber', address[:phone]
           end
-          
+
           xml.tag! 'EmailAddress', options[:email]
           xml.tag! 'CustomerIPAddress', options[:ip] || "127.0.0.1"
-        end   
+        end
       end
 
-      def add_creditcard(xml, creditcard)      
+      def add_creditcard(xml, creditcard)
         xml.tag! 'CardDetails' do
           xml.tag! 'CardName', creditcard.name
           xml.tag! 'CV2', creditcard.verification_value if creditcard.verification_value
@@ -164,7 +163,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'ExpiryDate', { 'Month' => creditcard.month.to_s.rjust(2, "0"), 'Year' => creditcard.year.to_s[/\d\d$/] }
         end
       end
-      
+
       def add_merchant_data(xml, options)
         xml.tag! 'MerchantAuthentication', {"MerchantID" => @options[:login], "Password" => @options[:password]}
       end
@@ -174,13 +173,13 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(test? ? self.test_url : self.live_url, request,
                               {"SOAPAction" => "https://www.thepaymentgateway.net/#{options[:action]}",
                                "Content-Type" => "text/xml; charset=utf-8" }))
-  
+
         success = response[:transaction_result][:status_code] == "0"
         message = response[:transaction_result][:message]
         authorization = success ? [ options[:order_id], response[:transaction_output_data][:cross_reference], response[:transaction_output_data][:auth_code] ].compact.join(";") : nil
-        
-        Response.new(success, message, response, 
-          :test => test?, 
+
+        Response.new(success, message, response,
+          :test => test?,
           :authorization => authorization)
       end
 
@@ -190,19 +189,19 @@ module ActiveMerchant #:nodoc:
         if (root = REXML::XPath.first(xml, "//CardDetailsTransactionResponse")) or
               (root = REXML::XPath.first(xml, "//CrossReferenceTransactionResponse"))
           root.elements.to_a.each do |node|
-            case node.name  
+            case node.name
             when 'Message'
               reply[:message] = reply(node.text)
             else
               parse_element(reply, node)
             end
           end
-        elsif root = REXML::XPath.first(xml, "//soap:Fault") 
+        elsif root = REXML::XPath.first(xml, "//soap:Fault")
           parse_element(reply, root)
           reply[:message] = "#{reply[:faultcode]}: #{reply[:faultstring]}"
         end
         reply
-      end     
+      end
 
       def parse_element(reply, node)
         case node.name
@@ -236,7 +235,7 @@ module ActiveMerchant #:nodoc:
           k = node.name.underscore.to_sym
           if node.has_elements?
             reply[k] = {}
-            node.elements.each{|e| parse_element(reply[k], e) } 
+            node.elements.each{|e| parse_element(reply[k], e) }
           else
             if node.has_attributes?
               reply[k] = {}
@@ -248,7 +247,7 @@ module ActiveMerchant #:nodoc:
         end
         reply
       end
-      
+
       def currency_code(currency)
         CURRENCY_CODES[currency]
       end