Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
ee1a3ff
During the certification process, found out that CurrencyCode and
juicedM3 Oct 2, 2013
32ca908
tests for orbital_mandatory_field_fix ee1a3ff
juicedM3 Oct 2, 2013
3245a50
i missed a syntax error...
juicedM3 Oct 3, 2013
35db85e
Ipay88: Use the amount in dollars instead of cents to generate the si…
Oct 7, 2013
280b136
Add bitpay return, fix return_url mapping
tahnok Oct 11, 2013
13e0ab5
Merge pull request #879 from Shopify/bitpay_add_return
Oct 16, 2013
ba75017
Revert "Paymill: Add support for specifying the :customer"
Oct 18, 2013
05085af
Bump for release v1.40.0
Oct 18, 2013
d92cbf1
Merge pull request #873 from Shopify/ipay88-fix
melari Oct 18, 2013
3ba3d2c
Stripe: Ignore tthe customer option when paying with a creditcard.
Oct 21, 2013
72fe6e1
Merge pull request #886 from Shopify/stripe-fixes
melari Oct 23, 2013
a9d06f7
Add Conekta gateway
leofischer Oct 1, 2013
953bdf3
Wirecard: Add support for void and refund
duff Oct 22, 2013
ded3113
Merge pull request #865 from juicedM3/orbital_mandatory_field_fix
jduff Oct 24, 2013
f72aff4
Bump for release v1.41.0
Oct 24, 2013
7eb5b22
Fix NoMethodError "tr" for params with dash
timothyklim Oct 24, 2013
e081093
Authorize.Net: Add CAVV support
Aug 14, 2013
ead63b9
Stripe: Add a test for passing a token
ntalbott Oct 24, 2013
73fa83b
CardStreamModern: Add input checks
Sep 19, 2013
9c69ba6
changed Balanced response on store to be an ActiveMerchant::Billing::…
cwise Oct 23, 2013
698da06
Stripe: Send `ip` option instead of `browser_ip` option
Oct 7, 2013
4359e77
fix documented parameter name
dsjoerg Oct 31, 2013
c9d48ec
Wirecard Checkout Page Integration
Sep 20, 2013
1a7054e
Remove the requirement for rails in the wirecard checkout page integr…
Nov 5, 2013
4771325
Missed one of the rails requires.
Nov 5, 2013
a77ef9b
Merge pull request #889 from HealthWave/balanced-return-cc
jduff Nov 6, 2013
3fe13c3
Allow money gem v6.
Nov 7, 2013
ba1890b
Ignore money_format when using a non-decimal currency.
Nov 6, 2013
42337d5
Orbital: Add support for currency with 0 CurrencyExponent (JPY)
Nov 6, 2013
463e4fb
Merge pull request #896 from dsjoerg/master
ntalbott Nov 10, 2013
6768d3c
Mercury: Add support for requesting a token
kcdragon Nov 3, 2013
3fe5817
Add App55 gateway
ianbutler55 Jul 4, 2013
8911400
UsaEpayTransaction: Support for split payments
GBH Aug 22, 2013
8faf689
Add Swipe Checkout gateway
matt-optimizerhq Jul 3, 2013
0a02ed3
Spreedly Core: Allow overriding the gateway token
hoenth Aug 13, 2013
24f2da1
Spreedly Core: Add order_id
hoenth Sep 18, 2013
94ecd24
Spreedly Core: Allow store without retain
hoenth Sep 27, 2013
ad71498
Stripe: Support multiple cards on account
pierre Oct 31, 2013
17e5e81
Stripe: Add card_id parameter to unstore call
pierre Oct 31, 2013
3dcf75a
Fix BitPay Helper to use form_fields for generating invoice id
Nov 11, 2013
9b2fdd1
Fix BitPay Notification status
Nov 11, 2013
c42151e
Implement BitPayNotification#acknowledge to request invoice
Nov 11, 2013
4fc4687
BitPay Notification#gross should return price, not btcPrice
Nov 11, 2013
10b7918
Remove usage of `uname -a`
ntalbott Oct 25, 2013
b1230af
Litle: Allow easier access to the response code
duff Nov 7, 2013
275cb28
Stripe: Add the option to pass a version header
Nov 7, 2013
a21d8bb
Elavon: Update supported countries
duff Nov 11, 2013
cc6cefe
Add Raven PacNet gateway
llopez Aug 16, 2013
e5b194b
parse posData as JSON string, and handle JSON ParseErrors
Nov 12, 2013
1a43b84
Fix incorrect notification definition which should allow for options …
Nov 12, 2013
788e404
Fix status mapping
Nov 12, 2013
0198064
Refactor Paymill gateway
zamith Nov 12, 2013
b7d557f
Merge pull request #908 from Shopify/fix_bitpay
odorcicd Nov 12, 2013
d46485d
Update changelog to include BitPay fixes
Nov 12, 2013
550d64d
Bump version to 1.42.0
arthurnn Nov 13, 2013
b053773
Better rake task for gem release
arthurnn Nov 13, 2013
bb7b5b3
Merge pull request #914 from Shopify/gem_release
arthurnn Nov 13, 2013
8cd8c59
Merge pull request #913 from Shopify/bump_v
arthurnn Nov 13, 2013
42d9d18
Update date on 1.42.0 release
arthurnn Nov 13, 2013
5c8d8f9
Bump for version 1.42.1
Nov 13, 2013
ce7bff5
New updated public_cert
arthurnn Nov 13, 2013
0229a59
Version bump
arthurnn Nov 13, 2013
fb5ccf1
Require private key to build gem
arthurnn Nov 13, 2013
3c4566f
Update RELEASING file
arthurnn Nov 13, 2013
2d6e460
Update Changelog
arthurnn Nov 13, 2013
a6ba2e9
Balanced: Pass on appears_on_statement_as
duff Nov 14, 2013
8094c68
Authorize.Net: Make actioned responses failures
Nov 14, 2013
f123313
Add Payex gateway
atomgiant Nov 1, 2013
d614d19
Ipay88: Yet another signature formatting fix.
Nov 7, 2013
50befde
Product info shouldnt be credential2
Nov 15, 2013
b04343e
Refactor checkum, PayuPaisa was reversing udf fields
Nov 15, 2013
43cd790
Slip down user_defined method
Nov 15, 2013
22b2615
PayU status should be based off status from param, checksum should be…
Nov 15, 2013
956174e
to_s discount as it can be nil on returns
Nov 15, 2013
706feb1
Fix PayuInPaisa module tests
Nov 16, 2013
281848e
Remove super arguments
Nov 16, 2013
2fa1899
Sanitize field values before generating the form fields
Nov 18, 2013
99a074a
Move payu in test credentials to fixtures
Nov 18, 2013
25d5820
Allow Valitor gateway to accept other currencies
Nov 19, 2013
21c370e
Merge pull request #922 from Shopify/decimal-currencies-for-valitor
Nov 21, 2013
4a525e7
Adds stripe key to allowed options in generate_options
jnormore Nov 22, 2013
4296b5e
Fix JSON ParserError typo in Bitpay
Nov 26, 2013
0829dba
Merge pull request #928 from jnormore/master
jnormore Nov 26, 2013
3e173e8
Paymill: Fix authorizations
duff Nov 21, 2013
125e86b
Braintree Blue: Allow specifying credit card token
ntalbott Nov 29, 2013
d4a3b9e
Braintree Blue: Allow specifying the customer id
ntalbott Nov 29, 2013
fc6d0ac
Braintree Blue: Scrub invalid emails and zips
ntalbott Nov 29, 2013
7dc4aac
Fix Ipay88 requery
Nov 29, 2013
ae0002f
Braintree Blue: Return :credit_card_token
ntalbott Nov 29, 2013
a781f34
Braintree Blue: Allow unstoring just a credit card
ntalbott Nov 29, 2013
52801ba
Braintree Blue: Add cards to existing customers
ntalbott Nov 29, 2013
2fba18c
Fix spelling mistakes.
tcort Dec 2, 2013
6a0df1a
Merge pull request #929 from Shopify/ipay88_requery
odorcicd Dec 3, 2013
6f54aec
Move ordered checksum fields into a constant in the PayU helper
Dec 3, 2013
86cb6cf
Merge pull request #920 from Shopify/payu_checksum
odorcicd Dec 4, 2013
bbbc1fe
Add message and cancelled to ipay88 return
Dec 5, 2013
1893f38
[pin] Use CreditCard#name instead of manually concatenating first_nam…
radar Dec 6, 2013
dd80d0b
Merge pull request #940 from radar/pin-gateway-name
odorcicd Dec 6, 2013
cb72e0f
Merge pull request #931 from tcort/spelling
sirupsen Dec 6, 2013
99d7fbe
Refactor IPay88 to follow correct integration using Notification
Dec 6, 2013
cfc15a6
Fixing typos in AuthorizeNetCimGateway
npverni Dec 6, 2013
0a040d6
Merge pull request #938 from npverni/typo_fixes
sirupsen Dec 6, 2013
48fb080
Refactor gateway selector error handling
tjoyal Dec 10, 2013
a211654
Merge pull request #947 from Shopify/refactor-gateway-selector-error-…
tjoyal Dec 10, 2013
4abb70c
Merge pull request #941 from Shopify/ipay88_notification
odorcicd Dec 11, 2013
90488d5
USA ePay Advanced: Fix check handling
nearapogee Feb 23, 2012
0b40fba
USA ePay Advanced: Fix card expiration handling
nearapogee Mar 9, 2012
d2191f7
USA ePay Advanced: Fix custom trans responses
nearapogee Mar 9, 2012
dc6d4a4
USA ePay Advanced: Fix capture amount
nearapogee May 15, 2012
953a54c
Handle comma-delimited amounts with Valitor
jstorimer Dec 11, 2013
33ce76b
NAB Transact: Fix capture/refund descriptor
justinjones Dec 4, 2013
8dba9d3
Braintree Blue: Add custom_fields & device_data
parallel588 Dec 4, 2013
78d93c9
Webpay: Add authorize & capture
keikubo Dec 6, 2013
a014a3c
MerchantWarrior: Pass description
duff Dec 6, 2013
c92b6c0
Stripe: Separate email from description
duff Dec 9, 2013
83e57c6
Add Payscout gateway
llopez Oct 31, 2013
73e86d5
Merchant Warrior: Use billing_address
duff Dec 10, 2013
b7045e3
Add SoEasyPay gateway
ir-soeasycorp Aug 29, 2013
7db748c
Fix accidentally overwritten test methods
ntalbott Dec 11, 2013
219b090
Merge pull request #952 from jstorimer/valitor-comma
jstorimer Dec 11, 2013
08a19e7
Bogus: Add Check support
npverni Dec 6, 2013
e38d083
Payflow: Add Check support
Dec 3, 2013
e5e3fe0
eWay Rapid: Upgrade to 3.1
atomgiant Nov 1, 2013
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ pkg
Gemfile.lock
Gemfile*.lock
.rbx/
*.gem
71 changes: 70 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,75 @@
= ActiveMerchant CHANGELOG

* Balanced: Add support for appears_on_statement_as [duff]
* Authorize.Net: Make already actioned responses failures [odorcicd]
* Add Payex gateway [atomgiant]
* Paymill: Fix authorizations [duff]
* Braintree Blue: Allow specifying the credit card token [ntalbott]
* Braintree Blue: Allow specifying the customer id [ntalbott]
* Braintree Blue: Scrub invalid emails and zips [ntalbott]
* Braintree Blue: Return :credit_card_token as a top level param [ntalbott]
* Braintree Blue: Allow unstoring just a credit card [ntalbott]
* Braintree Blue: #store adds cards to existing customers [ntalbott]
* USA ePay Advanced: Fix check handling [nearapogee]
* USA ePay Advanced: Fix credit card expiration handling [nearapogee]
* USA ePay Advanced: Fix handling of custom transaction responses for single items [nearapogee]
* USA ePay Advanced: Fix capture amount [nearapogee]
* NAB Transact: Fix merchant descriptor with capture/refund requests [nagash]
* Braintree Blue: Add custom_fields & device_data parameters [parallel588]
* Webpay: Add authorize & capture [keikubo]
* MerchantWarrior: Pass description [duff]
* Stripe: Separate email from description [duff]
* Add Payscout gateway [llopez]
* Merchant Warrior: Use billing_address [duff]
* Add SoEasyPay gateway [ir-soeasycorp]
* Bogus: Add check support [npverni]
* Payflow: Add Check support [crazyivan]
* eWay Rapid: Upgrade to 3.1 [atomgiant]

== Version 1.42.2 (November 13th, 2013)

* Renew public certificate

== Version 1.42.1 (November 13th, 2013)

* Signed version of 1.42.0

== Version 1.42.0 (November 13th, 2013)

* Fix NoMethodError "tr" for params with dash [TimothyKlim]
* Authorize.Net: Add cardholder authentication options (CAVV) support [structure]
* CardStreamModern: Added better checks on inputs from the gateway [ExxKA]
* Stripe: Send :ip to the gateway instead of :browser_ip [f3ndot]
* Wirecard Page: new offsite gateway [mbretter]
* Mercury: Add support for requesting a token [kcdragon]
* Add App55 gateway [ianbutler55]
* UsaEpayTransaction: Support for split payments [GBH]
* Add Swipe Checkout gateway [matt-optimizerhq]
* Spreedly Core: Allow overriding the gateway token when running a transaction [hoenth]
* Spreedly Core: Add order_id [hoenth]
* Spreedly Core: Allow store without retain [hoenth]
* Stripe: Support multiple cards on account [pierre]
* Stripe: Add card_id parameter to unstore call [pierre]
* Remove usage of `uname -a` [ntalbott]
* Litle: Allow easier access to the response code [duff]
* Stripe: Add the option to pass a version header [odorcicd]
* Elavon: Update supported countries [duff]
* Add Raven PacNet gateway [llopez]
* BitPay: Fix BitPay issues and implement Notification#acknowledge [odorcicd]

== Version 1.41.0 (October 24th, 2013)

* Stripe: Payments won't fail when specifying a customer with a creditcard number [melari]
* Add Conekta gateway [leofischer]
* Wirecard: Add support for void and refund [duff]
* Orbital: Mandatory field fix [juicedM3, jduff]

== Version 1.40.0 (October 18th, 2013)

* Paymill: Revert Add support for specifying the :customer [melari]
* Quickpay: Make v7 of the API default [kvs]
* Bitpay: Add return [tahnok]

== Version 1.39.2 (October 10th, 2013)

* Eway Rapid: Fix a bug with access codes that have equal signs in them [odorcic]
Expand Down Expand Up @@ -1249,4 +1319,3 @@ value [jduff]
* Credit card validation methods as static methods of the credit card object

== PlanetArgon fork for integrating Merchant eSolutions gateway

28 changes: 28 additions & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -420,3 +420,31 @@ MoneyMovers (September 2013)
Be2Bill (September 2013)

* Michaël Hoste (MichaelHoste)

Conekta (October 2013)

* Leo Fischer (leofischer)

App55 (November 2013)

* (ianbutler55)

Swipe Checkout (November 2013)

* (matt-optimizerhq)

Raven PacNet (November 2013)

* Luis Lopez (llopez)

Payex (November 2013)

* Tom Davies (atomgiant)

Payscout (December 2013)

* Luis Lopez (llopez)

SoEasyPay (December 2013)

* Ivan Radovanovic (ir-soeasycorp)
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ For more in-depth documentation and tutorials, see [GettingStarted.md](GettingSt

The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) contains a [table of features supported by each gateway](http://github.com/Shopify/active_merchant/wikis/gatewayfeaturematrix).

* [App55](https://www.app55.com/) - AU, BR, CA, CH, CL, CN, CO, CZ, DK, EU, GB, HK, HU, ID, IS, JP, KE, KR, MX, MY, NO, NZ, PH, PL, TH, TW, US, VN, ZA
* [Authorize.Net CIM](http://www.authorize.net/) - US
* [Authorize.Net](http://www.authorize.net/) - US, CA, GB
* [Balanced](https://www.balancedpayments.com/) - US
Expand All @@ -94,14 +95,15 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
* [CardSave](http://www.cardsave.net/) - GB
* [CardStream](http://www.cardstream.com/) - GB
* [CertoDirect](http://www.certodirect.com/) - BE, BG, CZ, DK, DE, EE, IE, EL, ES, FR, IT, CY, LV, LT, LU, HU, MT, NL, AT, PL, PT, RO, SI, SK, FI, SE, GB
* [Conekta](https://conekta.io) - MX
* [CyberSource](http://www.cybersource.com) - US, BR, CA, CN, DK, FI, FR, DE, JP, MX, NO, SE, GB, SG
* [DataCash](http://www.datacash.com/) - GB
* [Efsnet](http://www.concordefsnet.com/) - US
* [Elavon MyVirtualMerchant](http://www.elavon.com/) - US, CA
* [ePay](http://epay.dk/) - DK, SE, NO
* [EVO Canada](http://www.evocanada.com/) - CA
* [eWAY](http://www.eway.com.au/) - AU, NZ, GB
* [eWAY Rapid 3.0](http://www.eway.com.au/) - AU
* [eWAY Rapid 3.1](http://www.eway.com.au/) - AU
* [E-xact](http://www.e-xact.com) - CA, US
* [Fat Zebra](https://www.fatzebra.com.au/) - AU
* [Federated Canada](http://www.federatedcanada.com/) - CA
Expand Down Expand Up @@ -142,6 +144,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
* [PayJunction](http://www.payjunction.com/) - US
* [PaySecure](http://www.commsecure.com.au/paysecure.shtml) - AU
* [Paybox Direct](http://www.paybox.com/) - FR
* [Payex](http://payex.com/) - DK, NO, SE
* [PaymentExpress](http://www.paymentexpress.com/) - AU, CA, DE, ES, FR, GB, HK, IE, MY, NL, NZ, SG, US, ZA
* [PAYMILL](https://paymill.com) - AD, AT, BE, BG, CH, CY, CZ, DE, DK, EE, ES, FI, FO, FR, GB, GI, GR, HU, IE, IL, IS, IT, LI, LT, LU, LV, MT, NL, NO, PL, PT, RO, SE, SI, SK, TR, VA
* [PayPal Express Checkout](https://www.paypal.com/webapps/mpp/express-checkout) - US, CA, SG, AU
Expand All @@ -151,6 +154,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
* [PayPal Payments Pro (UK)](https://www.paypal.com/uk/webapps/mpp/pro) - GB
* [PayPal Website Payments Pro (CA)](https://www.paypal.com/cgi-bin/webscr?cmd=_wp-pro-overview-outside) - CA
* [PayPal Express Checkout for Digital Goods](https://www.x.com/community/ppx/xspaces/digital_goods) - AU, CA, CN, FI, GB, ID, IN, IT, MY, NO, NZ, PH, PL, SE, SG, TH, VN
* [Payscout](http://www.payscout.com/) - US
* [Paystation](http://paystation.co.nz) - NZ
* [Pay Way](http://www.payway.com.au) - AU
* [Pin](http://www.pin.net.au/) - AU
Expand All @@ -160,6 +164,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
* [QuickBooks Merchant Services](http://payments.intuit.com/) - US
* [Quantum Gateway](http://www.quantumgateway.com) - US
* [Quickpay](http://quickpay.dk/) - DK, SE
* [Raven PacNet](http://www.pacnetservices.com/) - US
* [Realex](http://www.realexpayments.com/) - IE, GB, FR, BE, NL, LU, IT
* [Redsys](http://www.redsys.es/) - ES
* [SagePay](http://www.sagepay.com) - GB, IE
Expand All @@ -170,8 +175,10 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
* [SecurePay](http://www.securepay.com/) - US, CA, GB, AU
* [SecurePayTech](http://www.securepaytech.com/) - NZ
* [SkipJack](http://www.skipjack.com/) - US, CA
* [SoEasyPay](http://www.soeasypay.com/) - US, CA, AT, BE, BG, HR, CY, CZ, DK, EE, FI, FR, DE, GR, HU, IE, IT, LV, LT, LU, MT, NL, PL, PT, RO, SK, SI, ES, SE, GB, IS, NO, CH
* [Spreedly](https://spreedly.com) - AD, AE, AT, AU, BD, BE, BG, BN, CA, CH, CY, CZ, DE, DK, EE, EG, ES, FI, FR, GB, GI, GR, HK, HU, ID, IE, IL, IM, IN, IS, IT, JO, KW, LB, LI, LK, LT, LU, LV, MC, MT, MU, MV, MX, MY, NL, NO, NZ, OM, PH, PL, PT, QA, RO, SA, SE, SG, SI, SK, SM, TR, TT, UM, US, VA, VN, ZA
* [Stripe](https://stripe.com/) - US, CA, GB, AU, IE, FR, NL, BE, DE, ES
* [Swipe](https://www.swipehq.com/checkout) - CA, NZ
* [TransFirst](http://www.transfirst.com/) - US
* [NELiX TransaX](https://www.nelixtransax.com/) - US
* [Transnational](http://www.tnbci.com/) - US
Expand Down
11 changes: 2 additions & 9 deletions RELEASING
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,5 @@ releasing Active Merchant
2. Check the Semantic Versioning page for info on how to version the new release: http://semver.org
3. Update the version of Active Merchant in lib/active_merchant/version.rb and in activemerchant.gemspec
4. Add a CHANGELOG entry for the new release with the date
5. Commit the changes with a commit message like "Packaging for release X.Y.Z"
6. Tag the release with the version (Leave REV blank for HEAD or provide a SHA)
$ git tag vX.Y.Z REV
7. Push out the changes
$ git push
8. Push out the tags
$ git push --tags
9. Publish the Gem to gemcutter
$ rake release GEM_PRIVATE_KEY=/path/to/private/key
5. Release the gem to rubygems
$ GEM_PRIVATE_KEY=/path/to/private/key bundle exec rake release
42 changes: 18 additions & 24 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
$:.unshift File.expand_path('../lib', __FILE__)
require 'active_merchant/version'

begin
require 'bundler'
Expand All @@ -10,14 +11,29 @@ end

require 'rake'
require 'rake/testtask'
require 'rubygems/package_task'
require 'support/gateway_support'
require 'support/ssl_verify'
require 'support/outbound_hosts'

task :gem => :build
task :build do
raise "Please set a private key to sign the gem" unless ENV['GEM_PRIVATE_KEY']
system "gem build activemerchant.gemspec"
end

task :install => :build do
system "gem install activemerchant-#{ActiveMerchant::VERSION}.gem"
end

task :release => :build do
system "git tag -a v#{ActiveMerchant::VERSION} -m 'Tagging #{ActiveMerchant::VERSION}'"
system "git push --tags"
system "gem push activemerchant-#{ActiveMerchant::VERSION}.gem"
system "rm activemerchant-#{ActiveMerchant::VERSION}.gem"
end

desc "Run the unit test suite"
task :default => 'test:units'

task :test => 'test:units'

namespace :test do
Expand All @@ -35,28 +51,6 @@ namespace :test do
t.libs << 'test'
t.verbose = true
end

end

desc "Delete tar.gz / zip"
task :cleanup => [ :clobber_package ]

spec = eval(File.read('activemerchant.gemspec'))

Gem::PackageTask.new(spec) do |p|
p.gem_spec = spec
p.need_tar = true
p.need_zip = true
end

desc "Release the gems and docs to RubyForge"
task :release => [ 'gemcutter:publish' ]

namespace :gemcutter do
desc "Publish to gemcutter"
task :publish => :package do
sh "gem push pkg/activemerchant-#{ActiveMerchant::VERSION}.gem"
end
end

namespace :gateways do
Expand Down
2 changes: 1 addition & 1 deletion activemerchant.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Gem::Specification.new do |s|

s.add_dependency('activesupport', '>= 2.3.14', '< 5.0.0')
s.add_dependency('i18n', '~> 0.5')
s.add_dependency('money', '< 6.0.0')
s.add_dependency('money', '< 7.0.0')
s.add_dependency('builder', '>= 2.1.2', '< 4.0.0')
s.add_dependency('json', '~> 1.7')
s.add_dependency('active_utils', '~> 2.0', '>= 2.0.1')
Expand Down
21 changes: 11 additions & 10 deletions gem-public_cert.pem
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
-----BEGIN CERTIFICATE-----
MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRMwEQYDVQQDDApjb2R5
MIIDeDCCAmCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBBMRMwEQYDVQQDDApjb2R5
ZmF1c2VyMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNj
b20wHhcNMDcwMjIyMTcyMTI3WhcNMDgwMjIyMTcyMTI3WjBBMRMwEQYDVQQDDApj
b20wHhcNMTMxMTEzMTk1NjE2WhcNMTQxMTEzMTk1NjE2WjBBMRMwEQYDVQQDDApj
b2R5ZmF1c2VyMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZ
FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6T4Iqt5iWvAlU
iXI6L8UO0URQhIC65X/gJ9hL/x4lwSl/ckVm/R/bPrJGmifT+YooFv824N3y/TIX
25o/lZtRj1TUZJK4OCb0aVzosQVxBHSe6rLmxO8cItNTMOM9wn3thaITFrTa1DOQ
O3wqEjvW2L6VMozVfK1MfjL9IGgy0rCnl+2g4Gh4jDDpkLfnMG5CWI6cTCf3C1ye
ytOpWgi0XpOEy8nQWcFmt/KCQ/kFfzBo4QxqJi54b80842EyvzWT9OB7Oew/CXZG
F2yIHtiYxonz6N09vvSzq4CvEuisoUFLKZnktndxMEBKwJU3XeSHAbuS7ix40OKO
WKuI54fHAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
BBR9QQpefI3oDCAxiqJW/3Gg6jI6qjANBgkqhkiG9w0BAQUFAAOCAQEAs0lX26O+
HpyMp7WL+SgZuM8k76AjfOHuKajl2GEn3S8pWYGpsa0xu07HtehJhKLiavrfUYeE
qlFtyYMUyOh6/1S2vfkH6VqjX7mWjoi7XKHW/99fkMS40B5SbN+ypAUst+6c5R84
w390mjtLHpdDE6WQYhS6bFvBN53vK6jG3DLyCJc0K9uMQ7gdHWoxq7RnG92ncQpT
ThpRA+fky5Xt2Q63YJDnJpkYAz79QIama1enSnd4jslKzSl89JS2luq/zioPe/Us
hbyalWR1+HrhgPoSPq7nk+s2FQUBJ9UZFK1lgMzho/4fZgzJwbu+cO8SNuaLS/bj
hPaSTyVU0yCSnw==
WKuI54fHAgMBAAGjezB5MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
BBR9QQpefI3oDCAxiqJW/3Gg6jI6qjAfBgNVHREEGDAWgRRjb2R5ZmF1c2VyQGdt
YWlsLmNvbTAfBgNVHRIEGDAWgRRjb2R5ZmF1c2VyQGdtYWlsLmNvbTANBgkqhkiG
9w0BAQUFAAOCAQEAYJgMj+RlvKSOcks29P76WE+Lexvq3eZBDxxgFHatACdq5Fis
MUEGiiHeLkR1KRTkvkXCos6CtZVUBVUsftueHmKA7adO2yhrjv4YhPTb/WZxWmQC
L59lMhnp9UcFJ0H7TkAiU1TvvXewdQPseX8Ayl0zRwD70RfhGh0LfFsKN0JGR4ZS
yZvtu7hS26h9KwIyo5N3nw7cKSLzT7KsV+s1C+rTjVCb3/JJA9yOe/SCj/Xyc+JW
ZJB9YPQZG+vWBdDSca3sUMtvFxpLUFwdKF5APSPOVnhbFJ3vSXY1ulP/R6XW9vnw
6kkQi2fHhU20ugMzp881Eixr+TjC0RvUerLG7g==
-----END CERTIFICATE-----
4 changes: 2 additions & 2 deletions generators/integration/templates/notification.rb
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ def acknowledge(authcode = nil)
def parse(post)
@raw = post.to_s
for line in @raw.split('&')
key, value = *line.scan( %r{^([A-Za-z0-9_.]+)\=(.*)$} ).flatten
params[key] = CGI.unescape(value)
key, value = *line.scan( %r{^([A-Za-z0-9_.-]+)\=(.*)$} ).flatten
params[key] = CGI.unescape(value.to_s) if key.present?
end
end
end
Expand Down
11 changes: 9 additions & 2 deletions lib/active_merchant/billing/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,15 @@ def self.mode=(mode)
#
# ActiveMerchant::Billing::Base.gateway('moneris').new
def self.gateway(name)
raise NameError if (name_str = name.to_s.downcase).blank?
Billing.const_get("#{name_str}_gateway".camelize)
name_str = name.to_s.strip.downcase

raise(ArgumentError, 'A gateway provider must be specified') if name_str.blank?

begin
Billing.const_get("#{name_str}_gateway".camelize)
rescue
raise ArgumentError, "The specified gateway is not valid (#{name_str})"
end
end

# Return the matching integration module
Expand Down
2 changes: 1 addition & 1 deletion lib/active_merchant/billing/credit_card_methods.rb
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def valid_test_mode_card_number?(number) #:nodoc:
%w[1 2 3 success failure error].include?(number.to_s)
end

# Checks the validity of a card number by use of the the Luhn Algorithm.
# Checks the validity of a card number by use of the Luhn Algorithm.
# Please see http://en.wikipedia.org/wiki/Luhn_algorithm for details.
def valid_checksum?(number) #:nodoc:
sum = 0
Expand Down
11 changes: 9 additions & 2 deletions lib/active_merchant/billing/gateway.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class Gateway
include Utils

DEBIT_CARDS = [ :switch, :solo ]
CURRENCIES_WITHOUT_FRACTIONS = [ 'JPY', 'HUF', 'TWD' ]
CURRENCIES_WITHOUT_FRACTIONS = [ 'JPY', 'HUF', 'TWD', 'ISK' ]
CREDIT_DEPRECATION_MESSAGE = "Support for using credit to refund existing transactions is deprecated and will be removed from a future release of ActiveMerchant. Please use the refund method instead."

cattr_reader :implementations
Expand Down Expand Up @@ -161,7 +161,14 @@ def amount(money)

def localized_amount(money, currency)
amount = amount(money)
non_fractional_currency?(currency) ? amount.split('.').first : amount

return amount unless non_fractional_currency?(currency)

if self.money_format == :cents
sprintf("%.0f", amount.to_f / 100)
else
amount.split('.').first
end
end

def non_fractional_currency?(currency)
Expand Down
Loading