activemerchant 1.38.0 → 1.78.0

data/CONTRIBUTORS

@@ -122,6 +122,7 @@ MerchantWARE (July 7, 2009)
 FirstPay (July 24, 2009)
 
 * Phil R
+* Ryan Daigle (rwdaigle)
 
 Ogone (July 20, 2009)
 
@@ -412,3 +413,156 @@ MerchantWare V4 (July 2013)
 Platron integration (July 2013)
 
 * Alexey Kiryushin (alexwl)
+
+MoneyMovers (September 2013)
+
+* Jeffery Utter (jeffutter)
+
+Be2Bill (September 2013)
+
+* Michaël Hoste (MichaelHoste)
+
+Conekta (October 2013)
+
+* Leo Fischer (leofischer)
+
+App55 (November 2013)
+
+* (ianbutler55)
+
+Swipe Checkout (November 2013)
+
+* (matt-optimizerhq)
+
+Raven PacNet (November 2013)
+
+* Luis Lopez (llopez)
+
+Payex (November 2013)
+
+* Tom Davies (atomgiant)
+
+Payscout (December 2013)
+
+* Luis Lopez (llopez)
+
+SoEasyPay (December 2013)
+
+* Ivan Radovanovic (ir-soeasycorp)
+
+Cecabank (February 2014)
+
+* Alberto Molpeceres (molpe)
+
+Openpay (February 2014)
+
+* (darkaz)
+
+maxiPago (February 2014)
+
+* (alexandremcosta)
+
+WePay (March 2014)
+
+* Faizal Zakaria (faizalzakaria)
+
+FirstGiving (March 2014)
+
+* Faizal Zakaria (faizalzakaria)
+
+BridgePay (April 2014)
+
+* Mark Bennett (markabe)
+
+PagoFacil (May 2014)
+
+* Benito Serna (bhserna)
+
+Cashnet (May 2014)
+
+* Tom Hoen (hoenth)
+
+Heartland Payment Systems (May 2014)
+
+* Mark Hagan (SecureSubmit)
+
+Borgun (June 2014)
+
+* Mark Bennett (markabe)
+
+Commercegate (June 2014)
+
+* Vitaliy (vitaliyvasin)
+
+Worldpay US (August 2014)
+
+* Mark Bennett (markabe)
+
+Checkout.com (September 2014)
+
+* (ravish-ramrakha-cko)
+
+Bank Frick (September 2014)
+
+* Piers Chambers (varyonic)
+
+Global Transport (September 2014)
+
+* Duff O'Melia (duff)
+
+IPP (December 2014)
+
+* (InfraRuby)
+
+QuickBooks Payments (January 2015)
+
+* Arbab Ahmed (bizla)
+* Ivan Sanchez (ivanfer)
+
+Axcess MS (February 2015)
+
+* Tim Tait (timtait)
+
+PayHub (February 2015)
+
+* Grep Ruby (grepruby)
+
+Qvalent (March 2015)
+
+* Mark Bennett (markabe)
+
+Worldpay Online Payments (April 2015)
+
+* (ao)
+
+PayU India (May 2015)
+
+* Nathaniel Talbott (ntalbott)
+
+SecurionPay (October 2015)
+
+* Michał Szajbe (szajbus)
+
+Komoju (October 2015)
+
+* Kazunori Kajihiro (k2nr)
+
+CAMS: Central Account Management System (October 2015)
+
+* Trevor Grayson (trevorgrayson)
+
+Transact Pro (October 2015)
+
+* Piers C (varyonic)
+
+Payeezy (October 2015)
+
+* Washington L Braga Jr (huoxito)
+
+Clearhaus (October 2015)
+
+* Dinesh Yadav (dinesh)
+
+Cardknox (November 2015)
+
+* (dlehren)

data/README.md

@@ -1,8 +1,8 @@
 # Active Merchant
-[![Build Status](https://secure.travis-ci.org/Shopify/active_merchant.png)](http://travis-ci.org/Shopify/active_merchant)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/Shopify/active_merchant)
+[![Build Status](https://travis-ci.org/activemerchant/active_merchant.png?branch=master)](https://travis-ci.org/activemerchant/active_merchant)
+[![Code Climate](https://codeclimate.com/github/activemerchant/active_merchant.png)](https://codeclimate.com/github/activemerchant/active_merchant)
 
-Active Merchant is an extraction from the e-commerce system [Shopify](http://www.shopify.com).
+Active Merchant is an extraction from the ecommerce system [Shopify](http://www.shopify.com).
 Shopify's requirements for a simple and unified API to access dozens of different payment
 gateways with very different internal APIs was the chief principle in designing the library.
 
@@ -17,13 +17,15 @@ from an ever-growing set of contributors.
 See [GettingStarted.md](GettingStarted.md) if you want to learn more about using Active Merchant in your
 applications.
 
+If you'd like to contribute to Active Merchant, please start with our [contribution guide](CONTRIBUTING.md).
+
 ## Installation
 
 ### From Git
 
 You can check out the latest source from git:
 
-    git clone git://github.com/Shopify/active_merchant.git
+    git clone git://github.com/activemerchant/active_merchant.git
 
 ### From RubyGems
 
@@ -40,182 +42,193 @@ Or, if you're using Bundler, just add the following to your Gemfile:
 This simple example demonstrates how a purchase can be made using a person's
 credit card details.
 
-    require 'rubygems'
-    require 'active_merchant'
-
-    # Use the TrustCommerce test servers
-    ActiveMerchant::Billing::Base.mode = :test
-
-    gateway = ActiveMerchant::Billing::TrustCommerceGateway.new(
-                :login => 'TestMerchant',
-                :password => 'password')
-
-    # ActiveMerchant accepts all amounts as Integer values in cents
-    amount = 1000  # $10.00
-
-    # The card verification value is also known as CVV2, CVC2, or CID
-    credit_card = ActiveMerchant::Billing::CreditCard.new(
-                    :first_name         => 'Bob',
-                    :last_name          => 'Bobsen',
-                    :number             => '4242424242424242',
-                    :month              => '8',
-                    :year               => Time.now.year+1,
-                    :verification_value => '000')
-
-    # Validating the card automatically detects the card type
-    if credit_card.valid?
-      # Capture $10 from the credit card
-      response = gateway.purchase(amount, credit_card)
-
-      if response.success?
-        puts "Successfully charged $#{sprintf("%.2f", amount / 100)} to the credit card #{credit_card.display_number}"
-      else
-        raise StandardError, response.message
-      end
-    end
+```ruby
+require 'active_merchant'
+
+# Use the TrustCommerce test servers
+ActiveMerchant::Billing::Base.mode = :test
+
+gateway = ActiveMerchant::Billing::TrustCommerceGateway.new(
+            :login => 'TestMerchant',
+            :password => 'password')
+
+# ActiveMerchant accepts all amounts as Integer values in cents
+amount = 1000  # $10.00
+
+# The card verification value is also known as CVV2, CVC2, or CID
+credit_card = ActiveMerchant::Billing::CreditCard.new(
+                :first_name         => 'Bob',
+                :last_name          => 'Bobsen',
+                :number             => '4242424242424242',
+                :month              => '8',
+                :year               => Time.now.year+1,
+                :verification_value => '000')
+
+# Validating the card automatically detects the card type
+if credit_card.validate.empty?
+  # Capture $10 from the credit card
+  response = gateway.purchase(amount, credit_card)
+
+  if response.success?
+    puts "Successfully charged $#{sprintf("%.2f", amount / 100)} to the credit card #{credit_card.display_number}"
+  else
+    raise StandardError, response.message
+  end
+end
+```
 
 For more in-depth documentation and tutorials, see [GettingStarted.md](GettingStarted.md) and the
-[API documentation](http://rubydoc.info/github/Shopify/active_merchant/master/file/README.md).
+[API documentation](http://www.rubydoc.info/github/activemerchant/active_merchant/).
 
-## Supported Direct Payment Gateways
+## Supported Payment Gateways
 
-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).
+The [ActiveMerchant Wiki](http://github.com/activemerchant/active_merchant/wikis) contains a [table of features supported by each gateway](http://github.com/activemerchant/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/) - AD, AT, AU, BE, BG, CA, CH, CY, CZ, DE, DK, ES, FI, FR, GB, GB, GI, GR, HU, IE, IT, LI, LU, MC, MT, NL, NO, PL, PT, RO, SE, SI, SK, SM, TR, US, VA
+* [Axcess MS](http://www.axcessms.com/) - AD, AT, BE, BG, BR, CA, CH, CY, CZ, DE, DK, EE, ES, FI, FO, FR, GB, GI, GR, HR, HU, IE, IL, IM, IS, IT, LI, LT, LU, LV, MC, MT, MX, NL, NO, PL, PT, RO, RU, SE, SI, SK, TR, US, VA
 * [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
+* [Bank Frick](http://www.bankfrickacquiring.com/) - LI, US
+* [Banwire](http://www.banwire.com/) - MX
+* [Barclays ePDQ Extra Plus](http://www.barclaycard.co.uk/business/accepting-payments/epdq-ecomm/) - 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
+* [Borgun](https://www.borgun.is/) - IS
+* [Braintree](https://www.braintreepayments.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
+* [BridgePay](http://www.bridgepaynetwork.com/) - CA, US
+* [Cardknox](https://www.cardknox.com/) - US, CA, GB
+* [CardSave](http://www.cardsave.net/) - GB
+* [CardStream](http://www.cardstream.com/) - GB
+* [Cashnet](http://www.higherone.com/) - US
+* [Cecabank](http://www.ceca.es/es/) - ES
+* [Cenpos](https://www.cenpos.com/) - AD, AI, AG, AR, AU, AT, BS, BB, BE, BZ, BM, BR, BN, BG, CA, HR, CY, CZ, DK, DM, EE, FI, FR, DE, GR, GD, GY, HK, HU, IS, IN, IL, IT, JP, LV, LI, LT, LU, MY, MT, MX, MC, MS, NL, PA, PL, PT, KN, LC, MF, VC, SM, SG, SK, SI, ZA, ES, SR, SE, CH, TR, GB, US, UY
+* [CAMS: Central Account Management System](https://www.centralams.com/) - US
+* [Checkout.com](https://www.checkout.com/) - AT, BE, BG, CY, CZ, DE, DK, EE, ES, FI, FR, GR, HR, HU, IE, IS, IT, LI, LT, LU, LV, MT, MU, NL, NO, PL, PT, RO, SE, SI, SK, US
+* [Clearhaus](https://www.clearhaus.com) - AD, AT, BE, BG, CH, CY, CZ, DE, DK, EE, ES, FI, FO, FR, GB, GL, GR, HR, HU, IE, IS, IT, LI, LT, LU, LV, MT, NL, NO, PL, PT, RO, SE, SI, SK
+* [Commercegate](http://www.commercegate.com/) - AD, AT, AX, BE, BG, CH, CY, CZ, DE, DK, ES, FI, FR, GB, GG, GI, GR, HR, HU, IE, IM, IS, IT, JE, LI, LT, LU, LV, MC, MT, NL, NO, PL, PT, RO, SE, SI, SK, VA
+* [Conekta](https://conekta.io) - MX
+* [CyberSource](http://www.cybersource.com) - US, BR, CA, CN, DK, FI, FR, DE, JP, MX, NO, SE, GB, SG
+* [DIBS](http://www.dibspayment.com/) - US, FI, NO, SE, GB
+* [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](http://www.eway.com.au/) - AU, NZ, GB, SG
 * [E-xact](http://www.e-xact.com) - CA, US
-* [Fat Zebra](https://www.fatzebra.com.au) - AU
+* [Ezic](http://www.ezic.com/) - AU, CA, CN, FR, DE, GI, IL, MT, MU, MX, NL, NZ, PA, PH, RU, SG, KR, ES, KN, GB
+* [Fat Zebra](https://www.fatzebra.com.au/) - AU
 * [Federated Canada](http://www.federatedcanada.com/) - CA
 * [Finansbank WebPOS](https://www.fbwebpos.com/) - US, TR
+* [Flo2Cash](http://www.flo2cash.co.nz/) - NZ
+* [1stPayGateway.Net](http://1stpaygateway.net/) - 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
+* [FirstGiving](http://www.firstgiving.com/) - US
+* [Garanti Sanal POS](https://sanalposweb.garanti.com.tr) - US, TR
+* [Global Transport](https://www.globalpaymentsinc.com) - CA, PR, US
 * [HDFC](http://www.hdfcbank.com/sme/sme-details/merchant-services/guzh6m0i) - IN
-* [Inspire](http://www.inspiregateway.com) - US
+* [Heartland Payment Systems](http://developer.heartlandpaymentsystems.com/SecureSubmit/) - US
+* [iATS Payments](http://home.iatspayments.com/) - AU, BR, CA, CH, DE, DK, ES, FI, FR, GR, HK, IE, IT, NL, NO, PT, SE, SG, TR, UK, US
+* [Inspire Commerce](http://www.inspiregateway.com) - US
 * [InstaPay](http://www.instapayllc.com) - US
-* [Iridium](http://www.iridiumcorp.co.uk/) - UK, ES
+* [IPP](http://www.ippayments.com.au/) - AU
+* [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
+* [Komoju](http://www.komoju.com/) - JP
 * [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
-* [Mercury](http://www.mercurypay.com) - US
+* [Litle & Co.](http://www.litle.com/) - US
+* [maxiPago!](http://www.maxipago.com/) - BR
+* [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, CA
+* [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
+* [MONEI](http://www.monei.net/) - AD, AT, BE, BG, CA, 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, US, VA
 * [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
+* [NELiX TransaX](https://www.nelixtransax.com/) - US
 * [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
+* [Omise](https://www.omise.co/) - TH, JP
+* [Openpay](Openpay) - MX
+* [Optimal Payments](http://www.optimalpayments.com/) - CA, US, GB
+* [Orbital Paymentech](http://chasepaymentech.com/) - US, CA
+* [Pagar.me](https://pagar.me/) - BR
+* [PagoFacil](http://www.pagofacil.net/) - MX
+* [PayConex](http://www.bluefincommerce.com/) - US, CA
 * [PayGate PayXML](http://paygate.co.za/) - US, ZA
+* [PayHub](http://www.payhub.com/) - US
 * [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
-* [Pin](http://www.pin.net.au/) - AU
+* [Paybox Direct](http://www.paybox.com/) - FR
+* [Payeezy](https://developer.payeezy.com/) - CA, US
+* [Payex](http://payex.com/) - DK, FI, NO, SE
+* [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
+* [Payscout](http://www.payscout.com/) - US
+* [Paystation](http://paystation.co.nz) - NZ
+* [Pay Way](http://www.payway.com.au) - AU
+* [PayU India](https://www.payu.in/) - IN
+* [Pin Payments](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
-* [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
+* [QuickBooks Payments](http://payments.intuit.com/) - US
+* [Quantum Gateway](http://www.quantumgateway.com) - US
+* [QuickPay](http://quickpay.net/) - DE, DK, ES, FI, FR, FO, GB, IS, NO, SE
+* [Qvalent](https://www.qvalent.com/) - AU
+* [Raven](http://www.deepcovelabs.com/raven) - AI, AN, AT, AU, BE, BG, BS, BZ, CA, CH, CR, CY, CZ, DE, DK, DM, DO, EE, EL, ES, FI, FR, GB, GG, GI, HK, HR, HU, IE, IL, IM, IN, IT, JE, KN, LI, LT, LU, LV, MH, MT, MY, NL, NO, NZ, PA, PE, PH, PL, PT, RO, RS, SC, SE, SG, SI, SK, UK, US, VG, ZA
+* [Realex](http://www.realexpayments.com/) - IE, GB, FR, BE, NL, LU, IT
+* [Redsys](http://www.redsys.es/) - ES
+* [S5](http://www.s5.dk/) - DK
+* [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
+* [SecureNet](http://www.securenet.com/) - US
+* [SecurePay](http://www.securepay.com/) - US, CA, GB, AU
 * [SecurePayTech](http://www.securepaytech.com/) - NZ
+* [SecurionPay](https://securionpay.com/) - AD, AE, AF, AG, AI, AL, AM, AO, AR, AS, AT, AU, AW, AX, AZ, BA, BB, BD, BE, BF, BG, BH, BI, BJ, BL, BM, BN, BO, BR, BS, BT, BV, BW, BY, BZ, CA, CC, CD, CF, CG, CH, CI, CK, CL, CM, CN, CO, CR, CU, CV, CW, CX, CY, CZ, DE, DJ, DK, DM, DO, DZ, EC, EE, EG, EH, ER, ES, ET, FI, FJ, FK, FM, FO, FR, GA, GB, GD, GE, GF, GG, GH, GI, GL, GM, GN, GP, GQ, GR, GS, GT, GU, GW, GY, HK, HM, HN, HR, HT, HU, ID, IE, IL, IM, IN, IO, IQ, IR, IS, IT, JE, JM, JO, JP, KE, KG, KH, KI, KM, KN, KP, KR, KW, KY, KZ, LA, LB, LC, LI, LK, LR, LS, LT, LU, LV, LY, MA, MC, MD, ME, MF, MG, MH, MK, ML, MM, MN, MO, MP, MQ, MR, MS, MT, MU, MV, MW, MX, MY, MZ, NA, NC, NE, NF, NG, NI, NL, NO, NP, NR, NU, NZ, OM, PA, PE, PF, PG, PH, PK, PL, PM, PN, PR, PS, PT, PW, PY, QA, RE, RO, RS, RU, RW, SA, SB, SC, SD, SE, SG, SH, SI, SJ, SK, SL, SM, SN, SO, SR, ST, SV, SY, SZ, TC, TD, TF, TG, TH, TJ, TK, TL, TM, TN, TO, TR, TT, TV, TW, TZ, UA, UG, UM, US, UY, UZ, VA, VC, VE, VG, VI, VN, VU, WF, WS, YE, YT, ZA, ZM, ZW
 * [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
+* [SoEasyPay](http://www.soeasypay.com/) - US, CA, AT, BE, BG, HR, CY, CZ, DK, EE, FI, FR, DE, GR, HU, IE, IT, LV, LT, LU, MT, NL, PL, PT, RO, SK, SI, ES, SE, GB, IS, NO, CH
+* [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/) - AT, AU, BE, CA, CH, DE, DK, ES, FI, FR, GB, IE, IT, LU, NL, NO, SE, SG, US
+* [Swipe](https://www.swipehq.com/checkout) - CA, NZ
+* [TNS](http://www.tnsi.com/) - AR, AU, BR, FR, DE, HK, MX, NZ, SG, GB, US
+* [Transact Pro](https://www.transactpro.lv/business/online-payments-acceptance) - US
 * [TransFirst](http://www.transfirst.com/) - US
 * [Transnational](http://www.tnbci.com/) - US
 * [TrustCommerce](http://www.trustcommerce.com/) - US
 * [USA ePay](http://www.usaepay.com/) - US
+* [Vanco Payment Solutions](http://vancopayments.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
 * [WebPay](https://webpay.jp/) - JP
-* [Wirecard](http://www.wirecard.com) - DE
-* [WorldPay](http://www.worldpay.com) - AU, HK, UK, US
-
-## Supported Offsite Payment Gateways
-
-* [2 Checkout](http://www.2checkout.com)
-* [A1Agregator](http://a1agregator.ru/) - RU
-* [Authorize.Net SIM](http://developer.authorize.net/api/sim/) - US
-* [Banca Sella GestPay](https://www.sella.it/banca/ecommerce/gestpay/gestpay.jsp)
-* [Chronopay](http://www.chronopay.com)
-* [DirecPay](http://www.timesofmoney.com/direcpay/jsp/home.jsp)
-* [Direct-eBanking / sofortueberweisung.de by Payment-Networks AG](https://www.payment-network.com/deb_com_en/merchantarea/home) - DE, AT, CH, BE, UK, NL
-* [Dotpay](http://dotpay.pl)
-* [Dwolla](https://www.dwolla.com/default.aspx)
-* [ePay](http://www.epay.dk/epay-payment-solutions/)
-* [First Data](https://firstdata.zendesk.com/entries/407522-first-data-global-gateway-e4sm-payment-pages-integration-manual)
-* [HiTRUST](http://www.hitrust.com.hk/)
-* [Moneybookers](http://www.moneybookers.com)
-* [Nochex](http://www.nochex.com)
-* [Paxum](https://www.paxum.com/)
-* [PayPal Website Payments Standard](https://www.paypal.com/cgi-bin/webscr?cmd#_wp-standard-overview-outside)
-* [Paysbuy](https://www.paysbuy.com/) - TH
-* [Platron](https://www.platron.ru/) - RU
-* [RBK Money](https://rbkmoney.ru/) - RU
-* [Robokassa](http://robokassa.ru/) - RU
-* [SagePay Form](http://www.sagepay.com/products_services/sage_pay_go/integration/form)
-* [Suomen Maksuturva](https://www.maksuturva.fi/services/vendor_services/integration_guidelines.html)
-* [Valitor](http://www.valitor.is/) - IS
-* [Verkkomaksut](http://www.verkkomaksut.fi) - FI
-* [WebMoney](http://www.webmoney.ru) - RU
-* [WebPay](http://webpay.by/)
-* [WorldPay](http://www.worldpay.com)
-
-## Contributing
-
-The source code is hosted at [GitHub](http://github.com/Shopify/active_merchant), and can be fetched using:
-
-    git clone git://github.com/Shopify/active_merchant.git
-
-Please see the [ActiveMerchant Guide to Contributing](http://github.com/Shopify/active_merchant/wikis/contributing) for
-information on adding a new gateway to ActiveMerchant.
-
-Please don't touch the CHANGELOG in your pull requests, we'll add the appropriate CHANGELOG entries
-at release time.
+* [WePay](https://www.wepay.com/) - 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 Global](http://www.worldpay.com/) - HK, 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
+* [Worldpay Online](https://online.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
+* [Worldpay US](http://www.worldpay.com/us) - US
+
+## API stability policy
+
+Functionality or APIs that are deprecated will be marked as such. Deprecated functionality is removed on major version changes - for example, deprecations from 2.x are removed in 3.x.

data/lib/active_merchant/billing/apple_pay_payment_token.rb

@@ -0,0 +1,22 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class ApplePayPaymentToken < PaymentToken
+      # This is a representation of the token object specified here:
+      # https://developer.apple.com/library/ios/documentation/PassKit/Reference/PKPaymentToken_Ref/
+      # https://developer.apple.com/library/IOs//documentation/PassKit/Reference/PaymentTokenJSON/PaymentTokenJSON.html
+
+      attr_reader :payment_instrument_name, :payment_network
+      attr_accessor :transaction_identifier
+
+      def initialize(payment_data, options = {})
+        super
+        @payment_instrument_name = @metadata[:payment_instrument_name]
+        @payment_network = @metadata[:payment_network]
+      end
+
+      def type
+        'apple_pay'
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/base.rb

@@ -1,24 +1,21 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Base
-      # Set ActiveMerchant gateways in test mode.
-      #
-      #   ActiveMerchant::Billing::Base.gateway_mode = :test
-      mattr_accessor :gateway_mode
+      GATEWAY_MODE_DEPRECATION_MESSAGE = 'Base#gateway_mode is deprecated in favor of Base#mode and will be removed in a future version'
 
-      # Set ActiveMerchant integrations in test mode.
+      # Set ActiveMerchant gateways in test mode.
       #
-      #   ActiveMerchant::Billing::Base.integration_mode = :test
-      mattr_accessor :integration_mode
-
-      # Set both the mode of both the gateways and integrations
-      # at once
-      mattr_reader :mode
+      #   ActiveMerchant::Billing::Base.mode = :test
+      mattr_accessor :mode
 
-      def self.mode=(mode)
+      def self.gateway_mode=(mode)
+        ActiveMerchant.deprecated(GATEWAY_MODE_DEPRECATION_MESSAGE)
         @@mode = mode
-        self.gateway_mode = mode
-        self.integration_mode = mode
+      end
+
+      def self.gateway_mode
+        ActiveMerchant.deprecated(GATEWAY_MODE_DEPRECATION_MESSAGE)
+        @@mode
       end
 
       self.mode = :production
@@ -31,8 +28,15 @@ module ActiveMerchant #:nodoc:
       #
       #   ActiveMerchant::Billing::Base.gateway('moneris').new
       def self.gateway(name)
-        raise NameError if (name_str = name.to_s.downcase).blank?
-        Billing.const_get("#{name_str}_gateway".camelize)
+        name_str = name.to_s.strip.downcase
+
+        raise(ArgumentError, 'A gateway provider must be specified') if name_str.blank?
+
+        begin
+          Billing.const_get("#{name_str}_gateway".camelize)
+        rescue
+          raise ArgumentError, "The specified gateway is not valid (#{name_str})"
+        end
       end
 
       # Return the matching integration module
@@ -50,7 +54,7 @@ module ActiveMerchant #:nodoc:
 
       # A check to see if we're in test mode
       def self.test?
-        self.gateway_mode == :test
+        mode == :test
       end
     end
   end