activemerchant 1.38.1 → 1.39.0

data/CHANGELOG

@@ -1,5 +1,28 @@
 = ActiveMerchant CHANGELOG
 
+* Moneris: Add optional (off by default) verification_value support [duff]
+* Citrus: New Integration [viatechs, melari]
+* Payu Paisa: New Integration [melari]
+* Spreedly: Pass country with other address fields [hoenth]
+* SecureNet: Fix order of xml params [duff]
+* Paymill: Add support for void [duff]
+* Add MoneyMovers gateway [jeffutter]
+* Ogone: Add a :store_amount option [rymai]
+* Ogone: Require TLSv1 [ntalbott]
+* Moneris: Add support for purchasecorrection [pgib]
+* Spreedly: Add ability to retain on success [duff]
+* Spreedly: Pass verification value [duff]
+* Paymill: Add support for specifying the :customer [Sbastien]
+* Realex: Correct AVS input format [ExxKA]
+* USAEpay Transaction: Use sandbox when in test mode [radar]
+* Braintree Blue: Do not use global config [rdj]
+* eWay Rapid: Add response messages [BenZhang]
+* Paysbuy: Add 'Pending' notification status [divineforest]
+* Cybersource: Use standard :phone field [cade]
+* Orbital: Fix/tweak AVS codes [boone]
+* Quickpay: Add v7 support [larspind]
+* Authorize.Net CIM: Add option to not mark transactions as test [alanandrade]
+
 == Version 1.38.1 (September 16, 2013)
 
 * Moneris: Remove verification_value support [melari]

data/CONTRIBUTORS

@@ -412,3 +412,11 @@ MerchantWare V4 (July 2013)
 Platron integration (July 2013)
 
 * Alexey Kiryushin (alexwl)
+
+MoneyMovers (September 2013)
+
+* Jeffery Utter (jeffutter)
+
+Be2Bill (September 2013)
+
+* Michaël Hoste (MichaelHoste)

data/README.md

@@ -81,102 +81,108 @@ For more in-depth documentation and tutorials, see [GettingStarted.md](GettingSt
 
 The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) contains a [table of features supported by each gateway](http://github.com/Shopify/active_merchant/wikis/gatewayfeaturematrix).
 
-* [Authorize.Net](http://www.authorize.net/) - US
 * [Authorize.Net CIM](http://www.authorize.net/) - US
+* [Authorize.Net](http://www.authorize.net/) - US, CA, GB
 * [Balanced](https://www.balancedpayments.com/) - US
-* [Banwire](https://www.banwire.com/) - MX
-* [Barclays ePDQ MPI](http://www.barclaycard.co.uk/business/accepting-payments/epdq-mpi/) - UK
-* [Barclays ePDQ Extra Plus](http://www.barclaycard.co.uk/business/accepting-payments/epdq-ecomm/) - UK
-* [Beanstream.com](http://www.beanstream.com/) - CA
+* [Banwire](http://www.banwire.com/) - MX
+* [Barclays ePDQ Extra Plus](http://www.barclaycard.co.uk/business/accepting-payments/epdq-ecomm/) - GB
+* [Barclays ePDQ MPI](http://www.barclaycard.co.uk/business/accepting-payments/epdq-mpi/) - GB
+* [Be2Bill](http://www.be2bill.com/) - FR
+* [Beanstream.com](http://www.beanstream.com/) - CA, US
 * [BluePay](http://www.bluepay.com/) - US
-* [Braintree](http://www.braintreepaymentsolutions.com) - US
-* [CardStream](http://www.cardstream.com/) - UK
-* [CertoDirect](http://www.certodirect.com/) - BE, BG, CZ, DK, DE, EE, IE, EL, ES, FR, IT, CY, LV, LT, LU, HU, MT, NL, AT, PL, PT, RO, SI, SK, FI, SE, UK
-* [CyberSource](http://www.cybersource.com) - US
-* [DataCash](http://www.datacash.com/) - UK
+* [Braintree](http://www.braintreepaymentsolutions.com) - US, CA, AU, AD, AT, BE, BG, CY, CZ, DK, EE, FI, FR, GI, DE, GR, HU, IS, IM, IE, IT, LV, LI, LT, LU, MT, MC, NL, NO, PL, PT, RO, SM, SK, SI, ES, SE, CH, TR, GB
+* [CardSave](http://www.cardsave.net/) - GB
+* [CardStream](http://www.cardstream.com/) - GB
+* [CertoDirect](http://www.certodirect.com/) - BE, BG, CZ, DK, DE, EE, IE, EL, ES, FR, IT, CY, LV, LT, LU, HU, MT, NL, AT, PL, PT, RO, SI, SK, FI, SE, GB
+* [CyberSource](http://www.cybersource.com) - US, BR, CA, CN, DK, FI, FR, DE, JP, MX, NO, SE, GB, SG
+* [DataCash](http://www.datacash.com/) - GB
 * [Efsnet](http://www.concordefsnet.com/) - US
-* [Elavon MyVirtualMerchant](http://www.elavon.com) - US, CA
-* [ePay](http://www.epay.dk/) - DK, SE, NO
+* [Elavon MyVirtualMerchant](http://www.elavon.com/) - US, CA
+* [ePay](http://epay.dk/) - DK, SE, NO
 * [EVO Canada](http://www.evocanada.com/) - CA
-* [eWAY](http://www.eway.com.au/) - AU
-* [eWay Rapid 3.0](http://www.eway.com.au/) - AU
+* [eWAY](http://www.eway.com.au/) - AU, NZ, GB
+* [eWAY Rapid 3.0](http://www.eway.com.au/) - AU
 * [E-xact](http://www.e-xact.com) - CA, US
-* [Fat Zebra](https://www.fatzebra.com.au) - AU
+* [Fat Zebra](https://www.fatzebra.com.au/) - AU
 * [Federated Canada](http://www.federatedcanada.com/) - CA
 * [Finansbank WebPOS](https://www.fbwebpos.com/) - US, TR
+* [First Pay](http://www.first-pay.com) - US
 * [FirstData Global Gateway e4](http://www.firstdata.com) - CA, US
-* [FirstPay](http://www.first-pay.com) - US
-* [Garanti Sanal POS](https://ccpos.garanti.com.tr/ccRaporlar/garanti/ccReports) - US, TR
+* [Garanti Sanal POS](https://sanalposweb.garanti.com.tr) - US, TR
 * [HDFC](http://www.hdfcbank.com/sme/sme-details/merchant-services/guzh6m0i) - IN
-* [Inspire](http://www.inspiregateway.com) - US
+* [IATSPayments](http://www.iatspayments.com/) - US, CA, GB
+* [Inspire Commerce](http://www.inspiregateway.com) - US
 * [InstaPay](http://www.instapayllc.com) - US
-* [Iridium](http://www.iridiumcorp.co.uk/) - UK, ES
+* [Iridium](http://www.iridiumcorp.co.uk/) - GB, ES
 * [iTransact](http://www.itransact.com/) - US
-* [JetPay](http://www.jetpay.com) - US
+* [JetPay](http://www.jetpay.com/) - US
 * [LinkPoint](http://www.linkpoint.com/) - US
-* [Litle](http://www.litle.com/) - US
-* [Merchant e-Solutions](http://merchante-solutions.com/) - US
-* [MerchantWare](http://merchantwarehouse.com/merchantware) - US
-* [Merchant Warrior] (http://merchantwarrior.com) - AU
+* [Litle & Co.](http://www.litle.com/) - US
+* [Merchant e-Solutions](http://www.merchante-solutions.com/) - US
+* [Merchant One Gateway](http://merchantone.com/) - US
+* [MerchantWARE](http://merchantwarehouse.com/merchantware) - US
+* [MerchantWarrior](http://www.merchantwarrior.com/) - AU
 * [Mercury](http://www.mercurypay.com) - US
+* [Metrics Global](http://www.metricsglobal.com) - US
 * [MasterCard Internet Gateway Service (MiGS)](http://mastercard.com/mastercardsps) - AU, AE, BD, BN, EG, HK, ID, IN, JO, KW, LB, LK, MU, MV, MY, NZ, OM, PH, QA, SA, SG, TT, VN
 * [Modern Payments](http://www.modpay.com) - US
 * [Moneris](http://www.moneris.com/) - CA
-* [Moneris US](http://www.monerisusa.com/) - US
-* [NABTransact](http://www.nab.com.au/nabtransact/) - AU
-* [NELiX TransaX Gateway](http://www.nelixtransax.com) - US
-* [Netaxept](http://www.betalingsterminal.no/Netthandel-forside) - NO, DK, SE, FI
-* [NETbilling](http://www.netbilling.com) - US
-* [NetPay](http://www.netpay.com.mx) - MX
+* [Moneris (US)](http://www.monerisusa.com/) - US
+* [MoneyMovers](http://mmoa.us/) - US
+* [NAB Transact](http://transact.nab.com.au) - AU
 * [NetRegistry](http://www.netregistry.com.au) - AU
+* [BBS Netaxept](http://www.betalingsterminal.no/Netthandel-forside/) - NO, DK, SE, FI
+* [NETbilling](http://www.netbilling.com) - US
+* [NETPAY Gateway](http://www.netpay.com.mx) - MX
 * [NMI](http://nmi.com/) - US
-* [Ogone DirectLink](http://www.ogone.com) - BE, DE, FR, NL, AT, CH
-* [Optimal Payments](http://www.optimalpayments.com/) - CA, US, UK
-* [Orbital Paymentech](http://chasepaymentech.com/) - CA, US, UK, GB
-* [PayBox Direct](http://www.paybox.com) - FR
-* [PayFast](https://www.payfast.co.za/) - ZA
+* [Ogone](http://www.ogone.com/) - BE, DE, FR, NL, AT, CH
+* [Optimal Payments](http://www.optimalpayments.com/) - CA, US, GB
+* [Orbital Paymentech](http://chasepaymentech.com/) - US, CA
 * [PayGate PayXML](http://paygate.co.za/) - US, ZA
 * [PayJunction](http://www.payjunction.com/) - US
-* [PaymentExpress](http://www.paymentexpress.com/) - AU, MY, NZ, SG, ZA, UK, US
-* [PAYMILL](https://www.paymill.com) - AD, AT, BE, CH, CY, CZ, DE, DK, EE, ES, FI, FO, FR, GB, GR, HU, IE, IL, IS, IT, LI, LT, LU, LV, MT, NL, NO, PL, PT, SE, SI, SK, TR, VA
-* [PayPal Express Checkout](https://www.paypal.com/cgi-bin/webscr?cmd=xpt/merchant/ExpressCheckoutIntro-outside) - US, CA, SG, AU
-* [PayPal Payflow Pro](https://www.paypal.com/cgi-bin/webscr?cmd=_payflow-pro-overview-outside) - US, CA, SG, AU
-* [PayPal Website Payments Pro (UK)](https://www.paypal.com/uk/cgi-bin/webscr?cmd=_wp-pro-overview-outside) - UK
-* [PayPal Website Payments Pro (CA)](https://www.paypal.com/cgi-bin/webscr?cmd=_wp-pro-overview-outside) - CA
-* [PayPal Express Checkout](https://www.paypal.com/cgi-bin/webscr?cmd=xpt/merchant/ExpressCheckoutIntro-outside) - US
-* [PayPal Website Payments Pro (US)](https://www.paypal.com/cgi-bin/webscr?cmd=_wp-pro-overview-outside) - US
 * [PaySecure](http://www.commsecure.com.au/paysecure.shtml) - AU
-* [PayWay](https://www.payway.com.au) - AU
+* [Paybox Direct](http://www.paybox.com/) - FR
+* [PaymentExpress](http://www.paymentexpress.com/) - AU, CA, DE, ES, FR, GB, HK, IE, MY, NL, NZ, SG, US, ZA
+* [PAYMILL](https://paymill.com) - AD, AT, BE, BG, CH, CY, CZ, DE, DK, EE, ES, FI, FO, FR, GB, GI, GR, HU, IE, IL, IS, IT, LI, LT, LU, LV, MT, NL, NO, PL, PT, RO, SE, SI, SK, TR, VA
+* [PayPal Express Checkout](https://www.paypal.com/webapps/mpp/express-checkout) - US, CA, SG, AU
+* [PayPal Express Checkout (UK)](https://www.paypal.com/uk/webapps/mpp/express-checkout) - GB
+* [PayPal Payflow Pro](https://www.paypal.com/webapps/mpp/payflow-payment-gateway) - US, CA, SG, AU
+* [PayPal Payments Pro (US)](https://www.paypal.com/us/webapps/mpp/paypal-payments-pro) - US
+* [PayPal Payments Pro (UK)](https://www.paypal.com/uk/webapps/mpp/pro) - GB
+* [PayPal Website Payments Pro (CA)](https://www.paypal.com/cgi-bin/webscr?cmd=_wp-pro-overview-outside) - CA
+* [PayPal Express Checkout for Digital Goods](https://www.x.com/community/ppx/xspaces/digital_goods) - AU, CA, CN, FI, GB, ID, IN, IT, MY, NO, NZ, PH, PL, SE, SG, TH, VN
+* [Paystation](http://paystation.co.nz) - NZ
+* [Pay Way](http://www.payway.com.au) - AU
 * [Pin](http://www.pin.net.au/) - AU
 * [Plug'n Pay](http://www.plugnpay.com/) - US
 * [Psigate](http://www.psigate.com/) - CA
-* [PSL Payment Solutions](http://www.paymentsolutionsltd.com/) - UK
-* [Quantum](http://www.quantumgateway.com) - US
+* [PSL Payment Solutions](http://www.paymentsolutionsltd.com/) - GB
 * [QuickBooks Merchant Services](http://payments.intuit.com/) - US
+* [Quantum Gateway](http://www.quantumgateway.com) - US
 * [Quickpay](http://quickpay.dk/) - DK, SE
-* [Rabobank Nederland](http://www.rabobank.nl/) - NL
-* [Realex](http://www.realexpayments.com/) - IE, UK
-* [Redsys](http://www.redsys.es) - ES
-* [SagePay](http://www.sagepay.com) - UK
+* [Realex](http://www.realexpayments.com/) - IE, GB, FR, BE, NL, LU, IT
+* [Redsys](http://www.redsys.es/) - ES
+* [SagePay](http://www.sagepay.com) - GB, IE
 * [Sage Payment Solutions](http://www.sagepayments.com) - US, CA
-* [Sallie Mae](http://www.salliemae.com) - US
-* [SecureNet](http://www.securenet.com) - US
-* [SecurePay](http://securepay.com.au) - AU
-* [SecurePay](http://www.securepay.com/) - US
+* [Sallie Mae](http://www.salliemae.com/) - US
+* [Samurai](https://samurai.feefighters.com) - US
+* [SecureNet](http://www.securenet.com/) - US
+* [SecurePay](http://www.securepay.com/) - US, CA, GB, AU
 * [SecurePayTech](http://www.securepaytech.com/) - NZ
 * [SkipJack](http://www.skipjack.com/) - US, CA
-* [Spreedly Core](https://spreedlycore.com/) - AD, AE, AT, AU, BD, BE, BG, BN, CA, CH, CY, CZ, DE, DK, EE, EG, ES, FI, FR, GB, GI, GR, HK, HU, ID, IE, IL, IM, IN, IS, IT, JO, KW, LB, LI, LK, LT, LU, LV, MC, MT, MU, MV, MX, MY, NL, NO, NZ, OM, PH, PL, PT, QA, RO, SA, SE, SG, SI, SK, SM, TR, TT, UM, US, VA, VN, ZA
-* [Stripe](https://stripe.com/) - US, CA, GB
+* [Spreedly](https://spreedly.com) - AD, AE, AT, AU, BD, BE, BG, BN, CA, CH, CY, CZ, DE, DK, EE, EG, ES, FI, FR, GB, GI, GR, HK, HU, ID, IE, IL, IM, IN, IS, IT, JO, KW, LB, LI, LK, LT, LU, LV, MC, MT, MU, MV, MX, MY, NL, NO, NZ, OM, PH, PL, PT, QA, RO, SA, SE, SG, SI, SK, SM, TR, TT, UM, US, VA, VN, ZA
+* [Stripe](https://stripe.com/) - US, CA, GB, AU, IE, FR, NL, BE, DE, ES
 * [TransFirst](http://www.transfirst.com/) - US
+* [NELiX TransaX](https://www.nelixtransax.com/) - US
 * [Transnational](http://www.tnbci.com/) - US
 * [TrustCommerce](http://www.trustcommerce.com/) - US
 * [USA ePay](http://www.usaepay.com/) - US
 * [Verifi](http://www.verifi.com/) - US
 * [ViaKLIX](http://viaklix.com) - US
-* [Vindica](http://www.vindicia.com/) - US, CA, UK, AU, MX, BR, DE, KR, CN, HK
+* [Vindicia](http://www.vindicia.com/) - US, CA, GB, AU, MX, BR, DE, KR, CN, HK
 * [WebPay](https://webpay.jp/) - JP
-* [Wirecard](http://www.wirecard.com) - DE
-* [WorldPay](http://www.worldpay.com) - AU, HK, UK, US
+* [Wirecard](http://www.wirecard.com) - AD, CY, GI, IM, MT, RO, CH, AT, DK, GR, IT, MC, SM, TR, BE, EE, HU, LV, NL, SK, GB, BG, FI, IS, LI, NO, SI, VA, FR, IL, LT, PL, ES, CZ, DE, IE, LU, PT, SE
+* [WorldPay](http://www.worldpay.com/) - HK, US, GB, AU, AD, BE, CH, CY, CZ, DE, DK, ES, FI, FR, GI, GR, HU, IE, IL, IT, LI, LU, MC, MT, NL, NO, NZ, PL, PT, SE, SG, SI, SM, TR, UM, VA
 
 ## Supported Offsite Payment Gateways
 

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

@@ -94,10 +94,14 @@ module ActiveMerchant #:nodoc:
       # * <tt>:password</tt> -- The Authorize.Net Transaction Key. (REQUIRED)
       # * <tt>:test</tt> -- +true+ or +false+. If true, perform transactions against the test server.
       #   Otherwise, perform transactions against the production server.
+      # * <tt>:test_requests</tt> -- +true+ or +false+. If true, perform transactions without the
+      #   test flag. This is useful when you need to generate card declines, AVS or CVV erros.
+      #   Will hold the same value as :test by default.
       # * <tt>:delimiter</tt> -- The delimiter used in the direct response.  Default is ',' (comma).
       def initialize(options = {})
         requires!(options, :login, :password)
         super
+        @options[:test_requests] = test? if @options[:test_requests].nil?
       end
 
       # Creates a new customer profile along with any customer payment profiles and customer shipping addresses
@@ -605,7 +609,7 @@ module ActiveMerchant #:nodoc:
 
       def build_create_customer_profile_transaction_request(xml, options)
         options[:extra_options] ||= {}
-        options[:extra_options].merge!('x_test_request' => 'TRUE') if @options[:test]
+        options[:extra_options].merge!('x_test_request' => 'TRUE') if @options[:test_requests]
 
         add_transaction(xml, options[:transaction])
         tag_unless_blank(xml, 'extraOptions', format_extra_options(options[:extra_options]))
@@ -842,7 +846,7 @@ module ActiveMerchant #:nodoc:
         response_params = parse(action, xml)
 
         message = response_params['messages']['message']['text']
-        test_mode = test? || message =~ /Test Mode/
+        test_mode = @options[:test_requests] || message =~ /Test Mode/
         success = response_params['messages']['result_code'] == 'Ok'
         response_params['direct_response'] = parse_direct_response(response_params['direct_response']) if response_params['direct_response']
         transaction_id = response_params['direct_response']['transaction_id'] if response_params['direct_response']

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

@@ -0,0 +1,131 @@
+require "digest/sha2"
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class Be2billGateway < Gateway
+      self.test_url = 'https://secure-test.be2bill.com/front/service/rest/process.php'
+      self.live_url = 'https://secure-magenta1.be2bill.com/front/service/rest/process.php'
+
+      self.display_name = 'Be2Bill'
+      self.homepage_url = 'http://www.be2bill.com/'
+      self.supported_countries = ['FR']
+      self.supported_cardtypes = [:visa, :master, :american_express]
+      self.default_currency = 'EUR'
+      self.money_format = :cents
+
+      # These options are mandatory on be2bill (cf. tests) :
+      #
+      # options = { :order_id    => order.id,
+      #             :customer_id => user.id,
+      #             :description => "Some description",
+      #             :referrer    => request.env['HTTP_REFERER'],
+      #             :user_agent  => request.env['HTTP_USER_AGENT'],
+      #             :ip          => request.remote_ip,
+      #             :email       => user.email }
+
+      def initialize(options = {})
+        requires!(options, :login, :password)
+        super
+      end
+
+      def authorize(money, creditcard, options = {})
+        post = {}
+        add_invoice(post, options)
+        add_creditcard(post, creditcard)
+        add_customer_data(post, options)
+
+        commit('authorization', money, post)
+      end
+
+      def purchase(money, creditcard, options = {})
+        post = {}
+        add_invoice(post, options)
+        add_creditcard(post, creditcard)
+        add_customer_data(post, options)
+
+        commit('payment', money, post)
+      end
+
+      def capture(money, authorization, options = {})
+        post = {}
+        add_invoice(post, options)
+        post[:TRANSACTIONID] = authorization
+
+        commit('capture', money, post)
+      end
+
+      private
+
+      def add_customer_data(post, options)
+        post[:CLIENTREFERRER]  = options[:referrer]
+        post[:CLIENTUSERAGENT] = options[:user_agent]
+        post[:CLIENTIP]        = options[:ip]
+        post[:CLIENTEMAIL]     = options[:email]
+        post[:CLIENTIDENT]     = options[:customer_id]
+      end
+
+      def add_invoice(post, options)
+        post[:ORDERID]     = options[:order_id]
+        post[:DESCRIPTION] = options[:description]
+      end
+
+      def add_creditcard(post, creditcard)
+        post[:CARDFULLNAME]     = creditcard ? creditcard.name : ''
+        post[:CARDCODE]         = creditcard ? creditcard.number : ''
+        post[:CARDVALIDITYDATE] = creditcard ? "%02d-%02s" % [creditcard.month, creditcard.year.to_s[-2..-1]] : ''
+        post[:CARDCVV]          = creditcard ? creditcard.verification_value : ''
+      end
+
+      def parse(response)
+        ActiveSupport::JSON.decode(response)
+      end
+
+      def commit(action, money, parameters)
+        parameters[:IDENTIFIER] = @options[:login]
+        parameters[:AMOUNT]     = amount(money)
+        parameters[:VERSION]    = '2.0'
+
+        url = (test? ? self.test_url : self.live_url)
+        response = parse(ssl_post(url, post_data(action, parameters)))
+
+        Response.new(
+          successful?(response),
+          message_from(response),
+          response,
+          :authorization => response['TRANSACTIONID'],
+          :test          => test?
+        )
+      end
+
+      def successful?(response)
+        %w(0000 0001).include?(response['EXECCODE'])
+      end
+
+      def message_from(response)
+        if successful?(response)
+          "Approved : #{response['MESSAGE']}"
+        else
+          "Declined (#{response['EXECCODE']} - #{response['MESSAGE']}"
+        end
+      end
+
+      def post_data(action, parameters = {})
+        {
+          :method => action,
+          :params => parameters.merge(HASH: signature(parameters, action))
+        }.to_query
+      end
+
+      def signature(parameters, action)
+        parameters[:OPERATIONTYPE] = action unless parameters[:OPERATIONTYPE]
+
+        signature = @options[:password]
+        parameters.sort.each do |key, value|
+          signature += ("#{key.upcase}=#{value}" + @options[:password])
+        end
+
+        Digest::SHA256.hexdigest(signature)
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb

@@ -63,7 +63,7 @@ module ActiveMerchant #:nodoc:
         base.default_currency = 'CAD'
 
         # The countries the gateway supports merchants from as 2 digit ISO country codes
-        base.supported_countries = ['CA']
+        base.supported_countries = ['CA', 'US']
 
         # The card types supported by the payment gateway
         base.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]

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

@@ -14,8 +14,6 @@ module ActiveMerchant #:nodoc:
       AVS_ERRORS = %w( A E N R W Z )
       AVS_REASON_CODES = %w(27 45)
 
-      FRAUD_REVIEW_STATUSES = %w( E 0 )
-
       FIELD_MAP = {
         'TRANS_ID' => :transaction_id,
         'STATUS' => :response_code,
@@ -344,7 +342,6 @@ module ActiveMerchant #:nodoc:
         Response.new(success, message, parsed,
           :test          => test?,
           :authorization => (parsed[:rebid] && parsed[:rebid] != '' ? parsed[:rebid] : parsed[:transaction_id]),
-          :fraud_review  => FRAUD_REVIEW_STATUSES.include?(parsed[:response_code]),
           :avs_result    => { :code => parsed[:avs_result_code] },
           :cvv_result    => parsed[:card_code]
         )

data/lib/active_merchant/billing/gateways/braintree/braintree_common.rb

@@ -1,9 +1,9 @@
 module BraintreeCommon
   def self.included(base)
-    base.supported_countries = ['US']
+    base.supported_countries = %w(US CA AU AD AT BE BG CY CZ DK EE FI FR GI DE GR HU IS IM IE IT LV LI LT LU MT MC NL NO PL PT RO SM SK SI ES SE CH TR GB)
     base.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners_club]
     base.homepage_url = 'http://www.braintreepaymentsolutions.com'
     base.display_name = 'Braintree'
     base.default_currency = 'USD'
   end
-end
+end

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

@@ -23,33 +23,18 @@ module ActiveMerchant #:nodoc:
     # Setting an ActiveMerchant +wiredump_device+ will automatically
     # configure the Braintree logger (via the Braintree gem's
     # configuration) when the BraintreeBlueGateway is instantiated.
-    # Additionally, the log level will be set to +DEBUG+.  Therefore,
-    # all you have to do is set the +wiredump_device+ and you'll
-    # get your debug output from your HTTP interactions with the
-    # remote gateway. (Don't enable this in production.)
+    # Additionally, the log level will be set to +DEBUG+. Therefore,
+    # all you have to do is set the +wiredump_device+ and you'll get
+    # your debug output from your HTTP interactions with the remote
+    # gateway. (Don't enable this in production.) The ActiveMerchant
+    # implementation doesn't mess with the Braintree::Configuration
+    # globals at all, so there won't be any side effects outside
+    # Active Merchant.
     #
-    # For example:
+    # If no +wiredump_device+ is set, the logger in
+    # +Braintree::Configuration.logger+ will be cloned and the log
+    # level set to +WARN+.
     #
-    #     ActiveMerchant::Billing::BraintreeBlueGateway.wiredump_device = Logger.new(STDOUT)
-    #     # => #<Logger:0x107d385f8 ...>
-    #
-    #     Braintree::Configuration.logger
-    #     # => (some other logger, created by default by the gem)
-    #
-    #     Braintree::Configuration.logger.level
-    #     # => 1 (INFO)
-    #
-    #     ActiveMerchant::Billing::BraintreeBlueGateway.new(:merchant_id => 'x', :public_key => 'x', :private_key => 'x')
-    #
-    #     Braintree::Configuration.logger
-    #     # => #<Logger:0x107d385f8 ...>
-    #
-    #     Braintree::Configuration.logger.level
-    #     # => 0 (DEBUG)
-    #
-    #  Alternatively, you can avoid setting the +wiredump_device+
-    #  and set +Braintree::Configuration.logger+ and/or
-    #  +Braintree::Configuration.logger.level+ directly.
     class BraintreeBlueGateway < Gateway
       include BraintreeCommon
 
@@ -61,18 +46,24 @@ module ActiveMerchant #:nodoc:
 
         super
 
-        Braintree::Configuration.merchant_id = options[:merchant_id]
-        Braintree::Configuration.public_key = options[:public_key]
-        Braintree::Configuration.private_key = options[:private_key]
-        Braintree::Configuration.environment = (options[:environment] || (test? ? :sandbox : :production)).to_sym
-        Braintree::Configuration.custom_user_agent = "ActiveMerchant #{ActiveMerchant::VERSION}"
-
         if wiredump_device
-          Braintree::Configuration.logger = ((Logger === wiredump_device) ? wiredump_device : Logger.new(wiredump_device))
-          Braintree::Configuration.logger.level = Logger::DEBUG
+          logger = ((Logger === wiredump_device) ? wiredump_device : Logger.new(wiredump_device))
+          logger.level = Logger::DEBUG
         else
-          Braintree::Configuration.logger.level = Logger::WARN
+          logger = Braintree::Configuration.logger.clone
+          logger.level = Logger::WARN
         end
+
+        @configuration = Braintree::Configuration.new(
+          :merchant_id       => options[:merchant_id],
+          :public_key        => options[:public_key],
+          :private_key       => options[:private_key],
+          :environment       => (options[:environment] || (test? ? :sandbox : :production)).to_sym,
+          :custom_user_agent => "ActiveMerchant #{ActiveMerchant::VERSION}",
+          :logger            => logger,
+        )
+
+        @braintree_gateway = Braintree::Gateway.new( @configuration )
       end
 
       def authorize(money, credit_card_or_vault_id, options = {})
@@ -81,7 +72,7 @@ module ActiveMerchant #:nodoc:
 
       def capture(money, authorization, options = {})
         commit do
-          result = Braintree::Transaction.submit_for_settlement(authorization, amount(money).to_s)
+          result = @braintree_gateway.transaction.submit_for_settlement(authorization, amount(money).to_s)
           Response.new(result.success?, message_from_result(result))
         end
       end
@@ -101,7 +92,7 @@ module ActiveMerchant #:nodoc:
         money = amount(money).to_s if money
 
         commit do
-          result = Braintree::Transaction.refund(transaction_id, money)
+          result = @braintree_gateway.transaction.refund(transaction_id, money)
           Response.new(result.success?, message_from_result(result),
             {:braintree_transaction => (transaction_hash(result.transaction) if result.success?)},
             {:authorization => (result.transaction.id if result.success?)}
@@ -111,7 +102,7 @@ module ActiveMerchant #:nodoc:
 
       def void(authorization, options = {})
         commit do
-          result = Braintree::Transaction.void(authorization)
+          result = @braintree_gateway.transaction.void(authorization)
           Response.new(result.success?, message_from_result(result),
             {:braintree_transaction => (transaction_hash(result.transaction) if result.success?)},
             {:authorization => (result.transaction.id if result.success?)}
@@ -132,7 +123,7 @@ module ActiveMerchant #:nodoc:
               :expiration_year => creditcard.year.to_s
             }
           }
-          result = Braintree::Customer.create(merge_credit_card_options(parameters, options))
+          result = @braintree_gateway.customer.create(merge_credit_card_options(parameters, options))
           Response.new(result.success?, message_from_result(result),
             {
               :braintree_customer => (customer_hash(result.customer) if result.success?),
@@ -146,7 +137,7 @@ module ActiveMerchant #:nodoc:
       def update(vault_id, creditcard, options = {})
         braintree_credit_card = nil
         commit do
-          braintree_credit_card = Braintree::Customer.find(vault_id).credit_cards.detect { |cc| cc.default? }
+          braintree_credit_card = @braintree_gateway.customer.find(vault_id).credit_cards.detect { |cc| cc.default? }
           return Response.new(false, 'Braintree::NotFoundError') if braintree_credit_card.nil?
 
           options.merge!(:update_existing_token => braintree_credit_card.token)
@@ -159,14 +150,14 @@ module ActiveMerchant #:nodoc:
             }
           }, options)[:credit_card]
 
-          result = Braintree::Customer.update(vault_id,
+          result = @braintree_gateway.customer.update(vault_id,
             :first_name => creditcard.first_name,
             :last_name => creditcard.last_name,
             :email => options[:email],
             :credit_card => credit_card_params
           )
           Response.new(result.success?, message_from_result(result),
-            :braintree_customer => (customer_hash(Braintree::Customer.find(vault_id)) if result.success?),
+            :braintree_customer => (customer_hash(@braintree_gateway.customer.find(vault_id)) if result.success?),
             :customer_vault_id => (result.customer.id if result.success?)
           )
         end
@@ -174,7 +165,7 @@ module ActiveMerchant #:nodoc:
 
       def unstore(customer_vault_id, options = {})
         commit do
-          Braintree::Customer.delete(customer_vault_id)
+          @braintree_gateway.customer.delete(customer_vault_id)
           Response.new(true, "OK")
         end
       end
@@ -232,33 +223,46 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def response_params(result)
+        params = {}
+        if result.success?
+          params[:braintree_transaction] = transaction_hash(result.transaction)
+          params[:customer_vault_id] = result.transaction.customer_details.id
+        end
+        params
+      end
+
+      def response_options(result)
+        options = {}
+        if result.success?
+          options[:authorization] = result.transaction.id
+        end
+        if result.transaction
+          options[:avs_result] = {
+            :code => nil, :message => nil,
+            :street_match => result.transaction.avs_street_address_response_code,
+            :postal_match => result.transaction.avs_postal_code_response_code
+          }
+          options[:cvv_result] = result.transaction.cvv_response_code
+        end
+        options
+      end
+
+      def message_from_transaction_result(result)
+        if result.transaction && result.transaction.status == "gateway_rejected"
+          "Transaction declined - gateway rejected"
+        elsif result.transaction
+          "#{result.transaction.processor_response_code} #{result.transaction.processor_response_text}"
+        else
+          message_from_result(result)
+        end
+      end
+
       def create_transaction(transaction_type, money, credit_card_or_vault_id, options)
         transaction_params = create_transaction_parameters(money, credit_card_or_vault_id, options)
-
         commit do
-          result = Braintree::Transaction.send(transaction_type, transaction_params)
-          response_params, response_options, avs_result, cvv_result = {}, {}, {}, {}
-          if result.success?
-            response_params[:braintree_transaction] = transaction_hash(result.transaction)
-            response_params[:customer_vault_id] = result.transaction.customer_details.id
-            response_options[:authorization] = result.transaction.id
-          end
-          if result.transaction
-            response_options[:avs_result] = {
-              :code => nil, :message => nil,
-              :street_match => result.transaction.avs_street_address_response_code,
-              :postal_match => result.transaction.avs_postal_code_response_code
-            }
-            response_options[:cvv_result] = result.transaction.cvv_response_code
-            if result.transaction.status == "gateway_rejected"
-              message = "Transaction declined - gateway rejected"
-            else
-              message = "#{result.transaction.processor_response_code} #{result.transaction.processor_response_text}"
-            end
-          else
-            message = message_from_result(result)
-          end
-          response = Response.new(result.success?, message, response_params, response_options)
+          result = @braintree_gateway.transaction.send(transaction_type, transaction_params)
+          response = Response.new(result.success?, message_from_transaction_result(result), response_params(result), response_options(result))
           response.cvv_result['message'] = ''
           response
         end
@@ -398,4 +402,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-