Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Shopify/active_merchant
...
head fork: betterplace/active_merchant
Checking mergeability… Don't worry, you can still create the pull request.
  • 7 commits
  • 6 files changed
  • 0 commit comments
  • 3 contributors
View
5 CHANGELOG
@@ -1,5 +1,10 @@
= ActiveMerchant CHANGELOG
+== Version 1.9.0 (October 14, 2010)
+
+* Add support for DirecPay gateway [Soleone]
+* Add SagePay Form integration gateway [Adrian Irving-Beer]
+* Allow Return class to include a Notification for gateways that treat the direct response as a notification [Adrian Irving-Beer]
* Add support for PayboxDirect gateway [Donald Piret]
* Add support for SecureNet gateway [Kal]
* Add support for the Inspire gateway [ryan r. smith]
View
8 CONTRIBUTORS
@@ -160,3 +160,11 @@ SecureNet Gateway (September 27, 2010)
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
View
2  activemerchant.gemspec
@@ -1,7 +1,7 @@
Gem::Specification.new do |s|
s.platform = Gem::Platform::RUBY
s.name = 'activemerchant'
- s.version = '1.8.0'
+ s.version = '1.9.0'
s.summary = 'Framework and tools for dealing with credit card transactions.'
s.description = 'Active Merchant is a simple payment abstraction library used in and sponsored by Shopify. It is written by Tobias Luetke, Cody Fauser, and contributors. The aim of the project is to feel natural to Ruby users and to abstract as many parts as possible away from the user to offer a consistent interface across all supported gateways.'
View
3  lib/active_merchant/common.rb
@@ -11,4 +11,7 @@ module ActiveMerchant
autoload :RequiresParameters, 'active_merchant/common/requires_parameters'
autoload :Utils, 'active_merchant/common/utils'
autoload :Validateable, 'active_merchant/common/validateable'
+
+ # DHA 03/2012: For configuring where the ssl certs are
+ mattr_accessor :ssl_config
end
View
11 lib/active_merchant/common/connection.rb
@@ -3,7 +3,8 @@
require 'net/https'
require 'benchmark'
-module ActiveMerchant
+module ActiveMerchant
+
class ConnectionError < ActiveMerchantError # :nodoc:
end
@@ -114,7 +115,13 @@ def configure_ssl(http)
if verify_peer
http.verify_mode = OpenSSL::SSL::VERIFY_PEER
- http.ca_file = File.dirname(__FILE__) + '/../../certs/cacert.pem'
+ # DHA 12/3/2012:
+ certfile_name = ActiveMerchant.ssl_config[:certfile]
+ http.ca_file = if(File.exists?(certfile_name))
+ certfile_name
+ else
+ File.dirname(__FILE__) + '/../../certs/cacert.pem'
+ end
else
http.verify_mode = OpenSSL::SSL::VERIFY_NONE
end
View
2  lib/active_merchant/version.rb
@@ -1,3 +1,3 @@
module ActiveMerchant
- VERSION = "1.8.0"
+ VERSION = "1.9.0"
end

No commit comments for this range

Something went wrong with that request. Please try again.