activemerchant 1.7.2 → 1.7.3

data/CHANGELOG

@@ -1,9 +1,13 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.7.3 (September 14, 2010)
+
+* Fix SagePay special handling for Japanese YEN currency to not send fractional amounts [Soleone]
+
 == 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]
+* Fix SagePay to not send fractional amounts for Japanese YEN currency [Soleone]
 
 == Version 1.7.1 (July 28, 2010)
 

data/lib/active_merchant.rb

@@ -24,13 +24,13 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'active_support'
+require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/class/delegating_attributes'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/kernel/requires'
-require 'active_support/inflector'
 
 require 'builder'
 require 'cgi'

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

@@ -32,7 +32,7 @@ module ActiveMerchant #:nodoc:
         :jcb => "JCB"
       }
 
-      CURRENCIES_WITHOUT_FRACTIONS = [ 'YEN' ]
+      CURRENCIES_WITHOUT_FRACTIONS = [ 'JPY' ]
       
       ELECTRON = /^(424519|42496[23]|450875|48440[6-8]|4844[1-5][1-5]|4917[3-5][0-9]|491880)\d{10}(\d{3})?$/
       

data/lib/active_merchant/billing/integrations.rb

@@ -1,15 +1,3 @@
-
-# make the bogus gateway be classified correctly by the inflector
-if defined?(ActiveSupport::Inflector)
-  ActiveSupport::Inflector.inflections do |inflect|
-    inflect.uncountable 'bogus'
-  end
-else
-  Inflector.inflections do |inflect|
-    inflect.uncountable 'bogus'
-  end
-end
-
 module ActiveMerchant
   module Billing
     module Integrations        

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

@@ -42,7 +42,7 @@ module ActiveMerchant #:nodoc:
         def payment_service_for(order, account, options = {}, &proc)          
           raise ArgumentError, "Missing block" unless block_given?
 
-          integration_module = ActiveMerchant::Billing::Integrations.const_get(options.delete(:service).to_s.classify)
+          integration_module = ActiveMerchant::Billing::Integrations.const_get(options.delete(:service).to_s.camelize)
 
           result = []
           result << form_tag(integration_module.service_url, options.delete(:html) || {})
@@ -57,18 +57,10 @@ module ActiveMerchant #:nodoc:
           end
          
           result << '</form>'
-
-          concat(html_safe_string(result.join("\n")))
-        end
-        
-        private
-        
-        def html_safe_string(string)
-          if string.respond_to?(:html_safe)
-            string.html_safe
-          else
-            string
-          end
+          result= result.join("\n")
+          
+          concat(result.respond_to?(:html_safe) ? result.html_safe : result)
+          nil
         end
       end
     end

data/lib/active_merchant/version.rb

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

metadata

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