activemerchant 1.43.3 → 1.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50a846b9a9db8cf2d0e312e61922fdf1137025da
-  data.tar.gz: dfa97ca45ffb0a8c6efa5d46c9c58db9212db939
+  metadata.gz: d6f6350dd6dcbf03304d68abaa5951cf93b39271
+  data.tar.gz: 874d8aad77c49efaa81ca98225d8b7b566aecbd5
 SHA512:
-  metadata.gz: 8d77ae240d16d109ac42577cbc89baf6f9ae44fe9776f688be2201dc3ede75d87a300b2bc4dc41034b2c314a11623aa54b20765249e165ceef82a68a49fa4e14
-  data.tar.gz: bf216452d8ba515374a8e9afbaaab8f8f9f3ed1fbc564fe8cf1baea02adeb0a10d1f66661ef7bea0e25818681d640e398ccb516545f230f5bdf00fe940a31dd1
+  metadata.gz: df7e536c37cae9468a2653bba56da6d32bbd916648b92545d13bbc943ebb9f3a22e4fb19604d2a81300599b76ef482f54706aa8f0e40aa34ba8bf31e605d4501
+  data.tar.gz: 48d8f534d14607ac5cdd001ce7d0d6ea9e5492973adb9d3a0fbe86e338fbd2bf31a6575d6ac3ff4e56b794bffb945e5d0e206885202d3ec86577a52b77a3c53e

data/CHANGELOG

@@ -1,8 +1,138 @@
 = ActiveMerchant CHANGELOG
 
-== Version 1.43.3 (July 18, 2014)
-
-* Netregistry: Use updated URL [bslobodin]
+== Version 1.44.0 (Aug 21, 2014)
+
+* Moneris: Add :avs_enabled option [bslobodin]
+* Stripe: Populate authorization in failed responses, when available [bslobodin]
+* Moneris: Use the name on the card [duff]
+* Balanced: More 1.1 API fixes and mappings [ntalbott]
+* Balanced: Handle "pending" refunds [duff]
+* Immediately convert credit card date fields to integers [ntalbott]
+* Balanced: Handle outside card tokens [ntalbott]
+* Balanced: Do not pass address if zip is missing [ntalbott]
+* Float active_utils at the patch version instead of the minor version [nwjsmith]
+* Wirecard: Fix CVV & AVS response handling [alevett]
+* Consolidate deprecation handling [ntalbott]
+* Authorize.Net CIM: Do not send x_test_request [danrabinowitz]
+* Authorize.Net CIM: Pass delimiter through [jsoma]
+* HPS: Add support for track data [SecureSubmit]
+* HPS: Fix processing without an address [SecureSubmit]
+* Balanced: Do not pass address if zip is blank [duff]
+* Do CreditCard attribute cleanup at assignment [ntalbott]
+* eWay Rapid: Add auth/capture/void support [ntalbott]
+* [POSSIBLE BREAKAGE] Remove dependency on active_utils Validateable [ntalbott]
+* Make all active_utils requires explicit [ntalbott]
+* Balanced: Handle legacy card tokens [ntalbott]
+* Braintree Blue: Default verification merchant id [speric]
+* [POSSIBLE BREAKAGE] Extract integrations into an offsite_payments gem [ntalbott]
+* [POSSIBLE BREAKAGE] Drop stated/tested compatibility with Rails < 3.2 [ntalbott]
+* Stop requiring unused CurrencyCode class from active_utils [ntalbott]
+* Move ActiveMerchant::Error into ActiveMerchant [ntalbott]
+* Inline RequiresParameters in Gateway & move Country from active_utils [ntalbott]
+* Quickpay v7: Fix passing acquirers field [moklett]
+* Quickpay v7: Pass an amount when storing cards [ta & moklett]
+* Quickpay: Expand list of supported countries [ta]
+* Validate CreditCard verification value [mnoack]
+* Authorize.Net CIM: Allow updating a payment profile without a full credit card number [speric]
+* Wirecard: Add optional CommerceType element [timtait]
+* Add Borgun gateway [markabe]
+* [POSSIBLE BREAKAGE] NAB Transact: Allow timeout customization [duff]
+* Wirecard: Add card store and purchase/authorize by reference [speric]
+* Worldpay: Add support for Switch cards [dougal]
+* FirstData e4: Send correct card type [npverni]
+* Elavon: Add store/update support [npverni]
+* Wirecard: Catch an empty ERROR <Message> Element [timtait]
+* Finansbank (CC5): Add void/refund/credit support [muhammetdilek]
+* Wirecard: Use authorization_check for Amex store [npverni]
+* Elavon: Make void work for authorizations [duff]
+* Add Commercegate gateway [vitaliyvasin]
+* Wirecard: Fix "amex" references [mendable]
+* HPS: Do not pass empty elements [SecureSubmit]
+* Paymill: Add more supported card types [nikoloff]
+* Paymill: Add source [nikoloff]
+* Paymill: Add description for preauthorizations [nikoloff]
+* Paymill: Add remote tests using tokens [nikoloff]
+* HPS: Add developer, version number and site trace options [SecureSubmit]
+* Update 1stPayGateway.Net gateway [rwdaigle]
+* Payflow: Add verbosity option [doppler]
+* Allow ignoring the result of any MultiResponse step [ntalbott]
+* Stripe: Add ability to verify a card [duff]
+* Paypal: Add ability to verify a card [duff]
+* Authorize.net: Add ability to verify a card [duff]
+* Braintree: Add ability to verify a card [duff]
+* Enhance gateway generator to support verify [duff]
+* PayPal Express: Add funding source support [baraabourghli]
+* Optimal: Add IP address to requests [justinplouffe]
+* Pin: Add authorize & capture support [keithpitt]
+* Pin: Add update support [keithpitt]
+* Vindicia: Stop using the vindicia-api gem [ntalbott]
+* Clean up the warnings fog [ntalbott]
+* Quickpay: Map options[:ip] for fraud analysis [ta]
+* SagePay: Truncate fields [duff]
+* First Data E4: Add ability to verify a card [duff]
+* Elavon: Add ability to verify a card [duff]
+* Worldpay: Pass email and IP address [duff]
+* Worldpay: Use updated address format [duff]
+* Moneris: Fix address splitting [ntalbott]
+* FirstData E4: Allow passing CAVV through [Senjai]
+* Braintree Blue: Remember the capture transaction id [duff]
+* Eway Rapid: Truncate some fields [duff]
+* Optimal Payment: Make account mandatory field [rwdaigle]
+* Worldpay: Improve address defaulting [duff]
+* Authorize.Net: Add maestro as a supported card type [vparihar01]
+* Worldpay: Improve address defaults [duff]
+* Braintree Blue: Pass cardholder_name when tokenizing [radar]
+* Wirecard: Improve error handling [mendable]
+* Litle: Add verify support [markabe]
+* USAePay: Add verify support [markabe]
+* BridgePay: Add verify support [duff]
+* Braintree Blue: Add payment_method_token flag [JDutil]
+* SagePay: Add optional FI fields [rob-anderson]
+* Iridium: Add AVS and CVV results [X0Refraction]
+* NAB Transact: Add credit support [nagash]
+* Braintree Blue: Add application_id support [npverni]
+* Realex: Add maestro mapping [uriklar]
+* Add Worldpay US gateway [markabe]
+* Cybersource: Add shipping address [pkoppula]
+
+== Version 1.43.2 (May 12, 2014)
+
+* Remove 2Checkout's #line_item due to conflict with Klarna/Shopify [edward]
+* Auth.Net CIM: Fix ordering of order/trans_id [pdamer]
+* Add PagoFacil gateway [bhserna, abisosa]
+* [POSSIBLE BREAKAGE] Stripe: Allow for updating of stored card [speric]
+* Authorize.Net: Deprecate ARB [ntalbott]
+* Authorize.Net CIM: Add recurring billing flag [gabealmer]
+* Spreedly: Add support for :ip [megamoose]
+* PayPal Express: Improve received_at handling [jwarchol]
+* PayPal Express: Add ReqBillingAddress flag [johnb-razoo]
+* Beanstream: Add support for Legato single use tokens [tylerrooney]
+* PayPal Digital Goods: Allow mobile [tomprats]
+* Maxipago: Add installment support [alexandremcosta]
+* Deprecate recurring API support [ntalbott]
+* NMI: fix CreditCard check [bslobodin]
+* SagePay: Add tokenization support [kernow]
+* PayPal Express: Reference transaction details [lrostovsky]
+* Balanced: Update to API 1.1 [steveklabnik]
+* Add Cashnet gateway [hoenth]
+* Conekta: Standardize address options [MauricioMurga]
+* Wirecard: Add support for reference purchases [timtait]
+* Worldpay: Add support for external references [matsubo]
+* Balanced: Voiding a capture is not allowed [duff]
+* Add HPS gateway (Heartland Payment Systems) [SecureSubmit]
+* Balanced: Fix handling of 500 errors [ntalbott]
+* Universal: Remove all billing address fields [bslobodin]
+* Balanced: Stop creating a customer on each call [ntalbott]
+* Balanced: Refactor and handle legacy authorizations [ntalbott]
+* SagePay Form: Update to v3.00 [bslobodin]
+* GestPay: Use a more specific error class when parsing [odorcicd]
+* PagSeguro: Improve error handling [celsodantas]
+* PxPay: Support for newer, query-less redirect URLs [odorcicd, bslobodin]
+* eWAY Rapid: Update to 3.1 API [atomgiant]
+* Misc refactorings [justinplouffe]
+* Remove greedy rescue, and convert some errors to be user-facing [odorcicd]
+* PayPal Express: pass logo image for setup request [dimko]
+* Improve credit card validation [duff]
 
 == Version 1.43.1 (May 1, 2014)
 

data/CONTRIBUTORS

@@ -122,6 +122,7 @@ MerchantWARE (July 7, 2009)
 FirstPay (July 24, 2009)
 
 * Phil R
+* Ryan Daigle (rwdaigle)
 
 Ogone (July 20, 2009)
 
@@ -472,3 +473,27 @@ FirstGiving (March 2014)
 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)

data/README.md

@@ -64,7 +64,7 @@ credit_card = ActiveMerchant::Billing::CreditCard.new(
                 :verification_value => '000')
 
 # Validating the card automatically detects the card type
-if credit_card.valid?
+if credit_card.validate.empty?
   # Capture $10 from the credit card
   response = gateway.purchase(amount, credit_card)
 
@@ -79,7 +79,7 @@ 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).
 
-## 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).
 
@@ -93,12 +93,15 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [Be2Bill](http://www.be2bill.com/) - FR
 * [Beanstream.com](http://www.beanstream.com/) - CA, US
 * [BluePay](http://www.bluepay.com/) - US
+* [Borgun](https://www.borgun.is/) - IS
 * [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
 * [BridgePay](http://www.bridgepaynetwork.com/) - CA, US
 * [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
 * [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
+* [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
 * [DataCash](http://www.datacash.com/) - GB
@@ -112,12 +115,13 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [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
+* [1stPayGateway.Net](http://1stpaygateway.net/) - US
 * [FirstData Global Gateway e4](http://www.firstdata.com) - CA, US
 * [FirstGiving](http://www.firstgiving.com/) - US
 * [Garanti Sanal POS](https://sanalposweb.garanti.com.tr) - US, TR
 * [HDFC](http://www.hdfcbank.com/sme/sme-details/merchant-services/guzh6m0i) - IN
-* [iATS Payments](http://home.iatspayments.com/) - AU, CA, CH, DE, DK, ES, FI, FR, GR, HK, IE, IT, JP, NL, NO, NZ, PT, SE, SG, TR, UK, 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/) - GB, ES
@@ -147,11 +151,12 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [Openpay](Openpay) - MX
 * [Optimal Payments](http://www.optimalpayments.com/) - CA, US, GB
 * [Orbital Paymentech](http://chasepaymentech.com/) - US, CA
+* [PagoFacil](http://www.pagofacil.net/) - MX
 * [PayGate PayXML](http://paygate.co.za/) - US, ZA
 * [PayJunction](http://www.payjunction.com/) - US
 * [PaySecure](http://www.commsecure.com.au/paysecure.shtml) - AU
 * [Paybox Direct](http://www.paybox.com/) - FR
-* [Payex](http://payex.com/) - DK, NO, SE
+* [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
@@ -170,7 +175,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [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
+* [QuickPay](http://quickpay.net/) - DE, DK, ES, FI, FR, FO, GB, IS, NO, SE
 * [Raven PacNet](http://www.pacnetservices.com/) - US
 * [Realex](http://www.realexpayments.com/) - IE, GB, FR, BE, NL, LU, IT
 * [Redsys](http://www.redsys.es/) - ES
@@ -184,7 +189,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [SkipJack](http://www.skipjack.com/) - US, CA
 * [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/) - US, CA, GB, AU, IE, FR, NL, BE, DE, ES
+* [Stripe](https://stripe.com/) - AU, BE, CA, CH, DE, ES, FI, FR, GB, IE, IT, LU, NL, US
 * [Swipe](https://www.swipehq.com/checkout) - CA, NZ
 * [TransFirst](http://www.transfirst.com/) - US
 * [NELiX TransaX](https://www.nelixtransax.com/) - US
@@ -197,38 +202,8 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [WebPay](https://webpay.jp/) - JP
 * [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](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
-
-* [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)
-* [Doku](http://doku.com)
-* [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)
+* [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
+* [Worldpay US](http://www.worldpay.com/us) - US
 
 ## Contributing
 

data/lib/active_merchant.rb

@@ -27,6 +27,7 @@ require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/hash/conversions'
 require 'active_support/core_ext/object/conversions'
 require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/enumerable.rb'
 
 if(!defined?(ActiveSupport::VERSION) || (ActiveSupport::VERSION::STRING < "4.1"))
   require 'active_support/core_ext/class/attribute_accessors'
@@ -55,13 +56,53 @@ require 'securerandom'
 require 'builder'
 require 'cgi'
 require 'rexml/document'
+require 'timeout'
+require 'socket'
+
+require 'active_utils/common/network_connection_retries'
+silence_warnings{require 'active_utils/common/connection'}
+require 'active_utils/common/post_data'
+require 'active_utils/common/posts_data'
 
-require 'active_utils'
 require 'active_merchant/billing'
 require 'active_merchant/version'
+require 'active_merchant/country'
+
+I18n.enforce_available_locales = false
 
 module ActiveMerchant #:nodoc:
+  OFFSITE_PAYMENT_EXTRACTION_MESSAGE = "Integrations have been extracted into a separate gem (https://github.com/Shopify/offsite_payments) and will no longer be loaded by ActiveMerchant 2.x."
+
   module Billing #:nodoc:
-    autoload :Integrations, 'active_merchant/billing/integrations'
+    def self.const_missing(name)
+      if name.to_s == "Integrations"
+        ActiveMerchant.deprecated(OFFSITE_PAYMENT_EXTRACTION_MESSAGE)
+        require "active_merchant/offsite_payments_shim"
+        ActiveMerchant::OffsitePaymentsShim
+      else
+        super
+      end
+    end
+
+    def self.included(klass)
+      def klass.const_missing(name)
+        if name.to_s == "Integrations"
+          ActiveMerchant.deprecated(OFFSITE_PAYMENT_EXTRACTION_MESSAGE)
+          require "active_merchant/offsite_payments_shim"
+          ActiveMerchant::OffsitePaymentsShim
+        else
+          super
+        end
+      end
+    end
+  end
+
+  def self.deprecated(message, caller=Kernel.caller[1])
+    warning = caller + ": " + message
+    if(respond_to?(:logger) && logger.present?)
+      logger.warn(warning)
+    else
+      warn(warning)
+    end
   end
 end

data/lib/active_merchant/billing.rb

@@ -1,3 +1,5 @@
+require 'active_merchant/errors'
+
 require 'active_merchant/billing/avs_result'
 require 'active_merchant/billing/cvv_result'
 require 'active_merchant/billing/credit_card_methods'
@@ -6,4 +8,4 @@ require 'active_merchant/billing/credit_card'
 require 'active_merchant/billing/base'
 require 'active_merchant/billing/check'
 require 'active_merchant/billing/response'
-require 'active_merchant/billing/gateways'
+require 'active_merchant/billing/gateways'

data/lib/active_merchant/billing/base.rb

@@ -9,7 +9,15 @@ module ActiveMerchant #:nodoc:
       # Set ActiveMerchant integrations in test mode.
       #
       #   ActiveMerchant::Billing::Base.integration_mode = :test
-      mattr_accessor :integration_mode
+      def self.integration_mode=(mode)
+        ActiveMerchant.deprecated(OFFSITE_PAYMENT_EXTRACTION_MESSAGE)
+        @@integration_mode = mode
+      end
+
+      def self.integration_mode
+        ActiveMerchant.deprecated(OFFSITE_PAYMENT_EXTRACTION_MESSAGE)
+        @@integration_mode
+      end
 
       # Set both the mode of both the gateways and integrations
       # at once
@@ -18,7 +26,7 @@ module ActiveMerchant #:nodoc:
       def self.mode=(mode)
         @@mode = mode
         self.gateway_mode = mode
-        self.integration_mode = mode
+        @@integration_mode = mode
       end
 
       self.mode = :production

data/lib/active_merchant/billing/check.rb

@@ -5,9 +5,7 @@ module ActiveMerchant #:nodoc:
     # not backed by any database.
     #
     # You may use Check in place of CreditCard with any gateway that supports it.
-    class Check
-      include Validateable
-
+    class Check < Model
       attr_accessor :first_name, :last_name,
                     :bank_name, :routing_number, :account_number,
                     :account_holder_type, :account_type, :number
@@ -16,11 +14,11 @@ module ActiveMerchant #:nodoc:
       attr_accessor :institution_number, :transit_number
 
       def name
-        @name ||= "#{@first_name} #{@last_name}".strip
+        @name ||= "#{first_name} #{last_name}".strip
       end
 
       def name=(value)
-        return if value.blank?
+        return if empty?(value)
 
         @name = value
         segments = value.split(' ')
@@ -29,17 +27,23 @@ module ActiveMerchant #:nodoc:
       end
 
       def validate
+        errors = []
+
         [:name, :routing_number, :account_number].each do |attr|
-          errors.add(attr, "cannot be empty") if self.send(attr).blank?
+          errors << [attr, "cannot be empty"] if empty?(self.send(attr))
         end
 
-        errors.add(:routing_number, "is invalid") unless valid_routing_number?
+        errors << [:routing_number, "is invalid"] unless valid_routing_number?
 
-        errors.add(:account_holder_type, "must be personal or business") if
-            !account_holder_type.blank? && !%w[business personal].include?(account_holder_type.to_s)
+        if(!empty?(account_holder_type) && !%w[business personal].include?(account_holder_type.to_s))
+          errors << [:account_holder_type, "must be personal or business"]
+        end
+
+        if(!empty?(account_type) && !%w[checking savings].include?(account_type.to_s))
+          errors << [:account_type, "must be checking or savings"]
+        end
 
-        errors.add(:account_type, "must be checking or savings") if
-            !account_type.blank? && !%w[checking savings].include?(account_type.to_s)
+        errors_hash(errors)
       end
 
       def type
@@ -51,17 +55,20 @@ module ActiveMerchant #:nodoc:
       #   (3(d1 + d4 + d7) + 7(d2 + d5 + d8) + 1(d3 + d6 + d9))mod 10 = 0
       # See http://en.wikipedia.org/wiki/Routing_transit_number#Internal_checksums
       def valid_routing_number?
-        d = routing_number.to_s.split('').map(&:to_i).select { |d| (0..9).include?(d) }
-        case d.size
-          when 9 then
-            checksum = ((3 * (d[0] + d[3] + d[6])) +
-                        (7 * (d[1] + d[4] + d[7])) +
-                             (d[2] + d[5] + d[8])) % 10
-            case checksum
-              when 0 then true
-              else        false
-            end
-          else false
+        digits = routing_number.to_s.split('').map(&:to_i).select{|d| (0..9).include?(d)}
+        case digits.size
+        when 9
+          checksum = ((3 * (digits[0] + digits[3] + digits[6])) +
+                      (7 * (digits[1] + digits[4] + digits[7])) +
+                           (digits[2] + digits[5] + digits[8])) % 10
+          case checksum
+          when 0
+            true
+          else
+            false
+          end
+        else
+          false
         end
       end
     end