activemerchant 1.11.0 → 1.12.0

data.tar.gz.sig

@@ -1 +1,3 @@
-_z��]�L{x�?��p�3������mpJ��i��ښ��F,°��ZQ(������0���AO���xYK76���m���jݗ��pɽ��<{o&a��|����r�w��ɋ	��/@�gɘ��1�&����G�
+>:v��e̴�T�(&������@#R�ߗ8}����q7��9�2%�#* ����{8�"���
+(����=y1++�c�rP������>Ž�X��!cADd‚�1`F@v��w�!�m���pX�b�R�>F�X���jB���P
+�1ϗ<U�CaT#_����艓�?oOY��a�X-/m��R1|��R���i��6�x�o�I\��@��2MD-�� ���٤c!��.��.��2��ӊYEU

data/CHANGELOG

@@ -1,5 +1,22 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.12.0 (Mar 1, 2011)
+
+* DirecPay: Send phone number as mobile phone by default [Soleone]
+* Support sending line items for PayPal Express transactions [Jonathan Rudenberg]
+* Update PayPal Express XML format to latest version [Jonathan Rudenberg]
+* Fix custom image header for PayPal Express [mwagg]
+* Add InvoiceID and OrderDescription to PayPal Express Authorize and Capture [cody]
+* Add Moneybookers integration [Alex Diakov]
+* Add QBMS (Quickbooks Merchant Services) gateway [ntalbott]
+* Add NMI gateway [ntalbott]
+* Make fully compatible with Rails 2 & 3, and Ruby 1.8 & 1.9 [ntalbott]
+* Authorize.Net: Only return AVS message for AVS-related reason codes. [ntalbott]
+* Add Federated Canada gateway [ntalbott]
+* Garanti: Fix text normalization for nil values [Selem Delul]
+* Valitor: Always send amount without any decimal places [Soleone]
+* Add WorldPay integration [Soleone]
+
 == Version 1.11.0 (Feb 11, 2011)
 
 * Bump dependency for activesupport from 2.3.2 to 2.3.8 [Soleone]

data/CONTRIBUTORS

@@ -199,3 +199,19 @@ Barclays ePDQ
 
 * Original code by Rob W (rfwatson)
 * Refactored by Nathaniel Talbott
+
+Federated Canada
+
+* Bob Larrick (deathbob)
+
+NMI
+
+* Nathaniel Talbott (ntalbott)
+
+QBMS
+
+* Will Glozer (wg)
+WorldPay (Feb 17, 2011)
+
+* Original code by Unknown from this patch: https://jadedpixel.lighthouseapp.com/projects/11599/tickets/3-patch-integration-support-for-worldpay-uk
+* Refactored by Soleone

data/README.rdoc

@@ -25,6 +25,7 @@ The {ActiveMerchant Wiki}[http://github.com/Shopify/active_merchant/wikis] conta
 * {ePay}[http://www.epay.dk/] - DK
 * {eWAY}[http://www.eway.com.au/] - AU
 * {E-xact}[http://www.e-xact.com] - CA, US
+* {Federated Canada}[http://www.federatedcanada.com/] - CA
 * {FirstPay}[http://www.first-pay.com] - US
 * {Garanti Sanal POS}[https://ccpos.garanti.com.tr/ccRaporlar/garanti/ccReports] - US, TR
 * {Inspire}[http://www.inspiregateway.com] - US
@@ -40,6 +41,7 @@ The {ActiveMerchant Wiki}[http://github.com/Shopify/active_merchant/wikis] conta
 * {NetRegistry}[http://www.netregistry.com.au] - AU
 * {NELiX TransaX Gateway}[http://www.nelixtransax.com] - US
 * {NETbilling}[http://www.netbilling.com] - US
+* {NMI}[http://nmi.com/] - US
 * {Ogone DirectLink}[http://www.ogone.com] - BE, DE, FR, NL, AT, CH
 * {PayBox Direct}[http://www.paybox.com] - FR
 * {PayJunction}[http://www.payjunction.com/] - US
@@ -56,6 +58,7 @@ The {ActiveMerchant Wiki}[http://github.com/Shopify/active_merchant/wikis] conta
 * {Psigate}[http://www.psigate.com/] - CA
 * {PSL Payment Solutions}[http://www.paymentsolutionsltd.com/] - GB
 * {Quantum}[http://www.quantumgateway.com] - US
+* {QuickBooks Merchant Services}[http://payments.intuit.com/] - US
 * {Quickpay}[http://quickpay.dk/] - DK
 * {Rabobank Nederland}[http://www.rabobank.nl/] - NL
 * {Realex}[http://www.realexpayments.com/] - IE, GB
@@ -80,10 +83,12 @@ The {ActiveMerchant Wiki}[http://github.com/Shopify/active_merchant/wikis] conta
 * {Chronopay}[http://www.chronopay.com]
 * {DirecPay}[http://www.timesofmoney.com/direcpay/jsp/home.jsp]
 * {HiTRUST}[http://www.hitrust.com.hk/]
+* {Moneybookers}[http://www.moneybookers.com]
 * {Nochex}[http://www.nochex.com]
 * {PayPal Website Payments Standard}[https://www.paypal.com/cgi-bin/webscr?cmd=_wp-standard-overview-outside]
 * {SagePay Form}[http://www.sagepay.com/products_services/sage_pay_go/integration/form]
 * {Valitor}[http://www.valitor.is/] - IS
+* {WorldPay}[http://www.worldpay.com]
 
 == Download
 

data/lib/active_merchant.rb

@@ -32,7 +32,6 @@ require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/class/delegating_attributes'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/kernel/requires'
-require 'active_support/core_ext/module/deprecation'
 require 'active_support/base64'
 require 'active_support/secure_random'
 

data/lib/active_merchant/billing/gateway.rb

@@ -140,7 +140,7 @@ module ActiveMerchant #:nodoc:
           money
         end
 
-        if money.is_a?(String) or cents.to_i < 0
+        if money.is_a?(String) 
           raise ArgumentError, 'money amount must be a positive Integer in cents.' 
         end
 

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

@@ -48,6 +48,7 @@ module ActiveMerchant #:nodoc:
 
       CARD_CODE_ERRORS = %w( N S )
       AVS_ERRORS = %w( A E N R W Z )
+      AVS_REASON_CODES = %w(27 45)
 
       AUTHORIZE_NET_ARB_NAMESPACE = 'AnetApi/xml/v1/schema/AnetApiSchema.xsd'
 
@@ -370,10 +371,12 @@ module ActiveMerchant #:nodoc:
       def message_from(results)  
         if results[:response_code] == DECLINED
           return CVVResult.messages[ results[:card_code] ] if CARD_CODE_ERRORS.include?(results[:card_code])
-          return AVSResult.messages[ results[:avs_result_code] ] if AVS_ERRORS.include?(results[:avs_result_code])
+          if AVS_REASON_CODES.include?(results[:response_reason_code]) && AVS_ERRORS.include?(results[:avs_result_code])
+            return AVSResult.messages[ results[:avs_result_code] ] 
+          end
         end
 
-        return results[:response_reason_text].nil? ? '' : results[:response_reason_text].chomp('.')
+        (results[:response_reason_text] ? results[:response_reason_text].chomp('.') : '')
       end
 
       def expdate(creditcard)

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

@@ -0,0 +1,169 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class FederatedCanadaGateway < Gateway
+      # Same URL for both test and live, testing is done by using the test username (demo) and password (password).
+      URL = 'https://secure.federatedgateway.com/api/transact.php'
+
+      APPROVED, DECLINED, ERROR = 1, 2, 3
+
+      # The countries the gateway supports merchants from as 2 digit ISO country codes
+      self.supported_countries = ['CA']
+
+      self.default_currency = 'CAD'
+
+      # 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.federatedcanada.com/'
+
+      # The name of the gateway
+      self.display_name = 'Federated Canada'
+
+      def initialize(options = {})
+        requires!(options, :login, :password)
+        @options = options
+        super
+      end
+
+      def purchase(money, creditcard, options = {})
+        post = {}
+        add_invoice(post, options)
+        add_creditcard(post, creditcard)
+        add_address(post, options)
+        add_customer_data(post, options)
+        commit('sale', money, post)
+      end
+
+      def authorize(money, creditcard, options = {})
+        post = {}
+        add_invoice(post, options)
+        add_creditcard(post, creditcard)
+        add_address(post, options)
+        add_customer_data(post, options)
+        commit('auth', money, post)
+      end
+
+      def capture(money, authorization, options = {})
+        options[:transactionid] = authorization
+        commit('capture', money, options)
+      end
+
+      def credit(money, identification, options = {}) # also referred to as refund
+        post = { :transactionid => identification}
+        commit('refund', money, post)
+      end
+
+      def void(authorization, options = {})
+        options[:transactionid] = authorization
+        commit('void', nil, options)
+      end
+
+      def refund(money, authorization, options = {})
+        options[:transactionid] = authorization
+        commit('refund', money, options)
+      end
+
+      private
+
+      def add_customer_data(post, options)
+        post[:firstname] = options[:first_name]
+        post[:lastname] = options[:last_name]
+
+        post[:email] = options[:email]
+      end
+
+      def add_address(post, options)
+        if address = (options[:billing_address] || options[:address])
+          post[:company] = address[:company]
+          post[:address1] = address[:address1]
+          post[:address2] = address[:address2]
+          post[:city]    = address[:city]
+          post[:state]   = address[:state]
+          post[:zip]     = address[:zip]
+          post[:country] = address[:country]
+          post[:phone] = address[:phone]
+        end
+        if address = options[:shipping_address]
+          post[:shipping_firstname] = address[:first_name]
+          post[:shipping_lastname] = address[:last_name]
+          post[:shipping_company] = address[:company]
+          post[:shipping_address1] = address[:address1]
+          post[:shipping_address2] = address[:address2]
+          post[:shipping_city]    = address[:city]
+          post[:shipping_state]   = address[:state]
+          post[:shipping_zip]     = address[:zip]
+          post[:shipping_country] = address[:country]
+          post[:shipping_email]   = address[:email]
+        end
+      end
+
+      def add_invoice(post, options)
+        post[:orderid] = options[:order_id]
+        post[:orderdescription] = options[:description]
+      end
+      
+      def add_creditcard(post, creditcard)
+        post[:ccnumber] = creditcard.number
+        post[:ccexp] = expdate(creditcard)
+        post[:cvv] = creditcard.verification_value
+      end
+
+      def expdate(creditcard)
+        year  = sprintf("%.4i", creditcard.year)
+        month = sprintf("%.2i", creditcard.month)
+        "#{month}#{year[-2..-1]}"
+      end
+
+      def parse(body)
+        body.split('&').inject({}) do |memo, x|
+          k, v = x.split('=')
+          memo[k] = v
+          memo
+        end
+      end
+      
+      def commit(action, money, parameters)
+        parameters[:amount] = amount(money)
+        data = ssl_post(URL, post_data(action, parameters))
+        response = parse(data)
+        message = message_from(response)
+        test_mode = test?
+
+        Response.new(success?(response), message, response, 
+          :test => test?,
+          :authorization => response['transactionid'],
+          :avs_result => {:code =>  response['avsresponse']},
+          :cvv_result => response['cvvresponse']
+        )
+      end
+
+      def success?(response)
+        response['response'] == '1'
+      end
+
+      def test?
+        (@options[:login].eql?('demo')) && (@options[:password].eql?('password'))
+      end
+
+      def message_from(response)
+        case response['response'].to_i
+        when APPROVED
+          "Transaction Approved"
+        when DECLINED
+          "Transaction Declined"
+        else
+          "Error in transaction data or system error"
+        end
+      end
+
+      def post_data(action, parameters = {})
+        parameters[:type] = action
+        parameters[:username] = @options[:login]
+        parameters[:password] = @options[:password]
+        parameters.map{|k, v| "#{k}=#{CGI.escape(v.to_s)}"}.join('&')
+      end
+    end
+  end
+end
+

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

@@ -1,3 +1,7 @@
+if RUBY_VERSION < '1.9' && $KCODE == "NONE"
+  $KCODE = 'u'
+end
+
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class GarantiGateway < Gateway
@@ -193,7 +197,15 @@ module ActiveMerchant #:nodoc:
       end
 
       def normalize(text)
-        ActiveSupport::Inflector.transliterate(text,'')
+        return unless text
+        
+        if ActiveSupport::Inflector.method(:transliterate).arity == -2
+          ActiveSupport::Inflector.transliterate(text,'')
+        elsif RUBY_VERSION >= '1.9'
+          text.gsub(/[^\x00-\x7F]+/, '')
+        else
+          ActiveSupport::Inflector.transliterate(text).to_s
+        end
       end
 
       def add_transaction_data(xml, money, options)

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

@@ -56,20 +56,20 @@ module ActiveMerchant #:nodoc:
 				post[:card_id] = card_id
 				commit('X', nil, post)
 			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)
+			def void(transaction_id, options = {})
 				post = {}
 				post[:transaction_id] = transaction_id
 				commit('V', nil, post)
 			end
-    
-			private                       
+
+			private
 
 			def add_address(post, options)
 				if address = options[:billing_address] || options[:address]

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

@@ -0,0 +1,13 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class NmiGateway < AuthorizeNetGateway
+      self.test_url = 'https://secure.networkmerchants.com/gateway/transact.dll'
+      self.live_url = 'https://secure.networkmerchants.com/gateway/transact.dll'
+      self.homepage_url = 'http://nmi.com/'
+      self.display_name = 'NMI'
+      self.supported_countries = ['US']
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+    end
+  end
+end
+

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

@@ -101,7 +101,7 @@ module ActiveMerchant #:nodoc:
 
       class_inheritable_accessor :test_url, :live_url
 
-      self.test_url = "https://demo.payjunction.com/quick_link"
+      self.test_url = "https://www.payjunctionlabs.com/quick_link"
       self.live_url = "https://payjunction.com/quick_link"
 
       TEST_LOGIN = 'pj-ql-01'
@@ -207,22 +207,22 @@ module ActiveMerchant #:nodoc:
           :transaction_amount => amount(money),
           :transaction_id => authorization
         }
-                                                  
+
         commit('CREDIT', parameters)
       end
-      
+
       # Cancel a transaction that has been charged but has not yet made it
       # through the batch process.
-      def void(money, authorization, options = {})
+      def void(authorization, options = {})
         parameters = {
           :transaction_id => authorization,
           :posture => 'void'
         }
-        
-        add_optional_fields(parameters, options)                                          
+
+        add_optional_fields(parameters, options)
         commit('update', parameters)
       end
-      
+
       # Set up a sale that will be made on a regular basis for the same amount 
       # (ex. $20 a month for 12 months)
       #
@@ -389,4 +389,4 @@ module ActiveMerchant #:nodoc:
       
     end
   end
-end
+end

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

@@ -3,13 +3,12 @@ require 'iconv'
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class PayboxDirectGateway < Gateway
-      TEST_URL = 'https://ppps.paybox.com/PPPS.php'
-      TEST_URL_BACKUP = 'https://ppps1.paybox.com/PPPS.php'
+      TEST_URL = 'https://preprod-ppps.paybox.com/PPPS.php'
       LIVE_URL = 'https://ppps.paybox.com/PPPS.php'
       LIVE_URL_BACKUP = 'https://ppps1.paybox.com/PPPS.php'
 
       # Payment API Version
-      API_VERSION = '00104'
+      API_VERSION = '00103'
 
       # Transactions hash
       TRANSACTIONS = {
@@ -142,7 +141,7 @@ module ActiveMerchant #:nodoc:
         parameters[:devise] = CURRENCY_CODES[options[:currency] || currency(money)]
         request_data = post_data(action,parameters)
         response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, request_data))
-        response = parse(ssl_post(test? ? TEST_URL_BACKUP : LIVE_URL_BACKUP, request_data)) if service_unavailable?(response)
+        response = parse(ssl_post(LIVE_URL_BACKUP, request_data)) if service_unavailable?(response) && !test?
         Response.new(success?(response), message_from(response), response.merge(
           :timestamp => parameters[:dateq]),
           :test => test?,

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
         base.cattr_accessor :signature
       end
       
-      API_VERSION = '59.0'
+      API_VERSION = '62.0'
       
       URLS = {
         :test => { :certificate => 'https://api.sandbox.paypal.com/2.0/',
@@ -323,4 +323,4 @@ module ActiveMerchant #:nodoc:
       end
     end
   end
-end
+end