activemerchant 1.7.3 → 1.8.0

data/CHANGELOG

@@ -1,5 +1,17 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.8.0 (September 24, 2010)
+
+* PayPal Express: Add support for billing agreements [Nathaniel Talbott]
+* Allow comparing countries [Nathaniel Talbott]
+* Iridium: Fix country handling [Nathaniel Talbott]
+* Iridium: Fix missing billing address [Nathaniel Talbott]
+* Iridium: Do not pass CV2 if not present [Nathaniel Talbott]
+* Add Iridium support [Phil Smy]
+* Add Netaxept support [Nathaniel Talbott]
+* PaymentExpress: Use Card Holder Help Text for the response message [Nathaniel Talbott]
+* Sort the country name list [Duff OMelia]
+
 == Version 1.7.3 (September 14, 2010)
 
 * Fix SagePay special handling for Japanese YEN currency to not send fractional amounts [Soleone]

data/CONTRIBUTORS

@@ -109,6 +109,10 @@ Instapay Gateway (May 3, 2009)
 
 * Thomas Rideout
 
+Iridium Gateway (June 13, 2009)
+
+* Phil Smy
+
 MerchantWARE (July 7, 2009)
 
 * Cody Fauser
@@ -133,6 +137,10 @@ SallieMae (October 2, 2009)
 
 * iamjwc
 
+Netaxept (February 08, 2010)
+
+* Nathaniel Talbott
+
 Garanti (May 05, 2010)
 
 * Selem Delul (moon@mac.home)

data/README.rdoc

@@ -21,10 +21,12 @@ The {ActiveMerchant Wiki}[http://github.com/Shopify/active_merchant/wikis] conta
 * {Efsnet}[http://www.concordefsnet.com/] - US
 * {eWAY}[http://www.eway.com.au/] - AU
 * {E-xact}[http://www.e-xact.com] - CA, US
+* {Iridium}[http://www.iridiumcorp.co.uk/] - UK, ES
 * {LinkPoint}[http://www.linkpoint.com/] - US
 * {Merchant e-Solutions}[http://merchante-solutions.com/] - US
 * {Modern Payments}[http://www.modpay.com] - US
 * {Moneris}[http://www.moneris.com/] - CA
+* {Netaxept}[http://www.betalingsterminal.no/Netthandel-forside] - NO, DK, SE, FI
 * {NetRegistry}[http://www.netregistry.com.au] - AU
 * {NELiX TransaX Gateway}[http://www.nelixtransax.com] - US
 * {NETbilling}[http://www.netbilling.com] - US
@@ -59,8 +61,8 @@ The {ActiveMerchant Wiki}[http://github.com/Shopify/active_merchant/wikis] conta
 == Supported Offsite Payment Gateways
 
 * {PayPal Website Payments Standard}[https://www.paypal.com/cgi-bin/webscr?cmd=_wp-standard-overview-outside]
-* Chronopay[http://www.chronopay.com]
-* Nochex[http://www.nochex.com]
+* {Chronopay}[http://www.chronopay.com]
+* {Nochex}[http://www.nochex.com]
 * {Banca Sella GestPay}[https://www.sella.it/banca/ecommerce/gestpay/gestpay.jsp]
 * {2 Checkout}[http://www.2checkout.com]
 * {HiTRUST}[http://www.hitrust.com.hk/]

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

@@ -0,0 +1,253 @@
+module ActiveMerchant #:nodoc:
+  module Billing #: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 
+    # use the API username and password you were issued separately.
+    class IridiumGateway < Gateway
+      TEST_URL = 'https://gw1.iridiumcorp.net/'
+      LIVE_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]
+      
+      # 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 = { 
+        "AUD" => '036',
+        "CAD" => '124',
+        "EUR" => '978',
+        "GBP" => '826',
+        "MXN" => '484',
+        "NZD" => '554',
+        "USD" => '840',
+      }
+      
+      def initialize(options = {})
+        requires!(options, :login, :password)
+        @options = options
+        super
+      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.is_a?(CreditCard)
+          commit(build_purchase_request('SALE', money, payment_source, options), options)
+        else
+          commit(build_reference_request('SALE', money, payment_source, options), options)
+        end
+      end                       
+    
+      def capture(money, authorization, options = {})
+        commit(build_reference_request('COLLECTION', money, authorization, options), options)
+      end
+      
+      def credit(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                       
+
+      def build_purchase_request(type, money, creditcard, options)
+        options.merge!(:action => 'CardDetailsTransaction')
+        build_request(options) do |xml|
+          add_purchase_data(xml, type, money, options)
+          add_creditcard(xml, creditcard)
+          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(";")
+        build_request(options) do |xml|
+          if money
+            details = {'CurrencyCode' => currency_code(options[:currency] || default_currency), 'Amount' => amount(money)}
+          else
+            details = {'CurrencyCode' => currency_code(default_currency), 'Amount' => '0'}
+          end
+          xml.tag! 'TransactionDetails', details do
+            xml.tag! 'MessageDetails', {'TransactionType' => type, 'CrossReference' => cross_reference}
+            xml.tag! 'OrderID', (options[:order_id] || order_id)
+          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', 
+                                    'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema'} do
+          xml.tag! 'soap:Body' do
+            xml.tag! options[:action], {'xmlns' => "https://www.thepaymentgateway.net/"} do
+              xml.tag! 'PaymentMessage' do
+                add_merchant_data(xml, options)
+                yield(xml)
+              end
+            end
+          end
+        end
+        xml.target!
+      end
+
+      def setup_address_hash(options)
+        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
+          xml.tag! 'MessageDetails', {'TransactionType' => type}
+          xml.tag! 'OrderID', options[:order_id]
+          xml.tag! 'TransactionControl' do
+            xml.tag! 'ThreeDSecureOverridePolicy', 'FALSE'
+            xml.tag! 'EchoAVSCheckResult', 'TRUE'
+            xml.tag! 'EchoCV2CheckResult', 'TRUE'
+          end
+        end
+      end
+
+      def add_customerdetails(xml, creditcard, address, options, shipTo = false)
+        xml.tag! 'CustomerDetails' do
+          if address
+            unless address[:country].blank?
+              country_code = Country.find(address[:country]).code(:numeric)
+            end
+            xml.tag! 'BillingAddress' do
+              xml.tag! 'Address1', address[:address1]
+              xml.tag! 'Address2', address[:address2]
+              xml.tag! 'City', address[:city]
+              xml.tag! 'State', address[:state]
+              xml.tag! 'PostCode', address[:zip]
+              xml.tag! 'CountryCode', country_code if country_code
+            end
+            xml.tag! 'PhoneNumber', address[:phone]
+          end
+          
+          xml.tag! 'EmailAddress', options[:email]
+          xml.tag! 'CustomerIPAddress', options[:ip] || "127.0.0.1"
+        end   
+      end
+
+      def add_creditcard(xml, creditcard)      
+        xml.tag! 'CardDetails' do
+          xml.tag! 'CardName', creditcard.name
+          xml.tag! 'CV2', creditcard.verification_value if creditcard.verification_value
+          xml.tag! 'CardNumber', creditcard.number
+          xml.tag! 'ExpiryDate', { 'Month' => creditcard.expiry_date.month.to_s.rjust(2, "0"), 'Year' => creditcard.expiry_date.year.to_s[/\d\d$/] }
+        end
+      end
+      
+      def add_merchant_data(xml, options)
+        xml.tag! 'MerchantAuthentication', {"MerchantID" => @options[:login], "Password" => @options[:password]}
+      end
+
+      def commit(request, options)
+        requires!(options, :action)
+        response = parse(ssl_post(test? ? TEST_URL : 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?, 
+          :authorization => authorization)
+      end
+
+      def parse(xml)
+        reply = {}
+        xml = REXML::Document.new(xml)
+        if (root = REXML::XPath.first(xml, "//CardDetailsTransactionResponse")) or
+              (root = REXML::XPath.first(xml, "//CrossReferenceTransactionResponse"))
+          root.elements.to_a.each do |node|
+            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") 
+          parse_element(reply, root)
+          reply[:message] = "#{reply[:faultcode]}: #{reply[:faultstring]}"
+        end
+        reply
+      end     
+
+      def parse_element(reply, node)
+        case node.name
+        when "CrossReferenceTransactionResult"
+          reply[:transaction_result] = {}
+          node.attributes.each do |a,b|
+            reply[:transaction_result][a.underscore.to_sym] = b
+          end
+          node.elements.each{|e| parse_element(reply[:transaction_result], e) } if node.has_elements?
+
+        when "CardDetailsTransactionResult"
+          reply[:transaction_result] = {}
+          node.attributes.each do |a,b|
+            reply[:transaction_result][a.underscore.to_sym] = b
+          end
+          node.elements.each{|e| parse_element(reply[:transaction_result], e) } if node.has_elements?
+
+        when "TransactionOutputData"
+          reply[:transaction_output_data] = {}
+          node.attributes.each{|a,b| reply[:transaction_output_data][a.underscore.to_sym] = b }
+          node.elements.each{|e| parse_element(reply[:transaction_output_data], e) } if node.has_elements?
+        when "CustomVariables"
+          reply[:custom_variables] = {}
+          node.attributes.each{|a,b| reply[:custom_variables][a.underscore.to_sym] = b }
+          node.elements.each{|e| parse_element(reply[:custom_variables], e) } if node.has_elements?
+        when "GatewayEntryPoints"
+          reply[:gateway_entry_points] = {}
+          node.attributes.each{|a,b| reply[:gateway_entry_points][a.underscore.to_sym] = b }
+          node.elements.each{|e| parse_element(reply[:gateway_entry_points], e) } if node.has_elements?
+        else
+          k = node.name.underscore.to_sym
+          if node.has_elements?
+            reply[k] = {}
+            node.elements.each{|e| parse_element(reply[k], e) } 
+          else
+            if node.has_attributes?
+              reply[k] = {}
+              node.attributes.each{|a,b| reply[k][a.underscore.to_sym] = b }
+            else
+              reply[k] = node.text
+            end
+          end
+        end
+        reply
+      end
+      
+      def currency_code(currency)
+        CURRENCY_CODES[currency]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,233 @@
+require 'digest/md5'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class NetaxeptGateway < Gateway
+      TEST_URL = 'https://epayment-test.bbs.no/'
+      LIVE_URL = 'https://epayment.bbs.no/'
+      
+      # The countries the gateway supports merchants from as 2 digit ISO country codes
+      self.supported_countries = ['NO', 'DK', 'SE', 'FI']
+      
+      # The card types supported by the payment gateway
+      self.supported_cardtypes = [:visa, :master, :american_express]
+      
+      # The homepage URL of the gateway
+      self.homepage_url = 'http://www.betalingsterminal.no/Netthandel-forside/'
+      
+      # The name of the gateway
+      self.display_name = 'BBS Netaxept'
+      
+      self.money_format = :cents
+      
+      self.default_currency = 'NOK'
+      
+      def initialize(options = {})
+        requires!(options, :login, :password)
+        @options = options
+        super
+      end  
+      
+      def purchase(money, creditcard, options = {})
+        requires!(options, :order_id)
+
+        post = {}
+        add_credentials(post, options)
+        add_transaction(post, options)
+        add_order(post, money, options)
+        add_creditcard(post, creditcard)
+        commit('Sale', post)
+      end                       
+
+      def authorize(money, creditcard, options = {})
+        requires!(options, :order_id)
+
+        post = {}
+        add_credentials(post, options)
+        add_transaction(post, options)
+        add_order(post, money, options)
+        add_creditcard(post, creditcard)
+        commit('Auth', post)
+      end
+
+      def capture(money, authorization, options = {})
+        post = {}
+        add_credentials(post, options)
+        add_authorization(post, authorization, money)
+        commit('Capture', post, false)
+      end
+
+      def credit(money, authorization, options = {})
+        post = {}
+        add_credentials(post, options)
+        add_authorization(post, authorization, money)
+        commit('Credit', post, false)
+      end
+
+      def void(authorization, options = {})
+        post = {}
+        add_credentials(post, options)
+        add_authorization(post, authorization)
+        commit('Annul', post, false)
+      end
+
+      def test?
+        @options[:test] || Base.gateway_mode == :test
+      end
+
+    
+      private
+      
+      def add_credentials(post, options)
+        post[:merchantId] = @options[:login]
+        post[:token] = @options[:password]
+      end
+      
+      def add_authorization(post, authorization, money=nil)
+        post[:transactionId] = authorization
+        post[:transactionAmount] = amount(money) if money
+      end
+      
+      def add_transaction(post, options)
+        post[:transactionId] = generate_transaction_id(options)
+        post[:serviceType] = 'C'
+        post[:redirectUrl] = 'http://example.com'
+      end
+      
+      def add_order(post, money, options)
+        post[:orderNumber] = options[:order_id]
+        post[:amount] = amount(money)
+        post[:currencyCode] = (options[:currency] || currency(money))
+      end
+      
+      CARD_TYPE_PREFIXES = {
+        'visa' => 'v',
+        'master' => 'm',
+        'american_express' => 'a',
+      }
+      def add_creditcard(post, creditcard)
+        prefix = CARD_TYPE_PREFIXES[creditcard.type]
+        unless prefix
+          raise ArgumentError.new("Card type #{creditcard.type} not supported.")
+        end
+
+        post[:creditcard] = {}
+        post[:creditcard][:"#{prefix}a"] = creditcard.number
+        post[:creditcard][:"#{prefix}m"] = format(creditcard.month, :two_digits)
+        post[:creditcard][:"#{prefix}y"] = format(creditcard.year, :two_digits)
+        post[:creditcard][:"#{prefix}c"] = creditcard.verification_value
+      end
+      
+      def commit(action, parameters, setup=true)
+        parameters[:action] = action
+
+        response = {:success => false}
+
+        catch(:exception) do
+          if setup
+            commit_transaction_setup(response, parameters)
+            commit_payment_details(response, parameters)
+            commit_process_setup(response, parameters)
+          end
+          commit_transaction(response, parameters)
+          response[:success] = true
+        end
+        
+        Response.new(response[:success], response[:message], response, :test => test?, :authorization => response[:authorization])
+      end
+      
+      def commit_transaction_setup(response, parameters)
+        response[:setup] = parse(ssl_get(build_url("REST/Setup.aspx", pick(parameters, :merchantId, :token, :serviceType, :amount, :currencyCode, :redirectUrl, :orderNumber, :transactionId))))
+        process(response, :setup)
+      end
+      
+      def commit_payment_details(response, parameters)
+        data = encode(parameters[:creditcard].merge(:BBSePay_transaction => response[:setup]['SetupString']))
+        response[:paymentDetails] = parse(ssl_post(build_url("terminal/default.aspx"), data), false)
+        process(response, :paymentDetails)
+      end
+      
+      def commit_process_setup(response, parameters)
+        result = ssl_get(build_url("REST/ProcessSetup.aspx", pick(parameters, :merchantId, :token, :transactionId).merge(:transactionString => response[:paymentDetails][:result])))
+        response[:processSetup] = parse(result)
+        process(response, :processSetup)
+      end
+      
+      def commit_transaction(response, parameters)
+        result = ssl_get(build_url("REST/#{parameters[:action]}.aspx", pick(parameters, :merchantId, :token, :transactionId, :transactionAmount)))
+        response[:action] = parse(result)
+        process(response, :action)
+      end
+
+      def process(response, step)
+        if response[step][:container] =~ /Exception|Error/
+          response[:message] = response[step]['Message']
+          throw :exception
+        else
+          message = (response[step]['ResponseText'] || response[step]['ResponseCode'])
+          response[:message] = (message || response[:message])
+          
+          response[:authorization] = response[step]['TransactionId']
+        end
+      end
+      
+      def parse(result, expects_xml=true)
+        if expects_xml || /^</ =~ result
+          doc = REXML::Document.new(result)
+          extract_xml(doc.root).merge(:container => doc.root.name)
+        else
+          {:result => result}
+        end
+      end
+      
+      def extract_xml(element)
+        if element.has_elements?
+          hash = {}
+          element.elements.each do |e|
+            hash[e.name] = extract_xml(e)
+          end
+          hash
+        else
+          element.text
+        end
+      end
+      
+      def url
+        (test? ? TEST_URL : LIVE_URL)
+      end
+      
+      def generate_transaction_id(options)
+        Digest::MD5.hexdigest("#{options.inspect}+#{Time.now}+#{rand}")
+      end
+      
+      def pick(hash, *keys)
+        keys.inject({}){|h,key| h[key] = hash[key] if hash[key]; h}
+      end
+      
+      def build_url(base, parameters=nil)
+        url = "#{test? ? TEST_URL : LIVE_URL}"
+        url << base
+        if parameters
+          url << '?'
+          url << encode(parameters)
+        end
+        url
+      end
+      
+      def encode(hash)
+        hash.collect{|(k,v)| "#{URI.encode(k.to_s)}=#{URI.encode(v.to_s)}"}.join('&')
+      end
+      
+      class Response < Billing::Response
+        attr_reader :error_detail
+        def initialize(success, message, raw, options)
+          super
+          unless success
+            @error_detail = raw[:processSetup]['Result']['ResponseText'] if raw[:processSetup] && raw[:processSetup]['Result']
+          end
+        end
+      end
+    end
+  end
+end
+

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

@@ -187,7 +187,7 @@ module ActiveMerchant #:nodoc:
         response = parse( ssl_post(URL, request.to_s) )
         
         # Return a response
-        PaymentExpressResponse.new(response[:success] == APPROVED, response[:response_text], response,
+        PaymentExpressResponse.new(response[:success] == APPROVED, response[:card_holder_help_text], response,
           :test => response[:test_mode] == '1',
           :authorization => response[:dps_txn_ref]
         )

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

@@ -102,10 +102,18 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'n2:NoShipping', options[:no_shipping] ? '1' : '0'
               xml.tag! 'n2:ReturnURL', options[:return_url]
               xml.tag! 'n2:CancelURL', options[:cancel_return_url]
-              xml.tag! 'n2:IPAddress', options[:ip]
+              xml.tag! 'n2:IPAddress', options[:ip] unless options[:ip].blank?
               xml.tag! 'n2:OrderDescription', options[:description]
               xml.tag! 'n2:BuyerEmail', options[:email] unless options[:email].blank?
               xml.tag! 'n2:InvoiceID', options[:order_id]
+              
+              if options[:billing_agreement]
+                xml.tag! 'n2:BillingAgreementDetails' do
+                  xml.tag! 'n2:BillingType', options[:billing_agreement][:type]
+                  xml.tag! 'n2:BillingAgreementDescription', options[:billing_agreement][:description]
+                  xml.tag! 'n2:PaymentType', options[:billing_agreement][:payment_type] || 'InstantOnly'
+                end
+              end
         
               # Customization of the payment page
               xml.tag! 'n2:PageStyle', options[:page_style] unless options[:page_style].blank?

data/lib/active_merchant/common/country.rb

@@ -48,6 +48,15 @@ module ActiveMerchant #:nodoc:
     def code(format)
       @codes.select{|c| c.format == format}
     end
+    
+    def ==(other)
+      (@name == other.name)
+    end
+    alias eql? ==
+    
+    def hash
+      @name.hash
+    end
 
     def to_s
       @name  
@@ -67,7 +76,6 @@ module ActiveMerchant #:nodoc:
       { :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 => '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' }, 
@@ -84,8 +92,8 @@ module ActiveMerchant #:nodoc:
       { :alpha2 => 'BW', :name => 'Botswana', :alpha3 => 'BWA', :numeric => '072' }, 
       { :alpha2 => 'BV', :name => 'Bouvet Island', :alpha3 => 'BVD', :numeric => '074' }, 
       { :alpha2 => 'BR', :name => 'Brazil', :alpha3 => 'BRA', :numeric => '076' }, 
-      { :alpha2 => 'BN', :name => 'Brunei Darussalam', :alpha3 => 'BRN', :numeric => '096' },
       { :alpha2 => 'IO', :name => 'British Indian Ocean Territory', :alpha3 => 'IOT', :numeric => '086' }, 
+      { :alpha2 => 'BN', :name => 'Brunei Darussalam', :alpha3 => 'BRN', :numeric => '096' },
       { :alpha2 => 'BG', :name => 'Bulgaria', :alpha3 => 'BGR', :numeric => '100' }, 
       { :alpha2 => 'BF', :name => 'Burkina Faso', :alpha3 => 'BFA', :numeric => '854' }, 
       { :alpha2 => 'BI', :name => 'Burundi', :alpha3 => 'BDI', :numeric => '108' }, 
@@ -142,15 +150,15 @@ module ActiveMerchant #:nodoc:
       { :alpha2 => 'GP', :name => 'Guadeloupe', :alpha3 => 'GLP', :numeric => '312' }, 
       { :alpha2 => 'GU', :name => 'Guam', :alpha3 => 'GUM', :numeric => '316' }, 
       { :alpha2 => 'GT', :name => 'Guatemala', :alpha3 => 'GTM', :numeric => '320' }, 
+      { :alpha2 => 'GG', :name => 'Guernsey', :alpha3 => 'GGY', :numeric => '831' },
       { :alpha2 => 'GN', :name => 'Guinea', :alpha3 => 'GIN', :numeric => '324' }, 
       { :alpha2 => 'GW', :name => 'Guinea-Bissau', :alpha3 => 'GNB', :numeric => '624' }, 
       { :alpha2 => 'GY', :name => 'Guyana', :alpha3 => 'GUY', :numeric => '328' },
-      { :alpha2 => 'GG', :name => 'Guernsey', :alpha3 => 'GGY', :numeric => '831' },
       { :alpha2 => 'HT', :name => 'Haiti', :alpha3 => 'HTI', :numeric => '332' }, 
+      { :alpha2 => 'HM', :name => 'Heard Island And Mcdonald Islands', :alpha3 => 'HMD', :numeric => '334' }, 
       { :alpha2 => 'VA', :name => 'Holy See (Vatican City State)', :alpha3 => 'VAT', :numeric => '336' }, 
       { :alpha2 => 'HN', :name => 'Honduras', :alpha3 => 'HND', :numeric => '340' }, 
       { :alpha2 => 'HK', :name => 'Hong Kong', :alpha3 => 'HKG', :numeric => '344' }, 
-      { :alpha2 => 'HM', :name => 'Heard Island And Mcdonald Islands', :alpha3 => 'HMD', :numeric => '334' }, 
       { :alpha2 => 'HU', :name => 'Hungary', :alpha3 => 'HUN', :numeric => '348' }, 
       { :alpha2 => 'IS', :name => 'Iceland', :alpha3 => 'ISL', :numeric => '352' }, 
       { :alpha2 => 'IN', :name => 'India', :alpha3 => 'IND', :numeric => '356' }, 
@@ -298,7 +306,8 @@ module ActiveMerchant #:nodoc:
       { :alpha2 => 'EH', :name => 'Western Sahara', :alpha3 => 'ESH', :numeric => '732' }, 
       { :alpha2 => 'YE', :name => 'Yemen', :alpha3 => 'YEM', :numeric => '887' }, 
       { :alpha2 => 'ZM', :name => 'Zambia', :alpha3 => 'ZMB', :numeric => '894' }, 
-      { :alpha2 => 'ZW', :name => 'Zimbabwe', :alpha3 => 'ZWE', :numeric => '716' }
+      { :alpha2 => 'ZW', :name => 'Zimbabwe', :alpha3 => 'ZWE', :numeric => '716' },
+      { :alpha2 => 'AX', :name => 'Åland Islands', :alpha3 => 'ALA', :numeric => '248' }
     ]
 
     def self.find(name)

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.7.3"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activemerchant
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 55
   prerelease: false
   segments: 
   - 1
-  - 7
-  - 3
-  version: 1.7.3
+  - 8
+  - 0
+  version: 1.8.0
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -36,7 +36,7 @@ cert_chain:
   hPaSTyVU0yCSnw==
   -----END CERTIFICATE-----
 
-date: 2010-09-14 00:00:00 -04:00
+date: 2010-09-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,6 +130,7 @@ files:
 - lib/active_merchant/billing/gateways/first_pay.rb
 - lib/active_merchant/billing/gateways/garanti.rb
 - lib/active_merchant/billing/gateways/instapay.rb
+- lib/active_merchant/billing/gateways/iridium.rb
 - lib/active_merchant/billing/gateways/jetpay.rb
 - lib/active_merchant/billing/gateways/linkpoint.rb
 - lib/active_merchant/billing/gateways/merchant_e_solutions.rb
@@ -138,6 +139,7 @@ files:
 - lib/active_merchant/billing/gateways/modern_payments_cim.rb
 - lib/active_merchant/billing/gateways/moneris.rb
 - lib/active_merchant/billing/gateways/net_registry.rb
+- lib/active_merchant/billing/gateways/netaxept.rb
 - lib/active_merchant/billing/gateways/netbilling.rb
 - lib/active_merchant/billing/gateways/ogone.rb
 - lib/active_merchant/billing/gateways/pay_junction.rb