activemerchant 1.7.1 → 1.7.2

data/CHANGELOG

@@ -1,5 +1,10 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.7.2 (August 27, 2010)
+
+* Update Braintree integration to play nicely with the braintree 2.5.0 gem [Soleone]
+* Fix SagePay to not send fractional amounts for Chinese YEN currency [Soleone]
+
 == Version 1.7.1 (July 28, 2010)
 
 * Pull in only the necessary components of Active Support. Enables use of ActiveMerchant with Rails 3 [railsjedi]

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

@@ -22,7 +22,7 @@ module ActiveMerchant #:nodoc:
         Braintree::Configuration.public_key = options[:public_key]
         Braintree::Configuration.private_key = options[:private_key]
         Braintree::Configuration.environment = test? ? :sandbox : :production
-        Braintree::Configuration.logger.level = Logger::ERROR#DEBUG
+        Braintree::Configuration.logger.level = Logger::ERROR if Braintree::Configuration.logger
         Braintree::Configuration.custom_user_agent = "ActiveMerchant #{ActiveMerchant::VERSION}"
         super
       end

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

@@ -31,6 +31,8 @@ module ActiveMerchant #:nodoc:
         :diners_club => "DC",
         :jcb => "JCB"
       }
+
+      CURRENCIES_WITHOUT_FRACTIONS = [ 'YEN' ]
       
       ELECTRON = /^(424519|42496[23]|450875|48440[6-8]|4844[1-5][1-5]|4917[3-5][0-9]|491880)\d{10}(\d{3})?$/
       
@@ -138,8 +140,9 @@ module ActiveMerchant #:nodoc:
       end
       
       def add_amount(post, money, options)
-        add_pair(post, :Amount, amount(money), :required => true)
-        add_pair(post, :Currency, options[:currency] || currency(money), :required => true)
+        currency = options[:currency] || currency(money)
+        add_pair(post, :Amount, localized_amount(money, currency), :required => true)
+        add_pair(post, :Currency, currency, :required => true)
       end
 
       # doesn't actually use the currency -- dodgy!
@@ -303,6 +306,11 @@ module ActiveMerchant #:nodoc:
         first_name = name.join(' ')
         [ first_name[0,20], last_name[0,20] ]
       end
+      
+      def localized_amount(money, currency)
+        amount = amount(money)
+        CURRENCIES_WITHOUT_FRACTIONS.include?(currency.to_s) ? amount.split('.').first : amount
+      end
     end
   end
 end

data/lib/active_merchant/billing/integrations/action_view_helper.rb

@@ -44,34 +44,31 @@ module ActiveMerchant #:nodoc:
 
           integration_module = ActiveMerchant::Billing::Integrations.const_get(options.delete(:service).to_s.classify)
 
-          if ignore_binding?
-            concat(form_tag(integration_module.service_url, options.delete(:html) || {}))
-          else
-            concat(form_tag(integration_module.service_url, options.delete(:html) || {}), proc.binding)
-          end
-          result = "\n"
+          result = []
+          result << form_tag(integration_module.service_url, options.delete(:html) || {})
           
           service_class = integration_module.const_get('Helper')
           service = service_class.new(order, account, options)
-          yield service
-          
-          result << service.form_fields.collect do |field, value|
-            hidden_field_tag(field, value)
-          end.join("\n")
 
-          result << "\n"
-          result << '</form>' 
+          result << capture(service, &proc)
 
-          if ignore_binding?
-            concat(result)
-          else
-            concat(result, proc.binding)
+          service.form_fields.each do |field, value|
+            result << hidden_field_tag(field, value)
           end
+         
+          result << '</form>'
+
+          concat(html_safe_string(result.join("\n")))
         end
         
         private
-        def ignore_binding?
-          ActionPack::VERSION::MAJOR >= 3 || (ActionPack::VERSION::MAJOR >= 2 && ActionPack::VERSION::MINOR >= 2)
+        
+        def html_safe_string(string)
+          if string.respond_to?(:html_safe)
+            string.html_safe
+          else
+            string
+          end
         end
       end
     end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.7.1"
+  VERSION = "1.7.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activemerchant
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 1
   - 7
-  - 1
-  version: 1.7.1
+  - 2
+  version: 1.7.2
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -36,7 +36,7 @@ cert_chain:
   hPaSTyVU0yCSnw==
   -----END CERTIFICATE-----
 
-date: 2010-07-28 00:00:00 -04:00
+date: 2010-08-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency