activemerchant 1.29.2 → 1.29.3

data/CHANGELOG

@@ -1,6 +1,8 @@
 = ActiveMerchant CHANGELOG
 
-== Version 1.29.3
+== Version 1.29.3 (December 7, 2012)
+
+* WorldPay: Fix currencies without fractions like JPY and HUF by rounding down amount [Soleone]
 
 == Version 1.29.2 (December 7, 2012)
 

data/lib/active_merchant/billing/gateway.rb

@@ -62,7 +62,7 @@ module ActiveMerchant #:nodoc:
       include Utils
 
       DEBIT_CARDS = [ :switch, :solo ]
-      CURRENCIES_WITHOUT_FRACTIONS = [ 'JPY' ]
+      CURRENCIES_WITHOUT_FRACTIONS = [ 'JPY', 'HUF' ]
       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

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

@@ -38,6 +38,10 @@ module ActiveMerchant #:nodoc:
       def capture(money, authorization, options = {})
         MultiResponse.run do |r|
           r.process{inquire_request(authorization, options, "AUTHORISED")} unless options[:authorization_validated]
+          if r.params
+            authorization_currency = r.params['amount_currency_code']
+            options = options.merge(:currency => authorization_currency) if authorization_currency.present?
+          end
           r.process{capture_request(money, authorization, options)}
         end
       end
@@ -148,10 +152,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_amount(xml, money, options)
-        xml.tag! 'amount',
-          :value => amount(money),
-          'currencyCode' => (options[:currency] || currency(money)),
-          'exponent' => 2
+        currency = options[:currency] || currency(money)
+        amount   = localized_amount(money, currency)
+
+        xml.tag! 'amount', :value => amount, 'currencyCode' => currency, 'exponent' => 2
       end
 
       def add_payment_method(xml, amount, payment_method, options)
@@ -261,6 +265,13 @@ module ActiveMerchant #:nodoc:
         credentials = "#{@options[:login]}:#{@options[:password]}"
         "Basic #{[credentials].pack('m').strip}"
       end
+
+      def localized_amount(money, currency)
+        amount = amount(money)
+        return amount unless CURRENCIES_WITHOUT_FRACTIONS.include?(currency.to_s)
+        
+        amount.to_i / 100 * 100
+      end
     end
   end
 end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.29.2"
+  VERSION = "1.29.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.29.2
+  version: 1.29.3
   prerelease: 
 platform: ruby
 authors:
@@ -41,7 +41,7 @@ date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70328397930860 !ruby/object:Gem::Requirement
+  requirement: &70282608718400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -49,10 +49,10 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70328397930860
+  version_requirements: *70282608718400
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70328397930420 !ruby/object:Gem::Requirement
+  requirement: &70282608718420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -60,10 +60,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328397930420
+  version_requirements: *70282608718420
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &70328397929920 !ruby/object:Gem::Requirement
+  requirement: &70282608717880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -71,10 +71,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328397929920
+  version_requirements: *70282608717880
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70328397929380 !ruby/object:Gem::Requirement
+  requirement: &70282608717380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -82,10 +82,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70328397929380
+  version_requirements: *70282608717380
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70328397928860 !ruby/object:Gem::Requirement
+  requirement: &70282608716860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -93,10 +93,10 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70328397928860
+  version_requirements: *70282608716860
 - !ruby/object:Gem::Dependency
   name: active_utils
-  requirement: &70328397928360 !ruby/object:Gem::Requirement
+  requirement: &70282608716360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -104,10 +104,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70328397928360
+  version_requirements: *70282608716360
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70328397927960 !ruby/object:Gem::Requirement
+  requirement: &70282608715980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -115,10 +115,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328397927960
+  version_requirements: *70282608715980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70328397927460 !ruby/object:Gem::Requirement
+  requirement: &70282608715520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -126,10 +126,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328397927460
+  version_requirements: *70282608715520
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70328397926920 !ruby/object:Gem::Requirement
+  requirement: &70282608715020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +137,10 @@ dependencies:
         version: 0.11.3
   type: :development
   prerelease: false
-  version_requirements: *70328397926920
+  version_requirements: *70282608715020
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70328397926380 !ruby/object:Gem::Requirement
+  requirement: &70282608714480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -148,10 +148,10 @@ dependencies:
         version: 2.3.14
   type: :development
   prerelease: false
-  version_requirements: *70328397926380
+  version_requirements: *70282608714480
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70328397925980 !ruby/object:Gem::Requirement
+  requirement: &70282608714080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -159,7 +159,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328397925980
+  version_requirements: *70282608714080
 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