activemerchant 1.4.2 → 1.5.0

data/CHANGELOG

@@ -1,5 +1,81 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.5.0 (February 2, 2010)
+
+* Fix Gestpay notification to avoid Ruby 1.9 warnings [cody]
+* Fix Chronopay notification time parsing for Ruby 1.9 [Joe Van Dyk]
+* Set default currency of Braintree to USD [cody]
+* Fix QuickPay helper for Ruby 1.9 compat [cody]
+* Use String#each_line instead of collect in PaySecureGateway for Ruby 1.9 compat [cody]
+* Use String#each_line instead of to_a in SagePayGateway for Ruby 1.9 compat [cody]
+* Don't return an array when finding the country code. Fixes issue with Ruby 1.9 [cody]
+* Fix custom assertions for Ruby 1.9 [cody]
+* Deprecate Money objects [cody]
+* Update JCB rejex to catch all valid PANs [pjhyett]
+* Remove old TransaXGateway constant [cody]
+* Remove old ProtxGateway constant [cody]
+* Remove old BrainTree constant [cody]
+* Remove AuthorizedNet constant [cody]
+* SecurePay changed their delimeter from % to ,. Update gateway to handle changes [Soleone]
+* Fix documentation typo in base.rb [mig-hub]
+* Add capture test to Linkpoint [Dusty Doris]
+* Fix bug in Linkpoint with ternary operator and Ruby 1.9.1 [Dusty Doris]
+* Add currency and processor options to Braintree gateway [cbillen]
+* Unify API to always look for billing_address/address hash inside of options [stopdropandrew]
+* Fix bug with Modern Payments Gateway where failure authorizations appeared to be successful [cody]
+* Fix Modern Payments Gateway [cody]
+* Use basic SkipJack host for all non-authorization transactions. Fix status method [cody]
+* Strip non alpha numeric chars out of MerchantWare order number [cody]
+* Parse complete response of Authorize.net CIM gateway [Patrick Joyce]
+* Update to PayPal Sandbox URL for testing Payflow Pro Express Checkout. See Express Checkout for Payflow Pro guide [cody]
+* Provide a C_STATE value of "Outside United States" for SageGateway when processing international customers [cody]
+* PayPal Website Payments Pro Canada supports Amex [cody]
+* Add line item support for LinkpointGateway. [Tony Primerano]
+* Add support for SallieMae gateway [iamjwc]
+* Add support for the JetPay gateway [Phil Ripperger, Peter Williams, cody]
+* Add support for advanced SkipJack processors. Pass :advanced => true when constructing gateway [cody]
+* Support test option in AuthorizeNetCimGateway [Tim]
+* Improve Ogone error messages [cody]
+* Add support for :test => true option to OgoneGateway [cody]
+* Bump PayPal Version to 59.0 [cody]
+* Add amex support to eWay gateway [cody]
+* Change Payflow header X-VPS-Timeout -> X-VPS-Client-Timeout [cody]
+* Fix typo preventing OgoneGateway from working in production [Nicolas Jacobeus]
+* Add support for the Elavon MyVirtualMerchant gateway [jstorimer]
+* Fix recurring transactions in Ogone gateway [cody]
+* Fix money formatting for Ogone gateway [cody]
+* Tweak Ogone gateway to use ActiveMerchant conventions for reference transactions [cody, jstorimer]
+* Add support for the Ogone DirectLink payment gateway [Nicolas Jacobeus]
+* Add support for the Antigua based FirstPay payment gateway [Phil R]
+* Add support for PayPal reference transactions [kevin, John, Rahsun McAfee]
+* Add support for the MerchantWARE payment gateway [cody]
+* Rename Protx to SagePay [jstorimer]
+* Allow test mode for eWay gateway [Duff OMelia]
+* Don't use Time.parse for the ExpiryDate [cody]
+* Add support for CVV code to Authorize.net CIM [Guy Naor]
+* Add shipping address to Authorize.net [Eric Tarn]
+* Don't setup the logger by default [cody]
+* Refactor ActiveMerchant::Connection out of the PostsData module. Add support for logging and wiredumping requests [cody]
+* Assume a valid load path when running tests [cody]
+* Use SHIPTOSTREET2 element instead of STREET2 element for Payflow Express Uk address [cody]
+* Clean up the test helper [cody]
+* Fix DataCash unit test that was making a remote call [cody]
+* Don't check Request#test? for remote PaymentExpress tests because their test environment has changed [cody]
+* Update Instapay gateway to support capture and add address, order, and invoice fields. Add support for CVV and AVS response [cody]
+* Add support for Instapay gateway [brahma]
+* Cleanup PaymentExpress reference purchases and turn on AVS [cody]
+* Add reference purchases and authorizations to PaymentExpress [mocra]
+* Add support for Merchant e-Solutions Gateway [Zac Williams, Robby Russell]
+* Fix Braintree unit test [cody]
+* Add support for checks to SmartPs gateways [jvoohris]
+* Extract SmartPs for Braintree and Transax [mmangino]
+* Ruby 1.9 compatibility [bschwartz]
+* Update Payflow Express to handle Street2 element [James MacAulay]
+* Fix typo in Protx DeliveryState field [cody]
+* Ignore Wirecard state unless it is 2 characters [Cody]
+* Update Wirecard to make country and state processing more robust [Soleone]
+* Update ProTX to use the latest v2.23 protocol [Tekin]
+
 == Version 1.4.2 (April 24, 2009)
 
 * Fix typo in Authorize.net CIM [infused]
@@ -417,3 +493,5 @@
 * Credit card in memory object resembling a AR object
 * Credit card validation methods as static methods of the credit card object
 
+== PlanetArgon fork for integrating Merchant eSolutions gateway
+

data/{CONTRIBUTERS → CONTRIBUTORS}

@@ -39,6 +39,14 @@ NetRegistry Gateway
 
 * Originally contributed by George Ogata (mailto: george.ogata@gmail.com)
 
+DataCash Gateway (March 2, 2007)
+
+* MoneySpyder, http://moneyspyder.co.uk and E-consultancy, http://www.e-consultancy.com
+
+PSL Card Gateway (March 27, 2007)
+
+* MoneySpyder, http://moneyspyder.co.uk
+
 Viaklix Gateway (Sep 3, 2007)
 
 * Originally contributed by Sal Scotto
@@ -88,3 +96,39 @@ Modern Payments (June 13, 2008)
 Wirecard Gateway (June 30, 2008)
 
 * Initial implementation by Soleone
+
+Transax Gateway (May 3, 2009)
+
+* Mike Mangino
+
+Merchant E-Solutions Gateway (May 3, 2009)
+
+* Zac Williams, Robby Russell
+
+Instapay Gateway (May 3, 2009)
+
+* Thomas Rideout
+
+MerchantWARE (July 7, 2009)
+
+* Cody Fauser
+
+FirstPay (July 24, 2009)
+
+* Phil R
+
+Ogone (July 20, 2009)
+
+* Nicolas Jacobeus
+
+Elavon (August 09, 2009)
+
+* Jesse Storimer
+
+JetPay (September 29, 2009)
+
+* Phil Ripperger, Peter Williams
+
+SallieMae (October 2, 2009)
+
+* iamjwc

data/{README → README.rdoc}

@@ -22,9 +22,11 @@ The {ActiveMerchant Wiki}[http://github.com/Shopify/active_merchant/wikis] conta
 * {eWAY}[http://www.eway.com.au/] - AU
 * {E-xact}[http://www.e-xact.com] - CA, US
 * {LinkPoint}[http://www.linkpoint.com/] - US
+* {Merchant e-Solutions}[http://merchante-solutions.com/] - US
 * {Modern Payments}[http://www.modpay.com] - US
 * {Moneris}[http://www.moneris.com/] - CA
 * {NetRegistry}[http://www.netregistry.com.au] - AU
+* {NELiX TransaX Gateway}[http://www.nelixtransax.com] - US
 * {NETbilling}[http://www.netbilling.com] - US
 * {PayJunction}[http://www.payjunction.com/] - US
 * {PaySecure}[http://www.commsecure.com.au/paysecure.shtml] - AU
@@ -42,6 +44,7 @@ The {ActiveMerchant Wiki}[http://github.com/Shopify/active_merchant/wikis] conta
 * {Quickpay}[http://quickpay.dk/] - DK
 * {Realex}[http://www.realexpayments.com/] - IE, GB
 * {Sage Payment Solutions}[http://www.sagepayments.com] - US, CA
+* {Sallie Mae}[http://www.salliemae.com] - US
 * {SecurePay}[http://securepay.com.au] - AU
 * {SecurePay}[http://www.securepay.com/] - US
 * {SecurePayTech}[http://www.securepaytech.com/] - NZ
@@ -130,4 +133,4 @@ Installation from RubyGems
 
 == Contributing
 
-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 see the {ActiveMerchant Guide to Contributing}[http://github.com/Shopify/active_merchant/wikis/contributing] for information on adding a new gateway to ActiveMerchant.

data/Rakefile

@@ -4,9 +4,10 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
-require File.dirname(__FILE__) + '/lib/support/gateway_support'
+require File.join(File.dirname(__FILE__), 'lib', 'support', 'gateway_support')
 
-PKG_VERSION = "1.4.2"
+
+PKG_VERSION = "1.5.0"
 PKG_NAME = "activemerchant"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
@@ -24,12 +25,14 @@ namespace :test do
   Rake::TestTask.new(:units) do |t|
     t.pattern = 'test/unit/**/*_test.rb'
     t.ruby_opts << '-rubygems'
+    t.libs << 'test'
     t.verbose = true
   end
 
   Rake::TestTask.new(:remote) do |t|
     t.pattern = 'test/remote/**/*_test.rb'
     t.ruby_opts << '-rubygems'
+    t.libs << 'test'
     t.verbose = true
   end
 
@@ -39,8 +42,8 @@ end
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "ActiveMerchant library"
-  rdoc.options << '--line-numbers' << '--inline-source' << '--main=README'
-  rdoc.rdoc_files.include('README', 'CHANGELOG')
+  rdoc.options << '--line-numbers' << '--inline-source' << '--main=README.rdoc'
+  rdoc.rdoc_files.include('README.rdoc', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/**/*.rb')
   rdoc.rdoc_files.exclude('lib/tasks')
 end
@@ -97,12 +100,6 @@ Rake::GemPackageTask.new(spec) do |p|
   p.need_zip = true
 end
 
-desc "Continuously watch unit tests"
-task :watch do
-  system("clear")
-  system("stakeout \"rake\" `find . -name '*.rb'`")
-end
-
 desc "Release the gems and docs to RubyForge"
 task :release => [ :publish, :upload_rdoc ]
 
@@ -154,6 +151,3 @@ namespace :gateways do
     end
   end
 end
-  
-  
-  

data/lib/active_merchant.rb

@@ -21,20 +21,15 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
                     
-$:.unshift(File.dirname(__FILE__))      
+$:.unshift File.dirname(__FILE__)
 
 # Include rails' active support for all the core extensions we love
 begin
   require 'active_support'
 rescue LoadError
   require 'rubygems'
-  
-  if respond_to? :gem
-    gem 'activesupport', ">=2.0.0"
-    require 'active_support'
-  else
-    require_gem 'activesupport'
-  end
+  gem 'activesupport', ">=2.0.0"
+  require 'active_support'
 end
 
 begin
@@ -45,32 +40,27 @@ rescue LoadError
 end
 
 require 'cgi'
-
+require 'rexml/document'
 require 'active_merchant/lib/utils'
 require 'active_merchant/lib/error'
 require 'active_merchant/lib/validateable'
+require 'active_merchant/lib/connection'
 require 'active_merchant/lib/posts_data'
 require 'active_merchant/lib/post_data'
 require 'active_merchant/lib/requires_parameters'
-
-# Require the country class
 require 'active_merchant/lib/country'
 
-# Address Verification
 require 'active_merchant/billing/avs_result'
-
-# Card Verfication Code
 require 'active_merchant/billing/cvv_result'
-
-# CreditCard Utility class. 
 require 'active_merchant/billing/credit_card_methods'
 require 'active_merchant/billing/credit_card_formatting'
 require 'active_merchant/billing/credit_card'
-
 require 'active_merchant/billing/base'
-
-# Require the supported gateways
+require 'active_merchant/billing/check'
 require 'active_merchant/billing/gateways'
 
-# Require the supported integrations
-require 'active_merchant/billing/integrations'
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:    
+    autoload :Integrations, 'active_merchant/billing/integrations'    
+  end
+end

data/lib/active_merchant/billing/avs_result.rb

@@ -1,3 +1,6 @@
+#!ruby19
+# encoding: utf-8
+
 module ActiveMerchant
   module Billing 
     # Implements the Address Verification System
@@ -13,23 +16,23 @@ module ActiveMerchant
         'C' => 'Street address and postal code do not match.',
         'D' => 'Street address and postal code match.',
         'E' => 'AVS data is invalid or AVS is not allowed for this card type.',
-        'F' => 'Card member’s name does not match, but billing postal code matches.',
+        'F' => 'Card member\'s name does not match, but billing postal code matches.',
         'G' => 'Non-U.S. issuing bank does not support AVS.',
-        'H' => 'Card member’s name does not match. Street address and postal code match.',
+        'H' => 'Card member\'s name does not match. Street address and postal code match.',
         'I' => 'Address not verified.',
-        'J' => 'Card member’s name, billing address, and postal code match. Shipping information verified and chargeback protection guaranteed through the Fraud Protection Program.',
-        'K' => 'Card member’s name matches but billing address and billing postal code do not match.',
-        'L' => 'Card member’s name and billing postal code match, but billing address does not match.',
+        'J' => 'Card member\'s name, billing address, and postal code match. Shipping information verified and chargeback protection guaranteed through the Fraud Protection Program.',
+        'K' => 'Card member\'s name matches but billing address and billing postal code do not match.',
+        'L' => 'Card member\'s name and billing postal code match, but billing address does not match.',
         'M' => 'Street address and postal code match.',
         'N' => 'Street address and postal code do not match.',
-        'O' => 'Card member’s name and billing address match, but billing postal code does not match.',
+        'O' => 'Card member\'s name and billing address match, but billing postal code does not match.',
         'P' => 'Postal code matches, but street address not verified.',
-        'Q' => 'Card member’s name, billing address, and postal code match. Shipping information verified but chargeback protection not guaranteed.',
+        'Q' => 'Card member\'s name, billing address, and postal code match. Shipping information verified but chargeback protection not guaranteed.',
         'R' => 'System unavailable.',
         'S' => 'U.S.-issuing bank does not support AVS.',
-        'T' => 'Card member’s name does not match, but street address matches.',
+        'T' => 'Card member\'s name does not match, but street address matches.',
         'U' => 'Address information unavailable.',
-        'V' => 'Card member’s name, billing address, and billing postal code match.',
+        'V' => 'Card member\'s name, billing address, and billing postal code match.',
         'W' => 'Street address does not match, but 9-digit postal code matches.',
         'X' => 'Street address and 9-digit postal code match.',
         'Y' => 'Street address and 5-digit postal code match.',
@@ -92,4 +95,4 @@ module ActiveMerchant
       end
     end
   end
-end
+end

data/lib/active_merchant/billing/base.rb

@@ -6,9 +6,9 @@ module ActiveMerchant #:nodoc:
       #   ActiveMerchant::Billing::Base.gateway_mode = :test
       mattr_accessor :gateway_mode
       
-      # Set ActiveMerchant gateways in test mode.
+      # Set ActiveMerchant integrations in test mode.
       #
-      #   ActiveMerchant::Billing::Base.gateway_mode = :test
+      #   ActiveMerchant::Billing::Base.integration_mode = :test
       mattr_accessor :integration_mode
       
       # Set both the mode of both the gateways and integrations

data/lib/active_merchant/billing/check.rb

@@ -5,7 +5,7 @@ module ActiveMerchant #:nodoc:
     # not backed by any database.
     # 
     # You may use Check in place of CreditCard with any gateway that supports it. Currently, only
-    # +BrainTreeGateway+ supports the Check object.
+    # +BraintreeGateway+ supports the Check object.
     class Check
       include Validateable
       

data/lib/active_merchant/billing/credit_card_methods.rb

@@ -8,13 +8,13 @@ module ActiveMerchant #:nodoc:
         'discover'           => /^(6011|65\d{2})\d{12}$/,
         'american_express'   => /^3[47]\d{13}$/,
         'diners_club'        => /^3(0[0-5]|[68]\d)\d{11}$/,
-        'jcb'                => /^3528\d{12}$/,
+        'jcb'                => /^35(28|29|[3-8]\d)\d{12}$/,
         'switch'             => /^6759\d{12}(\d{2,3})?$/,  
         'solo'               => /^6767\d{12}(\d{2,3})?$/,
         'dankort'            => /^5019\d{12}$/,
         'maestro'            => /^(5[06-8]|6\d)\d{10,17}$/,
         'forbrugsforeningen' => /^600722\d{10}$/,
-        'laser'              => /^(6304[89]\d{11}(\d{2,3})?|670695\d{13})$/
+        'laser'              => /^(6304|6706|6771|6709)\d{8}(\d{4}|\d{6,7})?$/
       }
     
       def self.included(base)

data/lib/active_merchant/billing/expiry_date.rb

@@ -1,19 +1,25 @@
+require 'date'
+
 module ActiveMerchant
   module Billing
     class CreditCard
       class ExpiryDate #:nodoc:
         attr_reader :month, :year
         def initialize(month, year)
-          @month = month
-          @year = year
+          @month = month.to_i
+          @year = year.to_i
         end
         
         def expired? #:nodoc:
-          Time.now > expiration rescue true
+          Time.now.utc > expiration
         end
         
         def expiration #:nodoc:
-          Time.parse("#{month}/#{month_days}/#{year} 23:59:59") rescue Time.at(0)
+          begin
+            Time.utc(year, month, month_days, 23, 59, 59)
+          rescue ArgumentError
+            Time.at(0).utc
+          end
         end
         
         private

data/lib/active_merchant/billing/gateway.rb

@@ -130,15 +130,17 @@ module ActiveMerchant #:nodoc:
         self.class.name.scan(/\:\:(\w+)Gateway/).flatten.first
       end
       
-      # Return a String with the amount in the appropriate format
-      #--
-      # TODO Refactor this method. It's a tad on the ugly side.
       def amount(money)
         return nil if money.nil?
-        cents = money.respond_to?(:cents) ? money.cents : money 
+        cents = if money.respond_to?(:cents)
+          warn "Support for Money objects is deprecated and will be removed from a future release of ActiveMerchant. Please use an Integer value in cents"
+          money.cents
+        else
+          money
+        end
 
         if money.is_a?(String) or cents.to_i < 0
-          raise ArgumentError, 'money amount must be either a Money object or a positive integer in cents.' 
+          raise ArgumentError, 'money amount must be a positive Integer in cents.' 
         end
 
         if self.money_format == :cents
@@ -148,7 +150,6 @@ module ActiveMerchant #:nodoc:
         end
       end
       
-      # Ascertains the currency to be used on the money supplied.
       def currency(money)
         money.respond_to?(:currency) ? money.currency : self.default_currency
       end

data/lib/active_merchant/billing/gateways.rb

@@ -1,3 +1,18 @@
-require 'active_merchant/billing/gateway'
-
-Dir[File.dirname(__FILE__) + '/gateways/*.rb'].each{|g| require g}
+module ActiveMerchant
+  module Billing
+    autoload :Gateway, 'active_merchant/billing/gateway'
+        
+    Dir[File.dirname(__FILE__) + '/gateways/**/*.rb'].each do |f|      
+      
+      # Get camelized class name 
+      filename = File.basename(f, '.rb')
+      # Add _gateway suffix
+      gateway_name = filename + '_gateway'
+      # Camelize the string to get the class name
+      gateway_class = gateway_name.camelize      
+      
+      # Register for autoloading
+      autoload gateway_class, f      
+    end
+  end
+end