tomriley-active_merchant 1.4.2.3 → 1.4.2.4

data/CHANGELOG

@@ -1,5 +1,19 @@
 = ActiveMerchant CHANGELOG
 
+* Fix typo preventing OgoneGateway from working in production [Nicolas Jacobeus]
+* 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]

data/CONTRIBUTERS

@@ -100,3 +100,15 @@ Merchant E-Solutions Gateway (May 3, 2009)
 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

data/active_merchant.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "active_merchant"
-  s.version  = "1.4.2.3"
+  s.version  = "1.4.2.4"
   s.date     = "2009-01-12"
   s.summary  = "Active Merchant is a simple payment abstraction library used in and sponsored by Shopify."
   s.homepage = "http://www.activemerchant.org/"
@@ -11,5 +11,6 @@ Gem::Specification.new do |s|
     ]
   s.has_rdoc = true
   # s.files = Dir['[a-zA-Z]*'] + Dir['generators/**/*'] + Dir['lib/**/*'] + Dir['rails/*'] + Dir['script/*'] + Dir['test/**/*']
-  s.files = ["lib/active_merchant", "lib/active_merchant/billing", "lib/active_merchant/billing/avs_result.rb", "lib/active_merchant/billing/base.rb", "lib/active_merchant/billing/check.rb", "lib/active_merchant/billing/credit_card.rb", "lib/active_merchant/billing/credit_card_formatting.rb", "lib/active_merchant/billing/credit_card_methods.rb", "lib/active_merchant/billing/cvv_result.rb", "lib/active_merchant/billing/expiry_date.rb", "lib/active_merchant/billing/gateway.rb", "lib/active_merchant/billing/gateways", "lib/active_merchant/billing/gateways/authorize_net.rb", "lib/active_merchant/billing/gateways/authorize_net_cim.rb", "lib/active_merchant/billing/gateways/beanstream", "lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb", "lib/active_merchant/billing/gateways/beanstream.rb", "lib/active_merchant/billing/gateways/beanstream_interac.rb", "lib/active_merchant/billing/gateways/bogus.rb", "lib/active_merchant/billing/gateways/braintree.rb", "lib/active_merchant/billing/gateways/card_stream.rb", "lib/active_merchant/billing/gateways/cyber_source.rb", "lib/active_merchant/billing/gateways/data_cash.rb", "lib/active_merchant/billing/gateways/efsnet.rb", "lib/active_merchant/billing/gateways/eway.rb", "lib/active_merchant/billing/gateways/exact.rb", "lib/active_merchant/billing/gateways/instapay.rb", "lib/active_merchant/billing/gateways/linkpoint.rb", "lib/active_merchant/billing/gateways/merchant_e_solutions.rb", "lib/active_merchant/billing/gateways/modern_payments.rb", "lib/active_merchant/billing/gateways/modern_payments_cim.rb", "lib/active_merchant/billing/gateways/moneris.rb", "lib/active_merchant/billing/gateways/net_registry.rb", "lib/active_merchant/billing/gateways/netbilling.rb", "lib/active_merchant/billing/gateways/pay_junction.rb", "lib/active_merchant/billing/gateways/pay_secure.rb", "lib/active_merchant/billing/gateways/payflow", "lib/active_merchant/billing/gateways/payflow/payflow_common_api.rb", "lib/active_merchant/billing/gateways/payflow/payflow_express_response.rb", "lib/active_merchant/billing/gateways/payflow/payflow_response.rb", "lib/active_merchant/billing/gateways/payflow.rb", "lib/active_merchant/billing/gateways/payflow_express.rb", "lib/active_merchant/billing/gateways/payflow_express_uk.rb", "lib/active_merchant/billing/gateways/payflow_uk.rb", "lib/active_merchant/billing/gateways/payment_express.rb", "lib/active_merchant/billing/gateways/paypal", "lib/active_merchant/billing/gateways/paypal/paypal_common_api.rb", "lib/active_merchant/billing/gateways/paypal/paypal_express_response.rb", "lib/active_merchant/billing/gateways/paypal.rb", "lib/active_merchant/billing/gateways/paypal_ca.rb", "lib/active_merchant/billing/gateways/paypal_express.rb", "lib/active_merchant/billing/gateways/paypal_express_common.rb", "lib/active_merchant/billing/gateways/plugnpay.rb", "lib/active_merchant/billing/gateways/protx.rb", "lib/active_merchant/billing/gateways/psigate.rb", "lib/active_merchant/billing/gateways/psl_card.rb", "lib/active_merchant/billing/gateways/quickpay.rb", "lib/active_merchant/billing/gateways/realex.rb", "lib/active_merchant/billing/gateways/sage", "lib/active_merchant/billing/gateways/sage/sage_bankcard.rb", "lib/active_merchant/billing/gateways/sage/sage_core.rb", "lib/active_merchant/billing/gateways/sage/sage_virtual_check.rb", "lib/active_merchant/billing/gateways/sage.rb", "lib/active_merchant/billing/gateways/secure_pay.rb", "lib/active_merchant/billing/gateways/secure_pay_au.rb", "lib/active_merchant/billing/gateways/secure_pay_tech.rb", "lib/active_merchant/billing/gateways/skip_jack.rb", "lib/active_merchant/billing/gateways/smart_ps.rb", "lib/active_merchant/billing/gateways/trans_first.rb", "lib/active_merchant/billing/gateways/transax.rb", "lib/active_merchant/billing/gateways/trust_commerce.rb", "lib/active_merchant/billing/gateways/usa_epay.rb", "lib/active_merchant/billing/gateways/verifi.rb", "lib/active_merchant/billing/gateways/viaklix.rb", "lib/active_merchant/billing/gateways/wirecard.rb", "lib/active_merchant/billing/gateways.rb", "lib/active_merchant/billing/integrations", "lib/active_merchant/billing/integrations/action_view_helper.rb", "lib/active_merchant/billing/integrations/bogus", "lib/active_merchant/billing/integrations/bogus/helper.rb", "lib/active_merchant/billing/integrations/bogus/notification.rb", "lib/active_merchant/billing/integrations/bogus/return.rb", "lib/active_merchant/billing/integrations/bogus.rb", "lib/active_merchant/billing/integrations/chronopay", "lib/active_merchant/billing/integrations/chronopay/helper.rb", "lib/active_merchant/billing/integrations/chronopay/notification.rb", "lib/active_merchant/billing/integrations/chronopay/return.rb", "lib/active_merchant/billing/integrations/chronopay.rb", "lib/active_merchant/billing/integrations/gestpay", "lib/active_merchant/billing/integrations/gestpay/common.rb", "lib/active_merchant/billing/integrations/gestpay/helper.rb", "lib/active_merchant/billing/integrations/gestpay/notification.rb", "lib/active_merchant/billing/integrations/gestpay/return.rb", "lib/active_merchant/billing/integrations/gestpay.rb", "lib/active_merchant/billing/integrations/helper.rb", "lib/active_merchant/billing/integrations/hi_trust", "lib/active_merchant/billing/integrations/hi_trust/helper.rb", "lib/active_merchant/billing/integrations/hi_trust/notification.rb", "lib/active_merchant/billing/integrations/hi_trust/return.rb", "lib/active_merchant/billing/integrations/hi_trust.rb", "lib/active_merchant/billing/integrations/nochex", "lib/active_merchant/billing/integrations/nochex/helper.rb", "lib/active_merchant/billing/integrations/nochex/notification.rb", "lib/active_merchant/billing/integrations/nochex/return.rb", "lib/active_merchant/billing/integrations/nochex.rb", "lib/active_merchant/billing/integrations/notification.rb", "lib/active_merchant/billing/integrations/paypal", "lib/active_merchant/billing/integrations/paypal/helper.rb", "lib/active_merchant/billing/integrations/paypal/notification.rb", "lib/active_merchant/billing/integrations/paypal/return.rb", "lib/active_merchant/billing/integrations/paypal.rb", "lib/active_merchant/billing/integrations/quickpay", "lib/active_merchant/billing/integrations/quickpay/helper.rb", "lib/active_merchant/billing/integrations/quickpay/notification.rb", "lib/active_merchant/billing/integrations/quickpay.rb", "lib/active_merchant/billing/integrations/return.rb", "lib/active_merchant/billing/integrations/two_checkout", "lib/active_merchant/billing/integrations/two_checkout/helper.rb", "lib/active_merchant/billing/integrations/two_checkout/notification.rb", "lib/active_merchant/billing/integrations/two_checkout/return.rb", "lib/active_merchant/billing/integrations/two_checkout.rb", "lib/active_merchant/billing/integrations.rb", "lib/active_merchant/billing/response.rb", "lib/active_merchant/lib", "lib/active_merchant/lib/connection.rb", "lib/active_merchant/lib/country.rb", "lib/active_merchant/lib/error.rb", "lib/active_merchant/lib/post_data.rb", "lib/active_merchant/lib/posts_data.rb", "lib/active_merchant/lib/requires_parameters.rb", "lib/active_merchant/lib/utils.rb", "lib/active_merchant/lib/validateable.rb", "lib/active_merchant.rb", "lib/certs", "lib/certs/cacert.pem", "lib/support", "lib/support/gateway_support.rb", "test/fixtures.yml", "test/remote", "test/remote/gateways", "test/remote/gateways/remote_authorize_net_cim_test.rb", "test/remote/gateways/remote_authorize_net_test.rb", "test/remote/gateways/remote_beanstream_interac_test.rb", "test/remote/gateways/remote_beanstream_test.rb", "test/remote/gateways/remote_braintree_test.rb", "test/remote/gateways/remote_card_stream_test.rb", "test/remote/gateways/remote_cyber_source_test.rb", "test/remote/gateways/remote_data_cash_test.rb", "test/remote/gateways/remote_efsnet_test.rb", "test/remote/gateways/remote_eway_test.rb", "test/remote/gateways/remote_exact_test.rb", "test/remote/gateways/remote_instapay_test.rb", "test/remote/gateways/remote_linkpoint_test.rb", "test/remote/gateways/remote_merchant_e_solutions_test.rb", "test/remote/gateways/remote_modern_payments_cim_test.rb", "test/remote/gateways/remote_modern_payments_test.rb", "test/remote/gateways/remote_moneris_test.rb", "test/remote/gateways/remote_net_registry_test.rb", "test/remote/gateways/remote_netbilling_test.rb", "test/remote/gateways/remote_pay_junction_test.rb", "test/remote/gateways/remote_pay_secure_test.rb", "test/remote/gateways/remote_payflow_express_test.rb", "test/remote/gateways/remote_payflow_test.rb", "test/remote/gateways/remote_payflow_uk_test.rb", "test/remote/gateways/remote_payment_express_test.rb", "test/remote/gateways/remote_paypal_express_test.rb", "test/remote/gateways/remote_paypal_test.rb", "test/remote/gateways/remote_plugnpay_test.rb", "test/remote/gateways/remote_protx_test.rb", "test/remote/gateways/remote_psigate_test.rb", "test/remote/gateways/remote_psl_card_test.rb", "test/remote/gateways/remote_quickpay_test.rb", "test/remote/gateways/remote_realex_test.rb", "test/remote/gateways/remote_sage_bankcard_test.rb", "test/remote/gateways/remote_sage_test.rb", "test/remote/gateways/remote_sage_virtual_check_test.rb", "test/remote/gateways/remote_secure_pay_au_test.rb", "test/remote/gateways/remote_secure_pay_tech_test.rb", "test/remote/gateways/remote_secure_pay_test.rb", "test/remote/gateways/remote_skipjack_test.rb", "test/remote/gateways/remote_trans_first_test.rb", "test/remote/gateways/remote_transax_test.rb", "test/remote/gateways/remote_trust_commerce_test.rb", "test/remote/gateways/remote_usa_epay_test.rb", "test/remote/gateways/remote_verifi_test.rb", "test/remote/gateways/remote_viaklix_test.rb", "test/remote/gateways/remote_wirecard_test.rb", "test/remote/integrations", "test/remote/integrations/remote_gestpay_integration_test.rb", "test/remote/integrations/remote_paypal_integration_test.rb", "test/test_helper.rb", "test/unit", "test/unit/avs_result_test.rb", "test/unit/base_test.rb", "test/unit/check_test.rb", "test/unit/connection_test.rb", "test/unit/country_code_test.rb", "test/unit/country_test.rb", "test/unit/credit_card_formatting_test.rb", "test/unit/credit_card_methods_test.rb", "test/unit/credit_card_test.rb", "test/unit/cvv_result_test.rb", "test/unit/expiry_date_test.rb", "test/unit/gateways", "test/unit/gateways/authorize_net_cim_test.rb", "test/unit/gateways/authorize_net_test.rb", "test/unit/gateways/beanstream_interac_test.rb", "test/unit/gateways/beanstream_test.rb", "test/unit/gateways/bogus_test.rb", "test/unit/gateways/braintree_test.rb", "test/unit/gateways/card_stream_test.rb", "test/unit/gateways/cyber_source_test.rb", "test/unit/gateways/data_cash_test.rb", "test/unit/gateways/efsnet_test.rb", "test/unit/gateways/eway_test.rb", "test/unit/gateways/exact_test.rb", "test/unit/gateways/gateway_test.rb", "test/unit/gateways/instapay_test.rb", "test/unit/gateways/linkpoint_test.rb", "test/unit/gateways/merchant_e_solutions_test.rb", "test/unit/gateways/modern_payments_cim_test.rb", "test/unit/gateways/moneris_test.rb", "test/unit/gateways/net_registry_test.rb", "test/unit/gateways/netbilling_test.rb", "test/unit/gateways/pay_junction_test.rb", "test/unit/gateways/pay_secure_test.rb", "test/unit/gateways/payflow_express_test.rb", "test/unit/gateways/payflow_express_uk_test.rb", "test/unit/gateways/payflow_test.rb", "test/unit/gateways/payflow_uk_test.rb", "test/unit/gateways/payment_express_test.rb", "test/unit/gateways/paypal_express_test.rb", "test/unit/gateways/paypal_test.rb", "test/unit/gateways/plugnpay_test.rb", "test/unit/gateways/protx_test.rb", "test/unit/gateways/psigate_test.rb", "test/unit/gateways/psl_card_test.rb", "test/unit/gateways/quickpay_test.rb", "test/unit/gateways/realex_test.rb", "test/unit/gateways/sage_bankcard_test.rb", "test/unit/gateways/sage_virtual_check_test.rb", "test/unit/gateways/secure_pay_au_test.rb", "test/unit/gateways/secure_pay_tech_test.rb", "test/unit/gateways/secure_pay_test.rb", "test/unit/gateways/skip_jack_test.rb", "test/unit/gateways/trans_first_test.rb", "test/unit/gateways/trust_commerce_test.rb", "test/unit/gateways/usa_epay_test.rb", "test/unit/gateways/verifi_test.rb", "test/unit/gateways/viaklix_test.rb", "test/unit/gateways/wirecard_test.rb", "test/unit/generators", "test/unit/generators/test_gateway_generator.rb", "test/unit/generators/test_generator_helper.rb", "test/unit/generators/test_integration_generator.rb", "test/unit/integrations", "test/unit/integrations/action_view_helper_test.rb", "test/unit/integrations/bogus_module_test.rb", "test/unit/integrations/chronopay_module_test.rb", "test/unit/integrations/gestpay_module_test.rb", "test/unit/integrations/helpers", "test/unit/integrations/helpers/bogus_helper_test.rb", "test/unit/integrations/helpers/chronopay_helper_test.rb", "test/unit/integrations/helpers/gestpay_helper_test.rb", "test/unit/integrations/helpers/hi_trust_helper_test.rb", "test/unit/integrations/helpers/nochex_helper_test.rb", "test/unit/integrations/helpers/paypal_helper_test.rb", "test/unit/integrations/helpers/quickpay_helper_test.rb", "test/unit/integrations/helpers/two_checkout_helper_test.rb", "test/unit/integrations/hi_trust_module_test.rb", "test/unit/integrations/nochex_module_test.rb", "test/unit/integrations/notifications", "test/unit/integrations/notifications/chronopay_notification_test.rb", "test/unit/integrations/notifications/gestpay_notification_test.rb", "test/unit/integrations/notifications/hi_trust_notification_test.rb", "test/unit/integrations/notifications/nochex_notification_test.rb", "test/unit/integrations/notifications/notification_test.rb", "test/unit/integrations/notifications/paypal_notification_test.rb", "test/unit/integrations/notifications/quickpay_notification_test.rb", "test/unit/integrations/notifications/two_checkout_notification_test.rb", "test/unit/integrations/paypal_module_test.rb", "test/unit/integrations/quickpay_module_test.rb", "test/unit/integrations/returns", "test/unit/integrations/returns/chronopay_return_test.rb", "test/unit/integrations/returns/gestpay_return_test.rb", "test/unit/integrations/returns/hi_trust_return_test.rb", "test/unit/integrations/returns/nochex_return_test.rb", "test/unit/integrations/returns/paypal_return_test.rb", "test/unit/integrations/returns/return_test.rb", "test/unit/integrations/returns/two_checkout_return_test.rb", "test/unit/integrations/two_checkout_module_test.rb", "test/unit/post_data_test.rb", "test/unit/posts_data_test.rb", "test/unit/response_test.rb", "test/unit/utils_test.rb", "test/unit/validateable_test.rb", "script/destroy", "script/generate", "active_merchant.gemspec", "CHANGELOG", "CONTRIBUTERS", "gem-public_cert.pem", "generators", "init.rb", "lib", "MIT-LICENSE", "rails", "Rakefile", "README", "script", "test"]
+  s.files = ["lib/active_merchant", "lib/active_merchant/billing", "lib/active_merchant/billing/avs_result.rb", "lib/active_merchant/billing/base.rb", "lib/active_merchant/billing/check.rb", "lib/active_merchant/billing/credit_card.rb", "lib/active_merchant/billing/credit_card_formatting.rb", "lib/active_merchant/billing/credit_card_methods.rb", "lib/active_merchant/billing/cvv_result.rb", "lib/active_merchant/billing/expiry_date.rb", "lib/active_merchant/billing/gateway.rb", "lib/active_merchant/billing/gateways", "lib/active_merchant/billing/gateways/authorize_net.rb", "lib/active_merchant/billing/gateways/authorize_net_cim.rb", "lib/active_merchant/billing/gateways/beanstream", "lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb", "lib/active_merchant/billing/gateways/beanstream.rb", "lib/active_merchant/billing/gateways/beanstream_interac.rb", "lib/active_merchant/billing/gateways/bogus.rb", "lib/active_merchant/billing/gateways/braintree.rb", "lib/active_merchant/billing/gateways/card_stream.rb", "lib/active_merchant/billing/gateways/cyber_source.rb", "lib/active_merchant/billing/gateways/data_cash.rb", "lib/active_merchant/billing/gateways/efsnet.rb", "lib/active_merchant/billing/gateways/eway.rb", "lib/active_merchant/billing/gateways/exact.rb", "lib/active_merchant/billing/gateways/first_pay.rb", "lib/active_merchant/billing/gateways/instapay.rb", "lib/active_merchant/billing/gateways/linkpoint.rb", "lib/active_merchant/billing/gateways/merchant_e_solutions.rb", "lib/active_merchant/billing/gateways/merchant_ware.rb", "lib/active_merchant/billing/gateways/modern_payments.rb", "lib/active_merchant/billing/gateways/modern_payments_cim.rb", "lib/active_merchant/billing/gateways/moneris.rb", "lib/active_merchant/billing/gateways/net_registry.rb", "lib/active_merchant/billing/gateways/netbilling.rb", "lib/active_merchant/billing/gateways/ogone.rb", "lib/active_merchant/billing/gateways/pay_junction.rb", "lib/active_merchant/billing/gateways/pay_secure.rb", "lib/active_merchant/billing/gateways/payflow", "lib/active_merchant/billing/gateways/payflow/payflow_common_api.rb", "lib/active_merchant/billing/gateways/payflow/payflow_express_response.rb", "lib/active_merchant/billing/gateways/payflow/payflow_response.rb", "lib/active_merchant/billing/gateways/payflow.rb", "lib/active_merchant/billing/gateways/payflow_express.rb", "lib/active_merchant/billing/gateways/payflow_express_uk.rb", "lib/active_merchant/billing/gateways/payflow_uk.rb", "lib/active_merchant/billing/gateways/payment_express.rb", "lib/active_merchant/billing/gateways/paypal", "lib/active_merchant/billing/gateways/paypal/paypal_common_api.rb", "lib/active_merchant/billing/gateways/paypal/paypal_express_response.rb", "lib/active_merchant/billing/gateways/paypal.rb", "lib/active_merchant/billing/gateways/paypal_ca.rb", "lib/active_merchant/billing/gateways/paypal_express.rb", "lib/active_merchant/billing/gateways/paypal_express_common.rb", "lib/active_merchant/billing/gateways/plugnpay.rb", "lib/active_merchant/billing/gateways/psigate.rb", "lib/active_merchant/billing/gateways/psl_card.rb", "lib/active_merchant/billing/gateways/quickpay.rb", "lib/active_merchant/billing/gateways/realex.rb", "lib/active_merchant/billing/gateways/sage", "lib/active_merchant/billing/gateways/sage/sage_bankcard.rb", "lib/active_merchant/billing/gateways/sage/sage_core.rb", "lib/active_merchant/billing/gateways/sage/sage_virtual_check.rb", "lib/active_merchant/billing/gateways/sage.rb", "lib/active_merchant/billing/gateways/sage_pay.rb", "lib/active_merchant/billing/gateways/secure_pay.rb", "lib/active_merchant/billing/gateways/secure_pay_au.rb", "lib/active_merchant/billing/gateways/secure_pay_tech.rb", "lib/active_merchant/billing/gateways/skip_jack.rb", "lib/active_merchant/billing/gateways/smart_ps.rb", "lib/active_merchant/billing/gateways/trans_first.rb", "lib/active_merchant/billing/gateways/transax.rb", "lib/active_merchant/billing/gateways/trust_commerce.rb", "lib/active_merchant/billing/gateways/usa_epay.rb", "lib/active_merchant/billing/gateways/verifi.rb", "lib/active_merchant/billing/gateways/viaklix.rb", "lib/active_merchant/billing/gateways/wirecard.rb", "lib/active_merchant/billing/gateways.rb", "lib/active_merchant/billing/integrations", "lib/active_merchant/billing/integrations/action_view_helper.rb", "lib/active_merchant/billing/integrations/bogus", "lib/active_merchant/billing/integrations/bogus/helper.rb", "lib/active_merchant/billing/integrations/bogus/notification.rb", "lib/active_merchant/billing/integrations/bogus/return.rb", "lib/active_merchant/billing/integrations/bogus.rb", "lib/active_merchant/billing/integrations/chronopay", "lib/active_merchant/billing/integrations/chronopay/helper.rb", "lib/active_merchant/billing/integrations/chronopay/notification.rb", "lib/active_merchant/billing/integrations/chronopay/return.rb", "lib/active_merchant/billing/integrations/chronopay.rb", "lib/active_merchant/billing/integrations/gestpay", "lib/active_merchant/billing/integrations/gestpay/common.rb", "lib/active_merchant/billing/integrations/gestpay/helper.rb", "lib/active_merchant/billing/integrations/gestpay/notification.rb", "lib/active_merchant/billing/integrations/gestpay/return.rb", "lib/active_merchant/billing/integrations/gestpay.rb", "lib/active_merchant/billing/integrations/helper.rb", "lib/active_merchant/billing/integrations/hi_trust", "lib/active_merchant/billing/integrations/hi_trust/helper.rb", "lib/active_merchant/billing/integrations/hi_trust/notification.rb", "lib/active_merchant/billing/integrations/hi_trust/return.rb", "lib/active_merchant/billing/integrations/hi_trust.rb", "lib/active_merchant/billing/integrations/nochex", "lib/active_merchant/billing/integrations/nochex/helper.rb", "lib/active_merchant/billing/integrations/nochex/notification.rb", "lib/active_merchant/billing/integrations/nochex/return.rb", "lib/active_merchant/billing/integrations/nochex.rb", "lib/active_merchant/billing/integrations/notification.rb", "lib/active_merchant/billing/integrations/paypal", "lib/active_merchant/billing/integrations/paypal/helper.rb", "lib/active_merchant/billing/integrations/paypal/notification.rb", "lib/active_merchant/billing/integrations/paypal/return.rb", "lib/active_merchant/billing/integrations/paypal.rb", "lib/active_merchant/billing/integrations/quickpay", "lib/active_merchant/billing/integrations/quickpay/helper.rb", "lib/active_merchant/billing/integrations/quickpay/notification.rb", "lib/active_merchant/billing/integrations/quickpay.rb", "lib/active_merchant/billing/integrations/return.rb", "lib/active_merchant/billing/integrations/two_checkout", "lib/active_merchant/billing/integrations/two_checkout/helper.rb", "lib/active_merchant/billing/integrations/two_checkout/notification.rb", "lib/active_merchant/billing/integrations/two_checkout/return.rb", "lib/active_merchant/billing/integrations/two_checkout.rb", "lib/active_merchant/billing/integrations.rb", "lib/active_merchant/billing/response.rb", "lib/active_merchant/lib", "lib/active_merchant/lib/connection.rb", "lib/active_merchant/lib/country.rb", "lib/active_merchant/lib/error.rb", "lib/active_merchant/lib/post_data.rb", "lib/active_merchant/lib/posts_data.rb", "lib/active_merchant/lib/requires_parameters.rb", "lib/active_merchant/lib/utils.rb", "lib/active_merchant/lib/validateable.rb", "lib/active_merchant.rb", "lib/certs", "lib/certs/cacert.pem", "lib/support", "lib/support/gateway_support.rb", "test/fixtures.yml", "test/remote", "test/remote/gateways", "test/remote/gateways/remote_authorize_net_cim_test.rb", "test/remote/gateways/remote_authorize_net_test.rb", "test/remote/gateways/remote_beanstream_interac_test.rb", "test/remote/gateways/remote_beanstream_test.rb", "test/remote/gateways/remote_braintree_test.rb", "test/remote/gateways/remote_card_stream_test.rb", "test/remote/gateways/remote_cyber_source_test.rb", "test/remote/gateways/remote_data_cash_test.rb", "test/remote/gateways/remote_efsnet_test.rb", "test/remote/gateways/remote_eway_test.rb", "test/remote/gateways/remote_exact_test.rb", "test/remote/gateways/remote_first_pay_test.rb", "test/remote/gateways/remote_instapay_test.rb", "test/remote/gateways/remote_linkpoint_test.rb", "test/remote/gateways/remote_merchant_e_solutions_test.rb", "test/remote/gateways/remote_merchant_ware_test.rb", "test/remote/gateways/remote_modern_payments_cim_test.rb", "test/remote/gateways/remote_modern_payments_test.rb", "test/remote/gateways/remote_moneris_test.rb", "test/remote/gateways/remote_net_registry_test.rb", "test/remote/gateways/remote_netbilling_test.rb", "test/remote/gateways/remote_ogone_test.rb", "test/remote/gateways/remote_pay_junction_test.rb", "test/remote/gateways/remote_pay_secure_test.rb", "test/remote/gateways/remote_payflow_express_test.rb", "test/remote/gateways/remote_payflow_test.rb", "test/remote/gateways/remote_payflow_uk_test.rb", "test/remote/gateways/remote_payment_express_test.rb", "test/remote/gateways/remote_paypal_express_test.rb", "test/remote/gateways/remote_paypal_test.rb", "test/remote/gateways/remote_plugnpay_test.rb", "test/remote/gateways/remote_protx_three_d_secure_test.rb", "test/remote/gateways/remote_psigate_test.rb", "test/remote/gateways/remote_psl_card_test.rb", "test/remote/gateways/remote_quickpay_test.rb", "test/remote/gateways/remote_realex_test.rb", "test/remote/gateways/remote_sage_bankcard_test.rb", "test/remote/gateways/remote_sage_pay_test.rb", "test/remote/gateways/remote_sage_test.rb", "test/remote/gateways/remote_sage_virtual_check_test.rb", "test/remote/gateways/remote_secure_pay_au_test.rb", "test/remote/gateways/remote_secure_pay_tech_test.rb", "test/remote/gateways/remote_secure_pay_test.rb", "test/remote/gateways/remote_skipjack_test.rb", "test/remote/gateways/remote_trans_first_test.rb", "test/remote/gateways/remote_transax_test.rb", "test/remote/gateways/remote_trust_commerce_test.rb", "test/remote/gateways/remote_usa_epay_test.rb", "test/remote/gateways/remote_verifi_test.rb", "test/remote/gateways/remote_viaklix_test.rb", "test/remote/gateways/remote_wirecard_test.rb", "test/remote/integrations", "test/remote/integrations/remote_gestpay_integration_test.rb", "test/remote/integrations/remote_paypal_integration_test.rb", "test/test_helper.rb", "test/unit", "test/unit/avs_result_test.rb", "test/unit/base_test.rb", "test/unit/check_test.rb", "test/unit/connection_test.rb", "test/unit/country_code_test.rb", "test/unit/country_test.rb", "test/unit/credit_card_formatting_test.rb", "test/unit/credit_card_methods_test.rb", "test/unit/credit_card_test.rb", "test/unit/cvv_result_test.rb", "test/unit/expiry_date_test.rb", "test/unit/gateways", "test/unit/gateways/authorize_net_cim_test.rb", "test/unit/gateways/authorize_net_test.rb", "test/unit/gateways/beanstream_interac_test.rb", "test/unit/gateways/beanstream_test.rb", "test/unit/gateways/bogus_test.rb", "test/unit/gateways/braintree_test.rb", "test/unit/gateways/card_stream_test.rb", "test/unit/gateways/cyber_source_test.rb", "test/unit/gateways/data_cash_test.rb", "test/unit/gateways/efsnet_test.rb", "test/unit/gateways/eway_test.rb", "test/unit/gateways/exact_test.rb", "test/unit/gateways/first_pay_test.rb", "test/unit/gateways/gateway_test.rb", "test/unit/gateways/instapay_test.rb", "test/unit/gateways/linkpoint_test.rb", "test/unit/gateways/merchant_e_solutions_test.rb", "test/unit/gateways/merchant_ware_test.rb", "test/unit/gateways/modern_payments_cim_test.rb", "test/unit/gateways/moneris_test.rb", "test/unit/gateways/net_registry_test.rb", "test/unit/gateways/netbilling_test.rb", "test/unit/gateways/ogone_test.rb", "test/unit/gateways/pay_junction_test.rb", "test/unit/gateways/pay_secure_test.rb", "test/unit/gateways/payflow_express_test.rb", "test/unit/gateways/payflow_express_uk_test.rb", "test/unit/gateways/payflow_test.rb", "test/unit/gateways/payflow_uk_test.rb", "test/unit/gateways/payment_express_test.rb", "test/unit/gateways/paypal_express_test.rb", "test/unit/gateways/paypal_test.rb", "test/unit/gateways/plugnpay_test.rb", "test/unit/gateways/psigate_test.rb", "test/unit/gateways/psl_card_test.rb", "test/unit/gateways/quickpay_test.rb", "test/unit/gateways/realex_test.rb", "test/unit/gateways/sage_bankcard_test.rb", "test/unit/gateways/sage_pay_test.rb", "test/unit/gateways/sage_virtual_check_test.rb", "test/unit/gateways/secure_pay_au_test.rb", "test/unit/gateways/secure_pay_tech_test.rb", "test/unit/gateways/secure_pay_test.rb", "test/unit/gateways/skip_jack_test.rb", "test/unit/gateways/trans_first_test.rb", "test/unit/gateways/trust_commerce_test.rb", "test/unit/gateways/usa_epay_test.rb", "test/unit/gateways/verifi_test.rb", "test/unit/gateways/viaklix_test.rb", "test/unit/gateways/wirecard_test.rb", "test/unit/generators", "test/unit/generators/test_gateway_generator.rb", "test/unit/generators/test_generator_helper.rb", "test/unit/generators/test_integration_generator.rb", "test/unit/integrations", "test/unit/integrations/action_view_helper_test.rb", "test/unit/integrations/bogus_module_test.rb", "test/unit/integrations/chronopay_module_test.rb", "test/unit/integrations/gestpay_module_test.rb", "test/unit/integrations/helpers", "test/unit/integrations/helpers/bogus_helper_test.rb", "test/unit/integrations/helpers/chronopay_helper_test.rb", "test/unit/integrations/helpers/gestpay_helper_test.rb", "test/unit/integrations/helpers/hi_trust_helper_test.rb", "test/unit/integrations/helpers/nochex_helper_test.rb", "test/unit/integrations/helpers/paypal_helper_test.rb", "test/unit/integrations/helpers/quickpay_helper_test.rb", "test/unit/integrations/helpers/two_checkout_helper_test.rb", "test/unit/integrations/hi_trust_module_test.rb", "test/unit/integrations/nochex_module_test.rb", "test/unit/integrations/notifications", "test/unit/integrations/notifications/chronopay_notification_test.rb", "test/unit/integrations/notifications/gestpay_notification_test.rb", "test/unit/integrations/notifications/hi_trust_notification_test.rb", "test/unit/integrations/notifications/nochex_notification_test.rb", "test/unit/integrations/notifications/notification_test.rb", "test/unit/integrations/notifications/paypal_notification_test.rb", "test/unit/integrations/notifications/quickpay_notification_test.rb", "test/unit/integrations/notifications/two_checkout_notification_test.rb", "test/unit/integrations/paypal_module_test.rb", "test/unit/integrations/quickpay_module_test.rb", "test/unit/integrations/returns", "test/unit/integrations/returns/chronopay_return_test.rb", "test/unit/integrations/returns/gestpay_return_test.rb", "test/unit/integrations/returns/hi_trust_return_test.rb", "test/unit/integrations/returns/nochex_return_test.rb", "test/unit/integrations/returns/paypal_return_test.rb", "test/unit/integrations/returns/return_test.rb", "test/unit/integrations/returns/two_checkout_return_test.rb", "test/unit/integrations/two_checkout_module_test.rb", "test/unit/post_data_test.rb", "test/unit/posts_data_test.rb", "test/unit/response_test.rb", "test/unit/utils_test.rb", "test/unit/validateable_test.rb", "script/destroy", "script/generate", "active_merchant.gemspec", "CHANGELOG", "CONTRIBUTERS", "gem-public_cert.pem", "generators", "init.rb", "lib", "MIT-LICENSE", "rails", "Rakefile", "README", "script", "test"]
+  
 end

data/init.rb

@@ -1,4 +1,3 @@
 require 'active_merchant'
 require 'active_merchant/billing/integrations/action_view_helper'
 ActionView::Base.send(:include, ActiveMerchant::Billing::Integrations::ActionViewHelper)
-ActiveMerchant::Billing::Gateway.logger = Rails.logger

data/lib/active_merchant/billing/credit_card_methods.rb

@@ -14,7 +14,7 @@ module ActiveMerchant #:nodoc:
         '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

@@ -88,6 +88,10 @@ module ActiveMerchant #:nodoc:
       class_inheritable_accessor :supported_cardtypes
       self.supported_cardtypes = []
       
+      # Indicates if the gateway supports 3D Secure authentication or not
+      class_inheritable_accessor :supports_3d_secure
+      self.supports_3d_secure = false
+      
       class_inheritable_accessor :homepage_url
       class_inheritable_accessor :display_name
       

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

@@ -334,7 +334,6 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_address(post, options)
-
         if address = options[:billing_address] || options[:address]
           post[:address] = address[:address1].to_s
           post[:company] = address[:company].to_s
@@ -344,6 +343,18 @@ module ActiveMerchant #:nodoc:
           post[:country] = address[:country].to_s
           post[:state]   = address[:state].blank?  ? 'n/a' : address[:state]
         end
+        
+        if address = options[:shipping_address]
+          post[:ship_to_first_name] = address[:first_name].to_s
+          post[:ship_to_last_name] = address[:last_name].to_s
+          post[:ship_to_address] = address[:address1].to_s
+          post[:ship_to_company] = address[:company].to_s
+          post[:ship_to_phone]   = address[:phone].to_s
+          post[:ship_to_zip]     = address[:zip].to_s
+          post[:ship_to_city]    = address[:city].to_s
+          post[:ship_to_country] = address[:country].to_s
+          post[:ship_to_state]   = address[:state].blank?  ? 'n/a' : address[:state]
+        end
       end
 
       # Make a ruby type out of the response string

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

@@ -583,6 +583,7 @@ module ActiveMerchant #:nodoc:
           xml.tag!('cardNumber', credit_card.number)
           # The expiration date of the credit card used for the subscription
           xml.tag!('expirationDate', expdate(credit_card))
+          xml.tag!('cardCode', credit_card.verification_value) if credit_card.verification_value?
         end
       end
       
@@ -699,4 +700,4 @@ module ActiveMerchant #:nodoc:
       end
     end
   end
-end
+end

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

@@ -6,14 +6,21 @@ module ActiveMerchant #:nodoc:
       
       SUCCESS_MESSAGE = "Bogus Gateway: Forced success"
       FAILURE_MESSAGE = "Bogus Gateway: Forced failure"
+      THREE_D_SECURE_MESSAGE = "Bogus Gateway: Requires additional 3D secure authentication"
       ERROR_MESSAGE = "Bogus Gateway: Use CreditCard number 1 for success, 2 for exception and anything else for error"
       CREDIT_ERROR_MESSAGE = "Bogus Gateway: Use trans_id 1 for success, 2 for exception and anything else for error"
       UNSTORE_ERROR_MESSAGE = "Bogus Gateway: Use trans_id 1 for success, 2 for exception and anything else for error"
       CAPTURE_ERROR_MESSAGE = "Bogus Gateway: Use authorization number 1 for exception, 2 for error and anything else for success"
       VOID_ERROR_MESSAGE = "Bogus Gateway: Use authorization number 1 for exception, 2 for error and anything else for success"
       
+      THREE_D_MD = 'md'
+      THREE_D_PA_REQ = 'pa_req'
+      THREE_D_PA_RES = 'pa_res'
+      THREE_D_ACS_URL = 'https://domain.com/3d_secure_page'
+
       self.supported_countries = ['US']
       self.supported_cardtypes = [:bogus]
+      self.supports_3d_secure = true
       self.homepage_url = 'http://example.com'
       self.display_name = 'Bogus'
       
@@ -23,6 +30,8 @@ module ActiveMerchant #:nodoc:
           Response.new(true, SUCCESS_MESSAGE, {:authorized_amount => money.to_s}, :test => true, :authorization => AUTHORIZATION )
         when '2'
           Response.new(false, FAILURE_MESSAGE, {:authorized_amount => money.to_s, :error => FAILURE_MESSAGE }, :test => true)
+        when '4'
+          Response.new(false, THREE_D_SECURE_MESSAGE, {:authorized_amount => money.to_s}, :three_d_secure => true, :pa_req => THREE_D_PA_REQ, :md => THREE_D_MD, :acs_url => THREE_D_ACS_URL, :test => true)
         else
           raise Error, ERROR_MESSAGE
         end      
@@ -34,11 +43,21 @@ module ActiveMerchant #:nodoc:
           Response.new(true, SUCCESS_MESSAGE, {:paid_amount => money.to_s}, :test => true)
         when '2'
           Response.new(false, FAILURE_MESSAGE, {:paid_amount => money.to_s, :error => FAILURE_MESSAGE },:test => true)
+        when '4'
+          Response.new(false, THREE_D_SECURE_MESSAGE, {:paid_amount => money.to_s}, :three_d_secure => true, :pa_req => THREE_D_PA_REQ, :md => THREE_D_MD, :acs_url => THREE_D_ACS_URL, :test => true)
         else
           raise Error, ERROR_MESSAGE
         end
       end
  
+      def three_d_complete(pa_res, md)
+        if pa_res == THREE_D_PA_RES && md == THREE_D_MD
+          Response.new(true, SUCCESS_MESSAGE, {}, :test => true, :authorization => AUTHORIZATION)
+        else
+          Response.new(false, FAILURE_MESSAGE, {},:test => true)
+        end
+      end
+
       def credit(money, ident, options = {})
         case ident
         when '1'

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

@@ -155,7 +155,11 @@ module ActiveMerchant #:nodoc:
     
         commit(money, post)
       end
-    
+      
+      def test?
+        @options[:test] || super
+      end
+      
       private                       
       def add_creditcard(post, creditcard)
         post[:CardNumber]  = creditcard.number
@@ -267,6 +271,7 @@ module ActiveMerchant #:nodoc:
           test ? TEST_URL : LIVE_URL
         end
       end
+      
     end
   end
 end

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

@@ -0,0 +1,172 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:    
+    class FirstPayGateway < Gateway
+      class FirstPayPostData < PostData
+        # Fields that will be sent even if they are blank
+        self.required_fields = [ :action, :amount, :trackid ]   
+      end
+
+      # both URLs are IP restricted
+      TEST_URL = 'https://apgcert.first-pay.com/AcqENGIN/SecureCapture'
+      LIVE_URL = 'https://acqengin.first-pay.com/AcqENGIN/SecureCapture'
+      
+      # The countries the gateway supports merchants from as 2 digit ISO country codes
+      self.supported_countries = ['US']
+      
+      # The card types supported by the payment gateway
+      self.supported_cardtypes = [:visa, :master]
+      
+      # The homepage URL of the gateway
+      self.homepage_url = 'http://www.first-pay.com'
+      
+      # The name of the gateway
+      self.display_name = 'First Pay'
+      
+      # all transactions are in cents
+      self.money_format = :cents
+      
+      ACTIONS = {
+        'sale' => 1,
+        'credit' => 2,
+        'void' => 3
+      }
+      
+      def initialize(options = {})
+        requires!(options, :login, :password)
+        @options = options
+        super
+      end  
+      
+      def purchase(money, creditcard, options = {})
+        post = FirstPayPostData.new
+        add_invoice(post, options)
+        add_creditcard(post, creditcard)
+        add_address(post, options)
+        add_customer_data(post, options)
+        
+        commit('sale', money, post)
+      end                       
+      
+      def credit(money, reference, options = {})
+        raise ArgumentError, "Both TransactionID and CreditCard are required" unless reference.is_a?(String) && options[:credit_card]
+
+        post = FirstPayPostData.new
+        add_invoice(post, options)
+        add_creditcard(post, options[:credit_card])
+        add_address(post, options)
+        add_customer_data(post, options)
+        add_credit_data(post, reference)
+      
+        commit('credit', money, post)
+      end
+      
+      def void(money, creditcard, options = {})
+        post = FirstPayPostData.new
+        add_creditcard(post, creditcard)
+        add_void_data(post, options)
+        add_invoice(post, options)
+        add_customer_data(post, options)
+        
+        commit('void', money, post)
+      end
+      
+      
+      private
+      
+      def add_customer_data(post, options)
+        post[:cardip] = options[:ip]
+        post[:email] = options[:email]
+      end
+      
+      def add_address(post, options)
+        if billing_address = options[:billing_address] || options[:address]
+          post[:addr]     = billing_address[:address1].to_s + ' ' + billing_address[:address2].to_s
+          post[:city]     = billing_address[:city]
+          post[:state]    = billing_address[:state]
+          post[:zip]      = billing_address[:zip]                             
+          post[:country]  = billing_address[:country]
+        end
+      end
+      
+      def add_invoice(post, options)
+        post[:trackid] = rand(Time.now)
+      end
+      
+      def add_creditcard(post, creditcard)
+        post[:member] = creditcard.first_name.to_s + " " + creditcard.last_name.to_s
+        post[:card] = creditcard.number
+        post[:exp] = expdate(creditcard)
+      end
+      
+      def expdate(credit_card)
+        year  = sprintf("%.4i", credit_card.year)
+        month = sprintf("%.2i", credit_card.month)
+
+        "#{month}#{year[-2..-1]}"
+      end
+      
+      def add_credit_data(post, transaction_id)
+        post[:transid] = transaction_id
+      end
+      
+      def add_void_data(post, options)
+        post[:transid] = options[:transactionid]
+      end
+      
+      def commit(action, money, post)
+        response = parse( ssl_post(test? ? TEST_URL : LIVE_URL, post_data(action, post, money)) )
+                
+        Response.new(response[:response] == 'CAPTURED', response[:message], response,
+          :test => test?,
+          :authorization => response[:authorization],
+          :avs_result => { :code => response[:avsresponse] },
+          :cvv_result => response[:cvvresponse])
+      end
+      
+      def parse(body)
+        response = {}
+        
+        # check for an error first
+        if body.include?('!ERROR!')
+          response[:response] = 'ERROR'
+          response[:message] = error_message_from(body)
+        else
+          # a capture / not captured response will be : delimited
+          split = body.split(':')
+          response[:response] = split[0]
+          
+          # FirstPay docs are worthless. turns out the transactionid is required for credits
+          # so we need to store that in authorization, not the actual auth.
+          if response[:response] == 'CAPTURED'
+            response[:message] = 'CAPTURED'
+            response[:authorization] = split[9] # actually the transactionid
+            response[:auth] = split[1]
+            response[:avsresponse] = split[3]
+            response[:cvvresponse] = split[17]
+          else
+            # NOT CAPTURED response
+            response[:message] = split[1]
+            response[:transactionid] = split[9]
+          end
+        end
+        
+        return response
+      end
+      
+      def error_message_from(response)
+        # error messages use this format - '!ERROR! 704-MISSING BASIC DATA TYPE:card, exp, zip, addr, member, amount\n'
+        response.split("! ")[1].chomp
+      end
+      
+      def post_data(action, post, money)
+        post[:vid]        = @options[:login]  
+        post[:password]   = @options[:password]
+        post[:action]     = ACTIONS[action]
+        post[:amount]     = amount(money)
+        
+        return post.to_post_data
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,283 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class MerchantWareGateway < Gateway
+      URL = 'https://ps1.merchantware.net/MerchantWARE/ws/RetailTransaction/TXRetail.asmx'
+      
+      self.supported_countries = ['US']
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.homepage_url = 'http://merchantwarehouse.com/merchantware'
+      self.display_name = 'MerchantWARE'
+      
+      ENV_NAMESPACES = { "xmlns:xsi"  => "http://www.w3.org/2001/XMLSchema-instance",
+                         "xmlns:xsd"  => "http://www.w3.org/2001/XMLSchema",
+                         "xmlns:env" => "http://schemas.xmlsoap.org/soap/envelope/"
+                       }
+      TX_NAMESPACE = "http://merchantwarehouse.com/MerchantWARE/Client/TransactionRetail"
+      
+      ACTIONS = {
+        :purchase  => "IssueKeyedSale",
+        :authorize => "IssueKeyedPreAuth",
+        :capture   => "IssuePostAuth",
+        :void      => "IssueVoid",
+        :credit    => "IssueKeyedRefund",
+        :reference_credit => "IssueRefundByReference"
+      }
+      
+      # Creates a new MerchantWareGateway
+      # 
+      # The gateway requires that a valid login, password, and name be passed
+      # in the +options+ hash.
+      # 
+      # ==== Options
+      #
+      # * <tt>:login</tt> - The MerchantWARE SiteID.
+      # * <tt>:password</tt> - The MerchantWARE Key.
+      # * <tt>:name</tt> - The MerchantWARE Name.
+      def initialize(options = {})
+        requires!(options, :login, :password, :name)
+        @options = options
+        super
+      end
+
+      # Authorize a credit card for a given amount.
+      # 
+      # ==== Parameters
+      # * <tt>money</tt> - The amount to be authorized.  Either an Integer value in cents or a Money object.
+      # * <tt>credit_card</tt> - The CreditCard details for the transaction.
+      # * <tt>options</tt>
+      #   * <tt>:order_id</tt> - A unique reference for this order (required).
+      #   * <tt>:billing_address</tt> - The billing address for the cardholder.      
+      def authorize(money, credit_card, options = {})
+        request = build_purchase_request(:authorize, money, credit_card, options)
+        commit(:authorize, request)
+      end
+      
+      # Authorize and immediately capture funds from a credit card.
+      # 
+      # ==== Parameters
+      # * <tt>money</tt> - The amount to be authorized.  Either an Integer value in cents or a Money object.
+      # * <tt>credit_card</tt> - The CreditCard details for the transaction.
+      # * <tt>options</tt>
+      #   * <tt>:order_id</tt> - A unique reference for this order (required).
+      #   * <tt>:billing_address</tt> - The billing address for the cardholder.
+      def purchase(money, credit_card, options = {})
+        request = build_purchase_request(:purchase, money, credit_card, options)
+        commit(:purchase, request)
+      end                       
+
+      # Capture authorized funds from a credit card.
+      # 
+      # ==== Parameters
+      # * <tt>money</tt> - The amount to be captured.  Either an Integer value in cents or a Money object.
+      # * <tt>authorization</tt> - The authorization string returned from the initial authorization.
+      def capture(money, authorization, options = {})
+        request = build_capture_request(:capture, money, authorization, options)
+        commit(:capture, request)
+      end
+
+      # Void a transaction.
+      # 
+      # ==== Parameters
+      # * <tt>authorization</tt> - The authorization string returned from the initial authorization or purchase.
+      def void(authorization, options = {})
+        reference, options[:order_id] = split_reference(authorization)
+        
+        request = soap_request(:void) do |xml|
+          add_reference(xml, reference)
+        end
+        commit(:void, request)
+      end
+      
+      # Refund an amount back a cardholder
+      # 
+      # ==== Parameters
+      #
+      # * <tt>money</tt> - The amount to be refunded. Either an Integer value in cents or a Money object.
+      # * <tt>identification</tt> - The credit card you want to refund or the authorization for the existing transaction you are refunding.
+      # * <tt>options</tt>
+      #   * <tt>:order_id</tt> - A unique reference for this order (required when performing a non-referenced credit)
+      def credit(money, identification, options = {})
+        if identification.is_a?(String)          
+          perform_reference_credit(money, identification, options)
+        else
+          perform_credit(money, identification, options)
+        end
+      end
+    
+      private
+      
+      def soap_request(action)
+        xml = Builder::XmlMarkup.new :indent => 2
+        xml.instruct!
+        xml.tag! "env:Envelope", ENV_NAMESPACES do
+          xml.tag! "env:Body" do
+            xml.tag! ACTIONS[action], "xmlns" => TX_NAMESPACE do
+              add_credentials(xml)
+              yield xml
+            end
+          end
+        end
+        xml.target!
+      end
+      
+      def build_purchase_request(action, money, credit_card, options)
+        requires!(options, :order_id)
+        
+        request = soap_request(action) do |xml|
+          add_invoice(xml, options)
+          add_amount(xml, money)
+          add_credit_card(xml, credit_card)
+          add_address(xml, options)
+        end
+      end
+      
+      def build_capture_request(action, money, identification, options)
+        reference, options[:order_id] = split_reference(identification)
+        
+        request = soap_request(action) do |xml|
+          add_reference(xml, reference)
+          add_invoice(xml, options)
+          add_amount(xml, money)
+        end
+      end
+      
+      def perform_reference_credit(money, identification, options)
+        reference, options[:order_id] = split_reference(identification)
+
+        request = soap_request(:reference_credit) do |xml|
+          add_reference(xml, reference)
+          add_invoice(xml, options)
+          add_amount(xml, money, "strOverrideAmount")
+        end
+        
+        commit(:reference_credit, request)
+      end
+      
+      def perform_credit(money, credit_card, options)
+        requires!(options, :order_id)
+        
+        request = soap_request(:credit) do |xml|
+          add_invoice(xml, options)
+          add_amount(xml, money)
+          add_credit_card(xml, credit_card)
+        end
+        
+        commit(:credit, request)
+      end
+
+      def add_credentials(xml)
+        xml.tag! "strSiteId", @options[:login]
+        xml.tag! "strKey", @options[:password]
+        xml.tag! "strName", @options[:name]
+      end
+      
+      def expdate(credit_card)
+        year  = sprintf("%.4i", credit_card.year)
+        month = sprintf("%.2i", credit_card.month)
+
+        "#{month}#{year[-2..-1]}"
+      end
+      
+      def add_invoice(xml, options)
+        xml.tag! "strOrderNumber", options[:order_id].to_s.slice(0, 25)
+      end
+      
+      def add_amount(xml, money, tag = "strAmount")
+        xml.tag! tag, amount(money)
+      end
+
+      def add_reference(xml, reference)
+        xml.tag! "strReferenceCode", reference
+      end
+      
+      def add_address(xml, options)
+        if address = options[:billing_address] || options[:address]
+          xml.tag! "strAVSStreetAddress", address[:address1]
+          xml.tag! "strAVSZipCode", address[:zip]
+        end
+      end
+      
+      def add_credit_card(xml, credit_card)
+        xml.tag! "strPAN", credit_card.number
+        xml.tag! "strExpDate", expdate(credit_card)
+        xml.tag! "strCardHolder", credit_card.name
+        xml.tag! "strCVCode", credit_card.verification_value if credit_card.verification_value?
+      end
+      
+      def split_reference(reference)
+        reference.to_s.split(";")
+      end
+      
+      def parse(action, data)
+        response = {}
+        xml = REXML::Document.new(data)
+      
+        root = REXML::XPath.first(xml, "//#{ACTIONS[action]}Response/#{ACTIONS[action]}Result")
+
+        root.elements.each do |element|
+          response[element.name] = element.text
+        end
+        
+        status, code, message = response["ApprovalStatus"].split(";")
+        response[:status] = status
+        
+        if response[:success] = status == "APPROVED"          
+          response[:message] = status
+        else
+          response[:message] = message
+          response[:failure_code] = code
+        end
+
+        response        
+      end
+      
+      def parse_error(http_response)
+        response = {}
+        response[:http_code] = http_response.code
+        response[:http_message] = http_response.message
+        response[:success] = false
+
+        document = REXML::Document.new(http_response.body)
+
+        node     = REXML::XPath.first(document, "//soap:Fault")
+        
+        node.elements.each do |element|
+          response[element.name] = element.text
+        end
+        
+        response[:message] = response["faultstring"].to_s.gsub("\n", " ")
+        response
+      rescue REXML::ParseException => e
+        response[:http_body]        = http_response.body
+        response[:message]          = "Failed to parse the failed response"
+        response
+      end
+            
+      def commit(action, request)
+        begin
+          data = ssl_post(URL, request, 
+                   "Content-Type" => 'text/xml; charset=utf-8',
+                   "SOAPAction"   => "http://merchantwarehouse.com/MerchantWARE/Client/TransactionRetail/#{ACTIONS[action]}"
+                 )
+          response = parse(action, data)
+        rescue ActiveMerchant::ResponseError => e
+          response = parse_error(e.response)
+        end
+        
+        Response.new(response[:success], response[:message], response, 
+          :test => test?, 
+          :authorization => authorization_from(response),
+          :avs_result => { :code => response["AVSResponse"] },
+          :cvv_result => response["CVResponse"]
+        )
+      end
+      
+      def authorization_from(response)
+        if response[:success]
+          [ response["ReferenceID"], response["OrderNumber"] ].join(";")
+        end
+      end
+    end
+  end
+end
+