guitarparty · saevarom · Oct 2, 2013 · Oct 2, 2013 · Oct 3, 2013 · Oct 7, 2013
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ pkg
 Gemfile.lock
 Gemfile*.lock
 .rbx/
+*.gem
diff --git a/CHANGELOG b/CHANGELOG
@@ -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]
@@ -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
-
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -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)
diff --git a/README.md b/README.md
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/RELEASING b/RELEASING
@@ -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
diff --git a/Rakefile b/Rakefile
@@ -1,4 +1,5 @@
 $:.unshift File.expand_path('../lib', __FILE__)
+require 'active_merchant/version'
 
 begin
   require 'bundler'
@@ -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
@@ -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

diff --git a/activemerchant.gemspec b/activemerchant.gemspec
@@ -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')

diff --git a/gem-public_cert.pem b/gem-public_cert.pem
@@ -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-----
diff --git a/generators/integration/templates/notification.rb b/generators/integration/templates/notification.rb
@@ -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

diff --git a/lib/active_merchant/billing/base.rb b/lib/active_merchant/billing/base.rb
@@ -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

diff --git a/lib/active_merchant/billing/credit_card_methods.rb b/lib/active_merchant/billing/credit_card_methods.rb
@@ -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

diff --git a/lib/active_merchant/billing/gateway.rb b/lib/active_merchant/billing/gateway.rb
@@ -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
@@ -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)
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,4 @@ pkg @@
     Gemfile.lock
     Gemfile*.lock
     .rbx/
+    *.gem