activemerchant 1.9.0 → 1.9.1

data/CHANGELOG

@@ -1,5 +1,16 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.9.1 (November 24, 2010)
+
+* PayPal Express and PayPal Pro: Send JPY currency correctly without decimals [Soleone]
+* Netaxept: Make sure password (token) is URL escaped and update remote tests for updated server behavior [Soleone]
+* DirecPay: Add support for additional options in Return class and add convenience method to get transaction status update [Soleone]
+* Add new alias credit_card.brand for credit_card.type and handle the brand correctly in Netaxept [Soleone]
+* Iridium: Do not depend on ExpiryDate class for credit_card [Soleone]
+* PayFlow: Use same timeout of 60 seconds in HTTP header and XML for all requests [Soleone]
+* PayPal Website Payments Pro CA no longer supports American Express cards [Soleone]
+* Updated BIN ranges for Discover to match recent documents [kaunartist]
+
 == Version 1.9.0 (October 14, 2010)
 
 * Add support for DirecPay gateway [Soleone]

data/lib/active_merchant/billing/credit_card.rb

@@ -53,6 +53,8 @@ module ActiveMerchant #:nodoc:
       # run validation on the passed in value if it is supplied
       attr_accessor :verification_value
 
+      alias_method :brand, :type
+      
       # Provides proxy access to an expiry date object
       def expiry_date
         ExpiryDate.new(@month, @year)

data/lib/active_merchant/billing/credit_card_methods.rb

@@ -5,11 +5,11 @@ module ActiveMerchant #:nodoc:
       CARD_COMPANIES = { 
         'visa'               => /^4\d{12}(\d{3})?$/,
         'master'             => /^(5[1-5]\d{4}|677189)\d{10}$/,
-        'discover'           => /^(6011|65\d{2})\d{12}$/,
+        'discover'           => /^(6011|65\d{2}|64[4-9]\d)\d{12}|(62\d{14})$/,
         'american_express'   => /^3[47]\d{13}$/,
         'diners_club'        => /^3(0[0-5]|[68]\d)\d{11}$/,
         'jcb'                => /^35(28|29|[3-8]\d)\d{12}$/,
-        'switch'             => /^6759\d{12}(\d{2,3})?$/,  
+        'switch'             => /^6759\d{12}(\d{2,3})?$/,
         'solo'               => /^6767\d{12}(\d{2,3})?$/,
         'dankort'            => /^5019\d{12}$/,
         'maestro'            => /^(5[06-8]|6\d)\d{10,17}$/,
@@ -122,4 +122,4 @@ module ActiveMerchant #:nodoc:
       end
     end
   end
-end
+end

data/lib/active_merchant/billing/gateway.rb

@@ -62,7 +62,8 @@ module ActiveMerchant #:nodoc:
       include Utils
       
       DEBIT_CARDS = [ :switch, :solo ]
-      
+      CURRENCIES_WITHOUT_FRACTIONS = [ 'JPY' ]
+            
       cattr_reader :implementations
       @@implementations = []
       
@@ -149,6 +150,11 @@ module ActiveMerchant #:nodoc:
           sprintf("%.2f", cents.to_f / 100)
         end
       end
+
+      def localized_amount(money, currency)
+        amount = amount(money)
+        CURRENCIES_WITHOUT_FRACTIONS.include?(currency.to_s) ? amount.split('.').first : amount
+      end
       
       def currency(money)
         money.respond_to?(:currency) ? money.currency : self.default_currency

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

@@ -89,7 +89,7 @@ module ActiveMerchant #:nodoc:
       end
       
       def add_invoice(post, options)
-        post[:trackid] = rand(Time.now)
+        post[:trackid] = rand(Time.now.to_i)
       end
       
       def add_creditcard(post, creditcard)

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

@@ -10,7 +10,7 @@ module ActiveMerchant #:nodoc:
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
 
       # The homepage URL of the gateway
-      self.homepage_url = 'https://ccpos.garanti.com.tr/ccRaporlar/garanti/ccReports'
+      self.homepage_url = 'https://sanalposweb.garanti.com.tr/gvpsui/login/LoginStart.jsp'
 
       # The name of the gateway
       self.display_name = 'Garanti Sanal POS'

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

@@ -157,7 +157,7 @@ module ActiveMerchant #:nodoc:
           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$/] }
+          xml.tag! 'ExpiryDate', { 'Month' => creditcard.month.to_s.rjust(2, "0"), 'Year' => creditcard.year.to_s[/\d\d$/] }
         end
       end
       

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

@@ -106,9 +106,10 @@ module ActiveMerchant #:nodoc:
         'american_express' => 'a',
       }
       def add_creditcard(post, creditcard)
-        prefix = CARD_TYPE_PREFIXES[creditcard.type]
+        brand = Gateway.card_brand(creditcard)
+        prefix = CARD_TYPE_PREFIXES[brand]
         unless prefix
-          raise ArgumentError.new("Card type #{creditcard.type} not supported.")
+          raise ArgumentError.new("Card type #{brand} not supported.")
         end
 
         post[:creditcard] = {}
@@ -215,7 +216,7 @@ module ActiveMerchant #:nodoc:
       end
       
       def encode(hash)
-        hash.collect{|(k,v)| "#{URI.encode(k.to_s)}=#{URI.encode(v.to_s)}"}.join('&')
+        hash.collect{|(k,v)| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}"}.join('&')
       end
       
       class Response < Billing::Response

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

@@ -147,8 +147,6 @@ module ActiveMerchant #:nodoc:
           :timestamp => parameters[:dateq]),
           :test => test?,
           :authorization => response[:numappel].to_s + response[:numtrans].to_s,
-          :cvv_result => '',
-          :avs_result => '',
           :fraud_review => fraud_review?(response),
           :sent_params => parameters.delete_if{|key,value| ['porteur','dateval','cvv'].include?(key.to_s)}
         )

data/lib/active_merchant/billing/gateways/payflow/payflow_common_api.rb

@@ -79,7 +79,7 @@ module ActiveMerchant #:nodoc:
       def build_request(body, request_type = nil)
         xml = Builder::XmlMarkup.new
         xml.instruct!
-        xml.tag! 'XMLPayRequest', 'Timeout' => 30, 'version' => "2.1", "xmlns" => XMLNS do
+        xml.tag! 'XMLPayRequest', 'Timeout' => timeout.to_s, 'version' => "2.1", "xmlns" => XMLNS do
           xml.tag! 'RequestData' do
             xml.tag! 'Vendor', @options[:login]
             xml.tag! 'Partner', @options[:partner]

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

@@ -50,14 +50,14 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'n2:ReferenceID', reference_id if transaction_type == 'DoReferenceTransaction'
               xml.tag! 'n2:PaymentAction', action
               xml.tag! 'n2:PaymentDetails' do
-                xml.tag! 'n2:OrderTotal', amount(money), 'currencyID' => currency_code
+                xml.tag! 'n2:OrderTotal', localized_amount(money, currency_code), 'currencyID' => currency_code
                 
                 # All of the values must be included together and add up to the order total
                 if [:subtotal, :shipping, :handling, :tax].all?{ |o| options.has_key?(o) }
-                  xml.tag! 'n2:ItemTotal', amount(options[:subtotal]), 'currencyID' => currency_code
-                  xml.tag! 'n2:ShippingTotal', amount(options[:shipping]),'currencyID' => currency_code
-                  xml.tag! 'n2:HandlingTotal', amount(options[:handling]),'currencyID' => currency_code
-                  xml.tag! 'n2:TaxTotal', amount(options[:tax]), 'currencyID' => currency_code
+                  xml.tag! 'n2:ItemTotal', localized_amount(options[:subtotal], currency_code), 'currencyID' => currency_code
+                  xml.tag! 'n2:ShippingTotal', localized_amount(options[:shipping], currency_code),'currencyID' => currency_code
+                  xml.tag! 'n2:HandlingTotal', localized_amount(options[:handling], currency_code),'currencyID' => currency_code
+                  xml.tag! 'n2:TaxTotal', localized_amount(options[:tax], currency_code), 'currencyID' => currency_code
                 end
                 
                 xml.tag! 'n2:NotifyURL', options[:notify_url]

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

@@ -4,7 +4,7 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     # The PayPal gateway for PayPal Website Payments Pro Canada only supports Visa and MasterCard
     class PaypalCaGateway < PaypalGateway
-      self.supported_cardtypes = [:visa, :master, :american_express]
+      self.supported_cardtypes = [:visa, :master]
       self.supported_countries = ['CA']
       self.homepage_url = 'https://www.paypal.com/cgi-bin/webscr?cmd=_wp-pro-overview-outside'
       self.display_name = 'PayPal Website Payments Pro (CA)'

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

@@ -66,14 +66,14 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'n2:Token', options[:token]
               xml.tag! 'n2:PayerID', options[:payer_id]
               xml.tag! 'n2:PaymentDetails' do
-                xml.tag! 'n2:OrderTotal', amount(money), 'currencyID' => currency_code
+                xml.tag! 'n2:OrderTotal', localized_amount(money, currency_code), 'currencyID' => currency_code
                 
                 # All of the values must be included together and add up to the order total
                 if [:subtotal, :shipping, :handling, :tax].all?{ |o| options.has_key?(o) }
-                  xml.tag! 'n2:ItemTotal', amount(options[:subtotal]), 'currencyID' => currency_code
-                  xml.tag! 'n2:ShippingTotal', amount(options[:shipping]),'currencyID' => currency_code
-                  xml.tag! 'n2:HandlingTotal', amount(options[:handling]),'currencyID' => currency_code
-                  xml.tag! 'n2:TaxTotal', amount(options[:tax]), 'currencyID' => currency_code
+                  xml.tag! 'n2:ItemTotal', localized_amount(options[:subtotal], currency_code), 'currencyID' => currency_code
+                  xml.tag! 'n2:ShippingTotal', localized_amount(options[:shipping], currency_code),'currencyID' => currency_code
+                  xml.tag! 'n2:HandlingTotal', localized_amount(options[:handling], currency_code),'currencyID' => currency_code
+                  xml.tag! 'n2:TaxTotal', localized_amount(options[:tax], currency_code), 'currencyID' => currency_code
                 end
                 
                 xml.tag! 'n2:NotifyURL', options[:notify_url]
@@ -87,15 +87,17 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_setup_request(action, money, options)
+        currency_code = options[:currency] || currency(money)
+        
         xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! 'SetExpressCheckoutReq', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! 'SetExpressCheckoutRequest', 'xmlns:n2' => EBAY_NAMESPACE do
             xml.tag! 'n2:Version', API_VERSION
             xml.tag! 'n2:SetExpressCheckoutRequestDetails' do
               xml.tag! 'n2:PaymentAction', action
-              xml.tag! 'n2:OrderTotal', amount(money).to_f.zero? ? amount(100) : amount(money), 'currencyID' => options[:currency] || currency(money)
+              xml.tag! 'n2:OrderTotal', amount(money).to_f.zero? ? localized_amount(100, currency_code) : localized_amount(money, currency_code), 'currencyID' => currency_code
               if options[:max_amount]
-                xml.tag! 'n2:MaxAmount', amount(options[:max_amount]), 'currencyID' => options[:currency] || currency(options[:max_amount])
+                xml.tag! 'n2:MaxAmount', localized_amount(options[:max_amount], currency_code), 'currencyID' => currency_code
               end
               add_address(xml, 'n2:Address', options[:shipping_address] || options[:address])
               xml.tag! 'n2:AddressOverride', options[:address_override] ? '1' : '0'

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

@@ -32,8 +32,6 @@ module ActiveMerchant #:nodoc:
         :jcb => "JCB"
       }
 
-      CURRENCIES_WITHOUT_FRACTIONS = [ 'JPY' ]
-      
       ELECTRON = /^(424519|42496[23]|450875|48440[6-8]|4844[1-5][1-5]|4917[3-5][0-9]|491880)\d{10}(\d{3})?$/
       
       AVS_CVV_CODE = {

data/lib/active_merchant/billing/integrations/direc_pay.rb

@@ -28,8 +28,12 @@ module ActiveMerchant #:nodoc:
           Notification.new(post)
         end
         
-        def self.return(query_string)
-          Return.new(query_string)
+        def self.return(query_string, options = {})
+          Return.new(query_string, options)
+        end
+                
+        def self.request_status_update(mid, transaction_id, notification_url)
+          Status.new(mid).update(transaction_id, notification_url)
         end
       end
     end

data/lib/active_merchant/billing/integrations/quickpay/notification.rb

@@ -18,7 +18,7 @@ module ActiveMerchant #:nodoc:
           end
 
           def received_at
-            Time.local(*params['time'].scan(/../))
+            Time.parse("20#{params['time']}")
           end
 
           def gross

data/lib/active_merchant/common/country.rb

@@ -46,7 +46,7 @@ module ActiveMerchant #:nodoc:
     end
 
     def code(format)
-      @codes.select{|c| c.format == format}
+      @codes.detect{|c| c.format == format}
     end
     
     def ==(other)

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.9.0"
+  VERSION = "1.9.1"
 end

data/lib/support/gateway_support.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'active_support'
-require 'lib/active_merchant'
+require 'active_merchant'
 
 
 class GatewaySupport #:nodoc:

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activemerchant
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 1
   - 9
-  - 0
-  version: 1.9.0
+  - 1
+  version: 1.9.1
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -36,7 +36,7 @@ cert_chain:
   hPaSTyVU0yCSnw==
   -----END CERTIFICATE-----
 
-date: 2010-10-14 00:00:00 -04:00
+date: 2010-11-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency