bitfluent-activemerchant 1.5.1.1 → 1.15.1

data/CHANGELOG

@@ -1,5 +1,173 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.15.0 (May 12, 2011)
+* DirecPay: Fix address to not include address2 twice in some cases [Soleone]
+* DirecPay: Send company if available [Soleone]
+* Realex: Fix hash signature [ntalbott/Soleone]
+* SecurePay AU: Update remote tests [ntalbott]
+* SecurePay AU: Fix method arity for #capture, #refund, #credit and #void [Soleone]
+* Barclays ePDQ: Make response parsing more robust [Soleone]
+* Payflow Express: Add line item support [wolframarnold]
+* Payflow Express: Add comment field support [wolframarnold]
+* Payflow: Add more optional fields [wolframarnold]
+* Beanstream/Paypal: Fix CREDIT_DEPRECATION_MESSAGE errors [Jonathan Rudenberg]
+* BraintreeBlue: Return a hash instead of a transaction object [braintreeps]
+* BraintreeBlue: Return proper AVS/CVV values [braintreeps]
+* Bogus: Add #recurring [trwomey]
+* Make Validateable compatible with ActiveModel [CodeMonkeySteve]
+* Add DirectEBanking offsite gateway [Gerwin Brunner/Soleone]
+* ActiveSupport 3.1 beta support [cgriego]
+
+== Version 1.14.0 (Apr 29, 2011)
+
+* SagePayForm: Implement #cancelled? for Return. [wisq]
+* Add #cancelled? to Integrations::Return [wisq]
+* Bogus gateway: Add refund support and better tests [wisq]
+* Beanstream: Add support for storing cards [duffomelia]
+* eWay: Add support for storing cards [duffomelia]
+* Add validation mode to update profile request [Ken Miller]
+* Authorize.net CIM: Add oldLiveMode [ntalbott]
+* Authorize.net CIM: Add extra transaction types [Ken Miller]
+* JetPay: gateway tweaks [ntalbott]
+* Deprecate a bunch more #credit methods [ntalbott]
+* RealEx: Add authorize/capture/credit/void [ntalbott]
+* SecurePay AU: Add authorize/capture/credit/void [ntalbott]
+* PayPal Express: Make response parsing more robust [ntalbott]
+* Test deprecation warnings; add deprecation line numbers [ntabott]
+* Add Orbital direct gateway [ntalbott]
+* Add WorldPay direct gateway [ntalbott]
+
+== Version 1.13.0 (Apr 19, 2011)
+
+* Add a Gemfile for optional bundler support [ssoroka]
+* Stop using has_rdoc= when rubygems version is 1.7.0 or greater, since it's deprecated [ssoroka]
+* Add tax field to braintree [wisq]
+* Quickpay: Also add Sweden as supported country [Soleone]
+* Adding refund method for gateways that are using the credit method for referenced based refunds, added deprecation worning to the credit method [John Duff]
+* Return the Braintree transaction id in the response for void and refund transaction calls [John Duff]
+* PayPal Express: Extract phone number from address if no contact phone was sent [Soleone]
+* Unify all offsite gateways that verify the signature of Returns or Notifications by always using the #acknowledge method and calling the secret :credential2 [Soleone]
+* Valitor: Change name of credential for Return and Notification from :password to :credential2 in symmetry with the other Integrations [Soleone]
+* Moneybookers: Add support for tracking token [Soleone]
+* Moneybookers: Require credential when creating Notifications instead of adding an argument to #acknowledge [Soleone]
+* Moneybookers: Fix Notification to return correct status [Soleone]
+* Support default Return class for all Integrations that don't use returns [Soleone]
+* Add support for passing additional options when creating a Notification to all Integrations [Soleone]
+* Update BraintreeBlue#refund to have consistent method signature [Jonathan Rudenberg]
+* Add rails/init.rb for gem campatability in Rails [Rūdolfs Ošiņš]
+* Fix Paypal Express response parser [Jonathan Rudenberg]
+* Braintree/Transax: Add tax field [wisq]
+
+== Version 1.12.1 (Mar 21, 2011)
+
+* Ogone: Make sure response.params is a real Hash [Soleone]
+* WorldPay: Fix service_url in production mode [Soleone]
+
+== Version 1.12.0 (Mar 1, 2011)
+
+* DirecPay: Send phone number as mobile phone by default [Soleone]
+* Support sending line items for PayPal Express transactions [Jonathan Rudenberg]
+* Update PayPal Express XML format to latest version [Jonathan Rudenberg]
+* Fix custom image header for PayPal Express [mwagg]
+* Add InvoiceID and OrderDescription to PayPal Express Authorize and Capture [cody]
+* Add Moneybookers integration [Alex Diakov]
+* Add QBMS (Quickbooks Merchant Services) gateway [ntalbott]
+* Add NMI gateway [ntalbott]
+* Make fully compatible with Rails 2 & 3, and Ruby 1.8 & 1.9 [ntalbott]
+* Authorize.Net: Only return AVS message for AVS-related reason codes. [ntalbott]
+* Add Federated Canada gateway [ntalbott]
+* Garanti: Fix text normalization for nil values [Selem Delul]
+* Valitor: Always send amount without any decimal places [Soleone]
+* Add WorldPay integration [Soleone]
+
+== Version 1.11.0 (Feb 11, 2011)
+
+* Bump dependency for activesupport from 2.3.2 to 2.3.8 [Soleone]
+* Garanti: Normalize text in xml fields for non-standard characters [Selem Delul]
+* Garanti: Make sure order number does not contain illegal characters [Soleone]
+* Fix ActionView tests for ActiveSupport 3.0.4 [Soleone]
+* DirecPay: Make address information editable by default [Soleone]
+* Fix ePDQ credit to expect and handle full authorization [Nathaniel Talbott]
+* Add Barclays ePDQ Gateway [Nathaniel Talbott]
+* Add default fixture for Garanti and don't use fixture for Garanti [cody]
+* Add cms param for ePay [ePay]
+* Add Valitor Integration [Nathaniel Talbott]
+
+== Version 1.10.0 (Jan 20, 2011)
+
+* PayPal Express: Support returning payer phone number [Soleone]
+* Fix ePay to correctly send order number [Soleone]
+* Add BluePay Gateway [Nathaniel Talbott]
+* Add Quantum Gateway [Joshua Lippiner]
+* Add iDEAL/Rabobank gateway [Jonathan Rudenberg]
+* SagePayForm: Added send_email_confirmation (default false) to enable confirmation emails [wisq]
+
+== Version 1.9.4 (Jan 5, 2011)
+
+* Update Garanti gateway to integrate with new API [Selem Delul]
+
+== Version 1.9.3 (December 17, 2010)
+
+* Fix BBS Netaxept to change transaction type from C (for MOTO: mail order telephone order) to M (for credit card orders) [Soleone]
+* Fix Iridium and ePay to work with any object that responds to credit card methods not only ActiveMerchant::CreditCard objects
+
+== Version 1.9.2 (December 9, 2010)
+
+* Add support for PayPal mobile payments [wisq]
+* Add ePay gateway [ePay, Jonathan Rudenberg]
+* Allow access to the raw HTTP response [Jonathan Rudenberg]
+
+== Version 1.9.1 (November 24, 2010)
+
+* PayPal Express and PayPal Pro: Send JPY currency correctly without decimals [Soleone]
+* Netaxept: Make sure password (token) is URL escaped and update remote tests for updated server behavior [Soleone]
+* DirecPay: Add support for additional options in Return class and add convenience method to get transaction status update [Soleone]
+* Add new alias credit_card.brand for credit_card.type and handle the brand correctly in Netaxept [Soleone]
+* Iridium: Do not depend on ExpiryDate class for credit_card [Soleone]
+* PayFlow: Use same timeout of 60 seconds in HTTP header and XML for all requests [Soleone]
+* PayPal Website Payments Pro CA no longer supports American Express cards [Soleone]
+* Updated BIN ranges for Discover to match recent documents [kaunartist]
+
+== Version 1.9.0 (October 14, 2010)
+
+* Add support for DirecPay gateway [Soleone]
+* Add SagePay Form integration gateway [wisq]
+* Allow Return class to include a Notification for gateways that treat the direct response as a notification [wisq]
+* Add support for PayboxDirect gateway [Donald Piret]
+* Add support for SecureNet gateway [Kal]
+* Add support for the Inspire gateway [ryan r. smith]
+
+== Version 1.8.0 (September 24, 2010)
+
+* PayPal Express: Add support for billing agreements [Nathaniel Talbott]
+* Allow comparing countries [Nathaniel Talbott]
+* Iridium: Fix country handling [Nathaniel Talbott]
+* Iridium: Fix missing billing address [Nathaniel Talbott]
+* Iridium: Do not pass CV2 if not present [Nathaniel Talbott]
+* Add Iridium support [Phil Smy]
+* Add Netaxept support [Nathaniel Talbott]
+* PaymentExpress: Use Card Holder Help Text for the response message [Nathaniel Talbott]
+* Sort the country name list [Duff OMelia]
+
+== Version 1.7.3 (September 14, 2010)
+
+* Fix SagePay special handling for Japanese YEN currency to not send fractional amounts [Soleone]
+
+== Version 1.7.2 (August 27, 2010)
+
+* Update Braintree integration to play nicely with the braintree 2.5.0 gem [Soleone]
+* Fix SagePay to not send fractional amounts for Japanese YEN currency [Soleone]
+
+== Version 1.7.1 (July 28, 2010)
+
+* Pull in only the necessary components of Active Support. Enables use of ActiveMerchant with Rails 3 [railsjedi]
+
+== Version 1.7.0 (July 9, 2010)
+
+* Add support for new Braintree Blue Gateway (using the braintree gem) [Braintree]
+
+== Version 1.6.0 (July 6, 2010)
+
 * Add a task rake gateways:hosts to get a list of all outbound hosts and ports [cody]
 * Fix test failure in chronopay helper in Ruby 1.9.1 [cody]
 * Fix timezone issue in credit card test. [cody]

data/CONTRIBUTORS

@@ -26,6 +26,7 @@ Linkpoint Gateway
 eWay Gateway
 
 * Originally contributed by Lucas Carlson  (mailto:lucas@rufy.com)
+* Managed Payments support by Jason Stirk with improvements by Keith Pitt
 
 CardStream Gateway
 
@@ -83,6 +84,7 @@ PaypalNVGateway (Apr 12, 2008)
 Beanstream (May 13, 2008)
 
 * Created by xiaobozz ( xiaobozzz at gmail dot com )
+* Secure Profiles support by Forrest Zeisler (http://github.com/forrest)
 
 Sage (June, 2008)
 
@@ -109,6 +111,10 @@ Instapay Gateway (May 3, 2009)
 
 * Thomas Rideout
 
+Iridium Gateway (June 13, 2009)
+
+* Phil Smy
+
 MerchantWARE (July 7, 2009)
 
 * Cody Fauser
@@ -133,6 +139,95 @@ SallieMae (October 2, 2009)
 
 * iamjwc
 
+Netaxept (February 08, 2010)
+
+* Nathaniel Talbott
+
 Garanti (May 05, 2010)
 
-* Selem Delul (moon@mac.home)
+* Selem Delul (moon@mac.home)
+
+Braintree Blue Gateway (May 19th, 2010)
+
+* Braintree (code@getbraintree.com)
+
+Inspire Gateway (September 27, 2010)
+
+* ryan r. smith
+
+SecureNet Gateway (September 27, 2010)
+
+* Kal
+
+PayboxDirect Gateway (September 27, 2010)
+
+* Donald Piret <donald@donaldpiret.com>
+
+SagePay Form Offsite Gateway (October 14, 2010)
+
+* Adrian Irving-Beer
+
+DirecPay Gateway (October 14, 2010)
+
+* Soleone
+
+ePay Gateway (November 23, 2010)
+
+* Original code by ePay (epay.dk)
+* Refactored by Jonathan Rudenberg
+
+iDEAL/Rabobank Gateway (January 10, 2011)
+
+* Original code by Soemirno Kartosoewito
+* Refactored by Cody Fauser
+* Refactored and updated by Jonathan Rudenberg
+
+Quantum Gateway
+
+* Joshua Lippiner
+* Refactored by Nathaniel Talbott
+
+BluePay Gateway
+
+* Mel Sleight
+* Refactored by Nathaniel Talbott
+
+Valitor Integration (January 2011)
+
+* Nathaniel Talbott
+* Sponsored by Sævar Öfjörð Magnússon
+
+Barclays ePDQ
+
+* Original code by Rob W (rfwatson)
+* Refactored by Nathaniel Talbott
+
+Federated Canada
+
+* Bob Larrick (deathbob)
+
+NMI
+
+* Nathaniel Talbott (ntalbott)
+
+QBMS
+
+* Will Glozer (wg)
+
+WorldPay Integration (Feb 17, 2011)
+
+* Original code by Unknown from this patch: https://jadedpixel.lighthouseapp.com/projects/11599/tickets/3-patch-integration-support-for-worldpay-uk
+* Refactored by Soleone
+
+WorldPay Gateway
+
+* Original code by Amit kumar (ask4amit@gmail.com)
+* Refactored by Nathaniel Talbott (ntalbott)
+
+Orbital Paymentech Gateway (July, 2009)
+
+* Sam Vincent - http://ecommerce.versapay.com
+
+DIRECTebanking - Payment Network AG (May, 2011)
+
+* Gerwin Brunner (Vilango)

data/README.rdoc

@@ -13,21 +13,38 @@ The {ActiveMerchant Wiki}[http://github.com/Shopify/active_merchant/wikis] conta
 
 * {Authorize.Net CIM}[http://www.authorize.net/] - US
 * {Authorize.Net}[http://www.authorize.net/] - US
+* {Barclays ePDQ}[http://www.barclaycard.co.uk/business/accepting-payments/epdq-mpi/] - UK
 * {Beanstream.com}[http://www.beanstream.com/] - CA
+* {BluePay}[http://www.bluepay.com/] - US
 * {Braintree}[http://www.braintreepaymentsolutions.com] - US
 * {CardStream}[http://www.cardstream.com/] - GB
 * {CyberSource}[http://www.cybersource.com] - US
 * {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
 * {eWAY}[http://www.eway.com.au/] - AU
 * {E-xact}[http://www.e-xact.com] - CA, US
+* {Federated Canada}[http://www.federatedcanada.com/] - CA
+* {FirstPay}[http://www.first-pay.com] - US
+* {Garanti Sanal POS}[https://ccpos.garanti.com.tr/ccRaporlar/garanti/ccReports] - US, TR
+* {Inspire}[http://www.inspiregateway.com] - US
+* {InstaPay}[http://www.instapayllc.com] - US
+* {Iridium}[http://www.iridiumcorp.co.uk/] - UK, ES
+* {JetPay}[http://www.jetpay.com] - US
 * {LinkPoint}[http://www.linkpoint.com/] - US
 * {Merchant e-Solutions}[http://merchante-solutions.com/] - US
+* {MerchantWare}[http://merchantwarehouse.com/merchantware] - US
 * {Modern Payments}[http://www.modpay.com] - US
 * {Moneris}[http://www.moneris.com/] - CA
+* {Netaxept}[http://www.betalingsterminal.no/Netthandel-forside] - NO, DK, SE, FI
 * {NetRegistry}[http://www.netregistry.com.au] - AU
 * {NELiX TransaX Gateway}[http://www.nelixtransax.com] - US
 * {NETbilling}[http://www.netbilling.com] - US
+* {NMI}[http://nmi.com/] - US
+* {Ogone DirectLink}[http://www.ogone.com] - BE, DE, FR, NL, AT, CH
+* {Orbital Paymentech}[http://chasepaymentech.com/] - CA, US
+* {PayBox Direct}[http://www.paybox.com] - FR
 * {PayJunction}[http://www.payjunction.com/] - US
 * {PaySecure}[http://www.commsecure.com.au/paysecure.shtml] - AU
 * {PayPal Express Checkout}[https://www.paypal.com/cgi-bin/webscr?cmd=xpt/merchant/ExpressCheckoutIntro-outside] - US, CA, SG, AU
@@ -41,10 +58,14 @@ The {ActiveMerchant Wiki}[http://github.com/Shopify/active_merchant/wikis] conta
 * {Protx}[http://www.protx.com] - GB
 * {Psigate}[http://www.psigate.com/] - CA
 * {PSL Payment Solutions}[http://www.paymentsolutionsltd.com/] - GB
-* {Quickpay}[http://quickpay.dk/] - DK
+* {Quantum}[http://www.quantumgateway.com] - US
+* {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, GB
 * {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
 * {SecurePayTech}[http://www.securepaytech.com/] - NZ
@@ -55,15 +76,22 @@ The {ActiveMerchant Wiki}[http://github.com/Shopify/active_merchant/wikis] conta
 * {Verifi}[http://www.verifi.com/] - US
 * {ViaKLIX}[http://viaklix.com] - US
 * {Wirecard}[http://www.wirecard.com] - DE
+* {WorldPay}[http://www.worldpay.com] - AU, HK, GB, US
 
 == Supported Offsite Payment Gateways
 
-* {PayPal Website Payments Standard}[https://www.paypal.com/cgi-bin/webscr?cmd=_wp-standard-overview-outside]
-* Chronopay[http://www.chronopay.com]
-* Nochex[http://www.nochex.com]
-* {Banca Sella GestPay}[https://www.sella.it/banca/ecommerce/gestpay/gestpay.jsp]
 * {2 Checkout}[http://www.2checkout.com]
+* {Banca Sella GestPay}[https://www.sella.it/banca/ecommerce/gestpay/gestpay.jsp]
+* {Chronopay}[http://www.chronopay.com]
+* {Direct-eBanking / sofortueberweisung.de by Payment-Networks AG}[https://www.payment-network.com/deb_com_en/merchantarea/home] - DE, AT, CH, BE, UK, NL
+* {DirecPay}[http://www.timesofmoney.com/direcpay/jsp/home.jsp]
 * {HiTRUST}[http://www.hitrust.com.hk/]
+* {Moneybookers}[http://www.moneybookers.com]
+* {Nochex}[http://www.nochex.com]
+* {PayPal Website Payments Standard}[https://www.paypal.com/cgi-bin/webscr?cmd=_wp-standard-overview-outside]
+* {SagePay Form}[http://www.sagepay.com/products_services/sage_pay_go/integration/form]
+* {Valitor}[http://www.valitor.is/] - IS
+* {WorldPay}[http://www.worldpay.com]
 
 == Download
 

data/lib/active_merchant.rb

@@ -24,12 +24,24 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'active_support'
+require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/hash/conversions'
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/core_ext/class/delegating_attributes'
+require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/kernel/requires'
+require 'active_support/base64'
+require 'active_support/secure_random'
+
 require 'builder'
 require 'cgi'
 require 'rexml/document'
 
 require 'active_merchant/common'
 require 'active_merchant/billing'
+require 'active_merchant/version'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:    

data/lib/active_merchant/billing/credit_card.rb

@@ -7,52 +7,54 @@ module ActiveMerchant #:nodoc:
     # == Description
     # This credit card object can be used as a stand alone object. It acts just like an ActiveRecord object
     # but doesn't support the .save method as its not backed by a database.
-    # 
-    # For testing purposes, use the 'bogus' credit card type. This card skips the vast majority of 
-    # validations. This allows you to focus on your core concerns until you're ready to be more concerned 
+    #
+    # For testing purposes, use the 'bogus' credit card type. This card skips the vast majority of
+    # validations. This allows you to focus on your core concerns until you're ready to be more concerned
     # with the details of particular creditcards or your gateway.
-    # 
+    #
     # == Testing With CreditCard
-    # Often when testing we don't care about the particulars of a given card type. When using the 'test' 
-    # mode in your Gateway, there are six different valid card numbers: 1, 2, 3, 'success', 'fail', 
+    # Often when testing we don't care about the particulars of a given card type. When using the 'test'
+    # mode in your Gateway, there are six different valid card numbers: 1, 2, 3, 'success', 'fail',
     # and 'error'.
-    # 
+    #
     #--
     # For details, see CreditCardMethods#valid_number?
     #++
-    # 
+    #
     # == Example Usage
     #   cc = CreditCard.new(
-    #     :first_name => 'Steve', 
-    #     :last_name  => 'Smith', 
-    #     :month      => '9', 
-    #     :year       => '2010', 
-    #     :type       => 'visa', 
+    #     :first_name => 'Steve',
+    #     :last_name  => 'Smith',
+    #     :month      => '9',
+    #     :year       => '2010',
+    #     :type       => 'visa',
     #     :number     => '4242424242424242'
     #   )
-    #   
+    #
     #   cc.valid? # => true
     #   cc.display_number # => XXXX-XXXX-XXXX-4242
     #
     class CreditCard
       include CreditCardMethods
       include Validateable
-      
+
       ## Attributes
-      
+
       cattr_accessor :require_verification_value
       self.require_verification_value = true
-      
+
       # Essential attributes for a valid, non-bogus creditcards
       attr_accessor :number, :month, :year, :type, :first_name, :last_name
-      
+
       # Required for Switch / Solo cards
       attr_accessor :start_month, :start_year, :issue_number
 
-      # Optional verification_value (CVV, CVV2 etc). Gateways will try their best to 
+      # Optional verification_value (CVV, CVV2 etc). Gateways will try their best to
       # run validation on the passed in value if it is supplied
       attr_accessor :verification_value
 
+      alias_method :brand, :type
+      
       # Provides proxy access to an expiry date object
       def expiry_date
         ExpiryDate.new(@month, @year)
@@ -61,23 +63,23 @@ module ActiveMerchant #:nodoc:
       def expired?
         expiry_date.expired?
       end
-      
+
       def name?
-        first_name? && last_name?
+        first_name? || last_name?
       end
-      
+
       def first_name?
-        !@first_name.blank?
+        @first_name.present?
       end
-      
+
       def last_name?
-        !@last_name.blank?
+        @last_name.present?
       end
-            
+
       def name
-        "#{@first_name} #{@last_name}"
+        [@first_name, @last_name].compact.join(' ')
       end
-            
+
       def verification_value?
         !@verification_value.blank?
       end
@@ -86,11 +88,11 @@ module ActiveMerchant #:nodoc:
       def display_number
         self.class.mask(number)
       end
-      
+
       def last_digits
         self.class.last_digits(number)
       end
-      
+
       def validate
         validate_essential_attributes
 
@@ -102,14 +104,14 @@ module ActiveMerchant #:nodoc:
         validate_verification_value
         validate_switch_or_solo_attributes
       end
-      
+
       def self.requires_verification_value?
         require_verification_value
       end
-      
+
       private
-      
-      def before_validate #:nodoc: 
+
+      def before_validate #:nodoc:
         self.month = month.to_i
         self.year  = year.to_i
         self.start_month = start_month.to_i unless start_month.nil?
@@ -118,27 +120,38 @@ module ActiveMerchant #:nodoc:
         self.type.downcase! if type.respond_to?(:downcase)
         self.type = self.class.type?(number) if type.blank?
       end
-      
+
       def validate_card_number #:nodoc:
-        errors.add :number, "is not a valid credit card number" unless CreditCard.valid_number?(number)
+        if number.blank?
+          errors.add :number, "is required"
+        elsif !CreditCard.valid_number?(number)
+          errors.add :number, "is not a valid credit card number"
+        end
+
         unless errors.on(:number) || errors.on(:type)
           errors.add :type, "is not the correct card type" unless CreditCard.matching_type?(number, type)
         end
       end
-      
+
       def validate_card_type #:nodoc:
-        errors.add :type, "is required" if type.blank?
-        errors.add :type, "is invalid"  unless CreditCard.card_companies.keys.include?(type)
+        errors.add :type, "is required" if type.blank? && number.present?
+        errors.add :type, "is invalid"  unless type.blank? || CreditCard.card_companies.keys.include?(type)
       end
-      
+
       def validate_essential_attributes #:nodoc:
         errors.add :first_name, "cannot be empty"      if @first_name.blank?
         errors.add :last_name,  "cannot be empty"      if @last_name.blank?
-        errors.add :month,      "is not a valid month" unless valid_month?(@month)
-        errors.add :year,       "expired"              if expired?
-        errors.add :year,       "is not a valid year"  unless valid_expiry_year?(@year)
+
+        if @month.to_i.zero? || @year.to_i.zero?
+          errors.add :month, "is required"  if @month.to_i.zero?
+          errors.add :year,  "is required"  if @year.to_i.zero?
+        else
+          errors.add :month,      "is not a valid month" unless valid_month?(@month)
+          errors.add :year,       "expired"              if expired?
+          errors.add :year,       "is not a valid year"  unless valid_expiry_year?(@year)
+        end
       end
-      
+
       def validate_switch_or_solo_attributes #:nodoc:
         if %w[switch solo].include?(type)
           unless valid_month?(@start_month) && valid_start_year?(@start_year) || valid_issue_number?(@issue_number)
@@ -148,10 +161,10 @@ module ActiveMerchant #:nodoc:
           end
         end
       end
-      
+
       def validate_verification_value #:nodoc:
         if CreditCard.requires_verification_value?
-          errors.add :verification_value, "is required" unless verification_value? 
+          errors.add :verification_value, "is required" unless verification_value?
         end
       end
     end