activemerchant 1.42.2 → 1.42.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjQ2OTAyZDUwMzYxMTA1ZDkwODdiNWI4NjY1NzcyNTkyOWNhMjdmMw==
+    NjhkNTg2ZGQxMmYxMTJjMGVhNTZhOWJhMmM4NWE5OTEzMDRiZGY0Ng==
   data.tar.gz: !binary |-
-    Y2RjZGZhZjJhNGY1MTlmMTcxM2VmZWM0Y2NkZjY0NWViNzU1YjY3Yg==
+    ZGI2ZmRkZWVjN2Y5NTYyNDQ2MmQ3NWRiNzg3MWQ2Y2FjMjk4NjY1ZQ==
 SHA512:
   metadata.gz: !binary |-
-    OWZjNTExODRmNGZhYTZmNjUxM2NmMjg0YjYzN2Y0MTE5ZWZjZTAyNjM2YWQ0
-    ZTk1NGRlMzFjZTYwYTg3MWU1N2QxMjllOGM5YTQxODhjODk2NDJlZDM5MzA0
-    N2QwOTJkYjRlMTc4NTIyZjc5YTFlNTZmMzQ2YjViZDQzMjA5NzQ=
+    OGJhMjg0N2JjNDI5ZDk3Y2MyM2ExNzY2NDQ4MmU1MjUwNWNhYTg3NTEyNmQx
+    NjE1MDMxMjcxZjBhNGY1OTQ0NzMwNDkzYTQwMjQzZTY1N2U1ZjhkMzFkNzYy
+    OTQ1YmEwOWVlYjdmNjI4ZmMyYWI4MGIwOGJkNWM1Njk1N2UxMDM=
   data.tar.gz: !binary |-
-    NmQ5YjFlNThjMDA4ZDE1NDZjMTI3MWY2OTI3NzdjMmU1YjhmZmZkN2JiN2Ni
-    YTExODQ5NjE0MTU3YmZhNTFmYjc0ZDJiMjRkMmFiOTc3ZjBiOGJlNDI2ZTJi
-    MDNmOGE4OWQyYmExNzg0MDg4OWYyMDc2MzIzNTI3Y2E2NDFmNjQ=
+    NTlkYjg4NGY2OGE5ZmZhN2ZiZGY3MDhlM2E3NjFlZmNlNzdmMDQxZTgyZWQx
+    NDk5MDQ0OTU2MTYzNDU1YjNlMjIxNzE3NzY3ZGVkNDVkOTVmZDQ3OTA3MDE4
+    NDYzMWIzNWNkOTVjZGFlYzExODcxYTliYzYxYWVhMTY4ZGFkOGY=

data/CHANGELOG

@@ -1,5 +1,37 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.42.3 (December 18th, 2013)
+
+* Balanced: Add support for appears_on_statement_as [duff]
+* Authorize.Net: Make already actioned responses failures [odorcicd]
+* Add Payex gateway [atomgiant]
+* Paymill: Fix authorizations [duff]
+* Braintree Blue: Allow specifying the credit card token [ntalbott]
+* Braintree Blue: Allow specifying the customer id [ntalbott]
+* Braintree Blue: Scrub invalid emails and zips [ntalbott]
+* Braintree Blue: Return :credit_card_token as a top level param [ntalbott]
+* Braintree Blue: Allow unstoring just a credit card [ntalbott]
+* Braintree Blue: #store adds cards to existing customers [ntalbott]
+* USA ePay Advanced: Fix check handling [nearapogee]
+* USA ePay Advanced: Fix credit card expiration handling [nearapogee]
+* USA ePay Advanced: Fix handling of custom transaction responses for single items [nearapogee]
+* USA ePay Advanced: Fix capture amount [nearapogee]
+* NAB Transact: Fix merchant descriptor with capture/refund requests [nagash]
+* Braintree Blue: Add custom_fields & device_data parameters [parallel588]
+* Webpay: Add authorize & capture [keikubo]
+* MerchantWarrior: Pass description [duff]
+* Stripe: Separate email from description [duff]
+* Add Payscout gateway [llopez]
+* Merchant Warrior: Use billing_address [duff]
+* Add SoEasyPay gateway [ir-soeasycorp]
+* Bogus: Add check support [npverni]
+* Payflow: Add Check support [crazyivan]
+* Stripe: Allow expanding objects inline [odorcicd]
+
+== Version 1.42.2 (November 13th, 2013)
+
+* Renew public certificate
+
 == Version 1.42.1 (November 13th, 2013)
 
 * Signed version of 1.42.0

data/CONTRIBUTORS

@@ -436,3 +436,15 @@ Swipe Checkout (November 2013)
 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)

data/README.md

@@ -144,6 +144,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [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
 * [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
@@ -153,6 +154,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [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
 * [Pin](http://www.pin.net.au/) - AU
@@ -173,6 +175,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [SecurePay](http://www.securepay.com/) - US, CA, GB, AU
 * [SecurePayTech](http://www.securepaytech.com/) - NZ
 * [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
 * [Swipe](https://www.swipehq.com/checkout) - CA, NZ

data/lib/active_merchant/billing/base.rb

@@ -31,8 +31,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

data/lib/active_merchant/billing/credit_card_methods.rb

@@ -126,7 +126,7 @@ module ActiveMerchant #:nodoc:
             %w[1 2 3 success failure error].include?(number.to_s)
         end
         
-        # Checks the validity of a card number by use of the the Luhn Algorithm. 
+        # Checks the validity of a card number by use of the Luhn Algorithm.
         # Please see http://en.wikipedia.org/wiki/Luhn_algorithm for details.
         def valid_checksum?(number) #:nodoc:
           sum = 0

data/lib/active_merchant/billing/gateway.rb

@@ -62,7 +62,7 @@ module ActiveMerchant #:nodoc:
       include Utils
 
       DEBIT_CARDS = [ :switch, :solo ]
-      CURRENCIES_WITHOUT_FRACTIONS = [ 'JPY', 'HUF', 'TWD' ]
+      CURRENCIES_WITHOUT_FRACTIONS = [ 'JPY', 'HUF', 'TWD', 'ISK' ]
       CREDIT_DEPRECATION_MESSAGE = "Support for using credit to refund existing transactions is deprecated and will be removed from a future release of ActiveMerchant. Please use the refund method instead."
 
       cattr_reader :implementations

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

@@ -51,6 +51,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)
+      TRANSACTION_ALREADY_ACTIONED = %w(310 311)
 
       AUTHORIZE_NET_ARB_NAMESPACE = 'AnetApi/xml/v1/schema/AnetApiSchema.xsd'
 
@@ -199,7 +200,7 @@ module ActiveMerchant #:nodoc:
       #   For example, to charge the customer once every three months the hash would be
       #   +:interval => { :unit => :months, :length => 3 }+ (REQUIRED)
       # * <tt>:duration</tt> -- A hash containing keys for the <tt>:start_date</tt> the subscription begins (also the date the
-      #   initial billing occurs) and the total number of billing <tt>:occurences</tt> or payments for the subscription. (REQUIRED)
+      #   initial billing occurs) and the total number of billing <tt>:occurrences</tt> or payments for the subscription. (REQUIRED)
       def recurring(money, creditcard, options={})
         requires!(options, :interval, :duration, :billing_address)
         requires!(options[:interval], :length, [:unit, :days, :months])
@@ -294,7 +295,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def success?(response)
-        response[:response_code] == APPROVED
+        response[:response_code] == APPROVED && TRANSACTION_ALREADY_ACTIONED.exclude?(response[:response_reason_code])
       end
 
       def fraud_review?(response)

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

@@ -95,7 +95,7 @@ module ActiveMerchant #:nodoc:
       # * <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.
+      #   test flag. This is useful when you need to generate card declines, AVS or CVV errors.
       #   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 = {})
@@ -340,7 +340,7 @@ module ActiveMerchant #:nodoc:
       # ==== Transaction
       #
       # * <tt>:type</tt> -- The type of transaction. Can be either <tt>:auth_only</tt>, <tt>:capture_only</tt>, <tt>:auth_capture</tt>, <tt>:prior_auth_capture</tt>, <tt>:refund</tt> or <tt>:void</tt>. (REQUIRED)
-      # * <tt>:amount</tt> -- The amount for the tranaction. Formatted with a decimal. For example "4.95" (CONDITIONAL)
+      # * <tt>:amount</tt> -- The amount for the transaction. Formatted with a decimal. For example "4.95" (CONDITIONAL)
       #     - :type == :void (NOT USED)
       #     - :type == :refund (OPTIONAL)
       #     - :type == (:auth_only, :capture_only, :auth_capture, :prior_auth_capture) (REQUIRED)
@@ -369,8 +369,8 @@ module ActiveMerchant #:nodoc:
       #     - :type = (:prior_auth_capture) (OPTIONAL)
       #
       # ==== For :type == :refund only
-      # * <tt>:credit_card_number_masked</tt> -- (CONDITIONAL - requied for credit card refunds is :customer_profile_id AND :customer_payment_profile_id are missing)
-      # * <tt>:bank_routing_number_masked && :bank_account_number_masked</tt> -- (CONDITIONAL - requied for electronic check refunds is :customer_profile_id AND :customer_payment_profile_id are missing) (NOT ABLE TO TEST - I keep getting "ACH transactions are not accepted by this merchant." when trying to make a payment and, until that's possible I can't refund (wiseleyb@gmail.com))
+      # * <tt>:credit_card_number_masked</tt> -- (CONDITIONAL - required for credit card refunds if :customer_profile_id AND :customer_payment_profile_id are missing)
+      # * <tt>:bank_routing_number_masked && :bank_account_number_masked</tt> -- (CONDITIONAL - required for electronic check refunds if :customer_profile_id AND :customer_payment_profile_id are missing) (NOT ABLE TO TEST - I keep getting "ACH transactions are not accepted by this merchant." when trying to make a payment and, until that's possible I can't refund (wiseleyb@gmail.com))
       def create_customer_profile_transaction(options)
         requires!(options, :transaction)
         requires!(options[:transaction], :type)
@@ -410,13 +410,13 @@ module ActiveMerchant #:nodoc:
       # * <tt>:customer_profile_id</tt> -- The Customer Profile ID of the customer to use in this transaction. (CONDITIONAL :customer_payment_profile_id must be included if used)
       # * <tt>:customer_payment_profile_id</tt> -- The Customer Payment Profile ID of the Customer Payment Profile to use in this transaction. (CONDITIONAL :customer_profile_id must be included if used)
       #
-      # * <tt>:credit_card_number_masked</tt> -- Four Xs follwed by the last four digits of the credit card (CONDITIONAL - used if customer_profile_id and customer_payment_profile_id aren't given)
+      # * <tt>:credit_card_number_masked</tt> -- Four Xs followed by the last four digits of the credit card (CONDITIONAL - used if customer_profile_id and customer_payment_profile_id aren't given)
       #
-      # * <tt>:bank_routing_number_masked</tt> -- The last four gidits of the routing number to be refunded (CONDITIONAL - must be used with :bank_account_number_masked)
-      # * <tt>:bank_account_number_masked</tt> -- The last four digis of the bank account number to be refunded, Ex. XXXX1234 (CONDITIONAL - must be used with :bank_routing_number_masked)
+      # * <tt>:bank_routing_number_masked</tt> -- The last four digits of the routing number to be refunded (CONDITIONAL - must be used with :bank_account_number_masked)
+      # * <tt>:bank_account_number_masked</tt> -- The last four digits of the bank account number to be refunded, Ex. XXXX1234 (CONDITIONAL - must be used with :bank_routing_number_masked)
       #
       # * <tt>:tax</tt> - A hash containing tax information for the refund (OPTIONAL - <tt>:amount</tt>, <tt>:name</tt> (31 characters), <tt>:description</tt> (255 characters))
-      # * <tt>:duty</tt> - A hash containting duty information for the refund (OPTIONAL - <tt>:amount</tt>, <tt>:name</tt> (31 characters), <tt>:description</tt> (255 characters))
+      # * <tt>:duty</tt> - A hash containing duty information for the refund (OPTIONAL - <tt>:amount</tt>, <tt>:name</tt> (31 characters), <tt>:description</tt> (255 characters))
       # * <tt>:shipping</tt> - A hash containing shipping information for the refund (OPTIONAL - <tt>:amount</tt>, <tt>:name</tt> (31 characters), <tt>:description</tt> (255 characters))
       def create_customer_profile_transaction_for_refund(options)
         requires!(options, :transaction)

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

@@ -131,6 +131,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         post[:amount] = money
         post[:description] = options[:description]
+        post[:appears_on_statement_as] = options[:appears_on_statement_as] if options[:appears_on_statement_as]
 
         create_or_find_account(post, options)
         add_credit_card(post, credit_card, options)
@@ -168,6 +169,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         post[:amount] = money
         post[:description] = options[:description]
+        post[:appears_on_statement_as] = options[:appears_on_statement_as] if options[:appears_on_statement_as]
 
         create_or_find_account(post, options)
         add_credit_card(post, credit_card, options)
@@ -197,6 +199,7 @@ module ActiveMerchant #:nodoc:
         post[:hold_uri] = authorization
         post[:amount] = money if money
         post[:description] = options[:description] if options[:description]
+        post[:appears_on_statement_as] = options[:appears_on_statement_as] if options[:appears_on_statement_as]
         post[:on_behalf_of_uri] = options[:on_behalf_of_uri] if options[:on_behalf_of_uri]
 
         create_transaction(:post, @debits_uri, post)
@@ -213,6 +216,7 @@ module ActiveMerchant #:nodoc:
       def void(authorization, options = {})
         post = {}
         post[:is_void] = true
+        post[:appears_on_statement_as] = options[:appears_on_statement_as] if options[:appears_on_statement_as]
 
         create_transaction(:put, authorization, post)
       rescue Error => ex
@@ -246,6 +250,7 @@ module ActiveMerchant #:nodoc:
         post[:debit_uri] = debit_uri
         post[:amount] = amount
         post[:description] = options[:description]
+        post[:appears_on_statement_as] = options[:appears_on_statement_as] if options[:appears_on_statement_as]
         create_transaction(:post, @refunds_uri, post)
       rescue Error => ex
         failed_response(ex.response)
@@ -265,12 +270,12 @@ module ActiveMerchant #:nodoc:
         else
           card_uri = associate_card_to_account(account_uri, credit_card)
         end
-        
+
         is_test = false
         if @marketplace_uri
           is_test = (@marketplace_uri.index("TEST") ? true : false)
         end
-        
+
         Response.new(true, "Card stored", {}, :test => is_test, :authorization => [card_uri, account_uri].compact.join(';'))
       rescue Error => ex
         failed_response(ex.response)

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

@@ -139,7 +139,7 @@ module ActiveMerchant #:nodoc:
         commit(post, true)
       end
 
-      #can't actually delete a secure profile with the supplicaed API. This function sets the status of the profile to closed (C).
+      #can't actually delete a secure profile with the supplicated API. This function sets the status of the profile to closed (C).
       #Closed profiles will have to removed manually.
       def delete(vault_id)
         update(vault_id, false, {:status => "C"})

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

@@ -7,67 +7,67 @@ module ActiveMerchant #:nodoc:
       SUCCESS_MESSAGE = "Bogus Gateway: Forced success"
       FAILURE_MESSAGE = "Bogus Gateway: Forced failure"
       ERROR_MESSAGE = "Bogus Gateway: Use CreditCard number ending in 1 for success, 2 for exception and anything else for error"
-      CREDIT_ERROR_MESSAGE = "Bogus Gateway: Use CreditCard number ending in 1 for success, 2 for exception and anything else for error"
       UNSTORE_ERROR_MESSAGE = "Bogus Gateway: Use trans_id ending in 1 for success, 2 for exception and anything else for error"
       CAPTURE_ERROR_MESSAGE = "Bogus Gateway: Use authorization number ending in 1 for exception, 2 for error and anything else for success"
       VOID_ERROR_MESSAGE = "Bogus Gateway: Use authorization number ending in 1 for exception, 2 for error and anything else for success"
       REFUND_ERROR_MESSAGE = "Bogus Gateway: Use trans_id number ending in 1 for exception, 2 for error and anything else for success"
+      CHECK_ERROR_MESSAGE = "Bogus Gateway: Use bank account number ending in 1 for success, 2 for exception and anything else for error"
 
       self.supported_countries = ['US']
       self.supported_cardtypes = [:bogus]
       self.homepage_url = 'http://example.com'
       self.display_name = 'Bogus'
 
-      def authorize(money, credit_card_or_reference, options = {})
+      def authorize(money, paysource, options = {})
         money = amount(money)
-        case normalize(credit_card_or_reference)
+        case normalize(paysource)
         when /1$/
           Response.new(true, SUCCESS_MESSAGE, {:authorized_amount => money}, :test => true, :authorization => AUTHORIZATION )
         when /2$/
           Response.new(false, FAILURE_MESSAGE, {:authorized_amount => money, :error => FAILURE_MESSAGE }, :test => true)
         else
-          raise Error, ERROR_MESSAGE
+          raise Error, error_message(paysource)
         end
       end
 
-      def purchase(money, credit_card_or_reference, options = {})
+      def purchase(money, paysource, options = {})
         money = amount(money)
-        case normalize(credit_card_or_reference)
+        case normalize(paysource)
         when /1$/, AUTHORIZATION
           Response.new(true, SUCCESS_MESSAGE, {:paid_amount => money}, :test => true, :authorization => AUTHORIZATION)
         when /2$/
           Response.new(false, FAILURE_MESSAGE, {:paid_amount => money, :error => FAILURE_MESSAGE },:test => true)
         else
-          raise Error, ERROR_MESSAGE
+          raise Error, error_message(paysource)
         end
       end
 
-      def recurring(money, credit_card_or_reference, options = {})
+      def recurring(money, paysource, options = {})
         money = amount(money)
-        case normalize(credit_card_or_reference)
+        case normalize(paysource)
         when /1$/
           Response.new(true, SUCCESS_MESSAGE, {:paid_amount => money}, :test => true)
         when /2$/
           Response.new(false, FAILURE_MESSAGE, {:paid_amount => money, :error => FAILURE_MESSAGE },:test => true)
         else
-          raise Error, ERROR_MESSAGE
+          raise Error, error_message(paysource)
         end
       end
 
-      def credit(money, credit_card_or_reference, options = {})
-        if credit_card_or_reference.is_a?(String)
+      def credit(money, paysource, options = {})
+        if paysource.is_a?(String)
           deprecated CREDIT_DEPRECATION_MESSAGE
-          return refund(money, credit_card_or_reference, options)
+          return refund(money, paysource, options)
         end
 
         money = amount(money)
-        case normalize(credit_card_or_reference)
+        case normalize(paysource)
         when /1$/
           Response.new(true, SUCCESS_MESSAGE, {:paid_amount => money}, :test => true )
         when /2$/
           Response.new(false, FAILURE_MESSAGE, {:paid_amount => money, :error => FAILURE_MESSAGE }, :test => true)
         else
-          raise Error, CREDIT_ERROR_MESSAGE
+          raise Error, error_message(paysource)
         end
       end
 
@@ -106,14 +106,14 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def store(credit_card_or_reference, options = {})
-        case normalize(credit_card_or_reference)
+      def store(paysource, options = {})
+        case normalize(paysource)
         when /1$/
           Response.new(true, SUCCESS_MESSAGE, {:billingid => '1'}, :test => true, :authorization => AUTHORIZATION)
         when /2$/
           Response.new(false, FAILURE_MESSAGE, {:billingid => nil, :error => FAILURE_MESSAGE }, :test => true)
         else
-          raise Error, ERROR_MESSAGE
+          raise Error, error_message(paysource)
         end
       end
 
@@ -130,11 +130,21 @@ module ActiveMerchant #:nodoc:
 
       private
 
-      def normalize(credit_card_or_reference)
-        if credit_card_or_reference.respond_to?(:number)
-          credit_card_or_reference.number
+      def normalize(paysource)
+        if paysource.respond_to?(:account_number) && (paysource.try(:number).blank? || paysource.number.blank?)
+          paysource.account_number
+        elsif paysource.respond_to?(:number)
+          paysource.number
         else
-          credit_card_or_reference.to_s
+          paysource.to_s
+        end
+      end
+
+      def error_message(paysource)
+        if paysource.respond_to?(:account_number)
+          CHECK_ERROR_MESSAGE
+        elsif paysource.respond_to?(:number)
+          ERROR_MESSAGE
         end
       end
     end

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

@@ -111,26 +111,20 @@ module ActiveMerchant #:nodoc:
       end
 
       def store(creditcard, options = {})
-        commit do
-          parameters = {
-            :first_name => creditcard.first_name,
-            :last_name => creditcard.last_name,
-            :email => options[:email],
-            :credit_card => {
-              :number => creditcard.number,
-              :cvv => creditcard.verification_value,
-              :expiration_month => creditcard.month.to_s.rjust(2, "0"),
-              :expiration_year => creditcard.year.to_s
-            }
-          }
-          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?),
-              :customer_vault_id => (result.customer.id if result.success?)
-            },
-            :authorization => (result.customer.id if result.success?)
-          )
+        if options[:customer].present?
+          MultiResponse.new.tap do |r|
+            customer_exists_response = nil
+            r.process{customer_exists_response = check_customer_exists(options[:customer])}
+            r.process do
+              if customer_exists_response.params["exists"]
+                add_credit_card_to_customer(creditcard, options)
+              else
+                add_customer_with_credit_card(creditcard, options)
+              end
+            end
+          end
+        else
+          add_customer_with_credit_card(creditcard, options)
         end
       end
 
@@ -153,11 +147,11 @@ module ActiveMerchant #:nodoc:
           result = @braintree_gateway.customer.update(vault_id,
             :first_name => creditcard.first_name,
             :last_name => creditcard.last_name,
-            :email => options[:email],
+            :email => scrub_email(options[:email]),
             :credit_card => credit_card_params
           )
           Response.new(result.success?, message_from_result(result),
-            :braintree_customer => (customer_hash(@braintree_gateway.customer.find(vault_id)) if result.success?),
+            :braintree_customer => (customer_hash(@braintree_gateway.customer.find(vault_id), :include_credit_cards) if result.success?),
             :customer_vault_id => (result.customer.id if result.success?)
           )
         end
@@ -165,7 +159,11 @@ module ActiveMerchant #:nodoc:
 
       def unstore(customer_vault_id, options = {})
         commit do
-          @braintree_gateway.customer.delete(customer_vault_id)
+          if(!customer_vault_id && options[:credit_card_token])
+            @braintree_gateway.credit_card.delete(options[:credit_card_token])
+          else
+            @braintree_gateway.customer.delete(customer_vault_id)
+          end
           Response.new(true, "OK")
         end
       end
@@ -173,6 +171,87 @@ module ActiveMerchant #:nodoc:
 
       private
 
+      def check_customer_exists(customer_vault_id)
+        commit do
+          begin
+            @braintree_gateway.customer.find(customer_vault_id)
+            ActiveMerchant::Billing::Response.new(true, "Customer found", {exists: true}, authorization: customer_vault_id)
+          rescue Braintree::NotFoundError
+            ActiveMerchant::Billing::Response.new(true, "Customer not found", {exists: false})
+          end
+        end
+      end
+
+      def add_customer_with_credit_card(creditcard, options)
+        commit do
+          parameters = {
+            :first_name => creditcard.first_name,
+            :last_name => creditcard.last_name,
+            :email => scrub_email(options[:email]),
+            :id => options[:customer],
+            :credit_card => {
+              :number => creditcard.number,
+              :cvv => creditcard.verification_value,
+              :expiration_month => creditcard.month.to_s.rjust(2, "0"),
+              :expiration_year => creditcard.year.to_s,
+              :token => options[:credit_card_token]
+            }
+          }
+          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, :include_credit_cards) if result.success?),
+              :customer_vault_id => (result.customer.id if result.success?),
+              :credit_card_token => (result.customer.credit_cards[0].token if result.success?)
+            },
+            :authorization => (result.customer.id if result.success?)
+          )
+        end
+      end
+
+      def add_credit_card_to_customer(credit_card, options)
+        commit do
+          parameters = {
+            customer_id: options[:customer],
+            token: options[:credit_card_token],
+            number: credit_card.number,
+            cvv: credit_card.verification_value,
+            expiration_month: credit_card.month.to_s.rjust(2, "0"),
+            expiration_year: credit_card.year.to_s,
+          }
+          parameters[:billing_address] = map_address(options[:billing_address]) if options[:billing_address]
+
+          result = @braintree_gateway.credit_card.create(parameters)
+          ActiveMerchant::Billing::Response.new(
+            result.success?,
+            message_from_result(result),
+            {
+              customer_vault_id: (result.credit_card.customer_id if result.success?),
+              credit_card_token: (result.credit_card.token if result.success?)
+            },
+            authorization: (result.credit_card.customer_id if result.success?)
+          )
+        end
+      end
+
+      def scrub_email(email)
+        return nil unless email.present?
+        return nil if (
+          email !~ /^.+@[^\.]+(\.[^\.]+)+[a-z]$/i ||
+          email =~ /\.(con|met)$/i
+        )
+        email
+      end
+
+      def scrub_zip(zip)
+        return nil unless zip.present?
+        return nil if(
+          zip.gsub(/[^a-z0-9]/i, '').length > 9 ||
+          zip =~ /[^a-z0-9\- ]/i
+        )
+        zip
+      end
+
       def merge_credit_card_options(parameters, options)
         valid_options = {}
         options.each do |key, value|
@@ -193,7 +272,7 @@ module ActiveMerchant #:nodoc:
           :company => address[:company],
           :locality => address[:city],
           :region => address[:state],
-          :postal_code => address[:zip],
+          :postal_code => scrub_zip(address[:zip]),
         }
         if(address[:country] || address[:country_code_alpha2])
           mapped[:country_code_alpha2] = (address[:country] || address[:country_code_alpha2])
@@ -281,25 +360,29 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def customer_hash(customer)
-        credit_cards = customer.credit_cards.map do |cc|
-          {
-            "bin" => cc.bin,
-            "expiration_date" => cc.expiration_date,
-            "token" => cc.token,
-            "last_4" => cc.last_4,
-            "card_type" => cc.card_type,
-            "masked_number" => cc.masked_number
-          }
-        end
-
-        {
+      def customer_hash(customer, include_credit_cards=false)
+        hash = {
           "email" => customer.email,
           "first_name" => customer.first_name,
           "last_name" => customer.last_name,
-          "credit_cards" => credit_cards,
           "id" => customer.id
         }
+
+        if include_credit_cards
+          hash["credit_cards"] = customer.credit_cards.map do |cc|
+            {
+              "bin" => cc.bin,
+              "expiration_date" => cc.expiration_date,
+              "token" => cc.token,
+              "last_4" => cc.last_4,
+              "card_type" => cc.card_type,
+              "masked_number" => cc.masked_number,
+              "token" => cc.token
+            }
+          end
+        end
+
+        hash
       end
 
       def transaction_hash(transaction)
@@ -365,7 +448,7 @@ module ActiveMerchant #:nodoc:
           :order_id => options[:order_id],
           :customer => {
             :id => options[:store] == true ? "" : options[:store],
-            :email => options[:email]
+            :email => scrub_email(options[:email])
           },
           :options => {
             :store_in_vault => options[:store] ? true : false,
@@ -373,6 +456,8 @@ module ActiveMerchant #:nodoc:
           }
         }
 
+        parameters[:custom_fields] = options[:custom_fields]
+        parameters[:device_data] = options[:device_data] if options[:device_data]
         if merchant_account_id = (options[:merchant_account_id] || @merchant_account_id)
           parameters[:merchant_account_id] = merchant_account_id
         end