Review requires from number helper

Some of these requires are now only necessary in
ActiveSupport::NumberHelper. Add hash/keys require due to symbolize_keys
usage in number helpers. Also remove some whitespaces.

Closes #6414

3 files changed, 11 insertions, 15 deletions

diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index 61010f4fc3..8f97d1f014 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -1,8 +1,6 @@
 # encoding: utf-8
 
-require 'active_support/core_ext/big_decimal/conversions'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/numeric'
+require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/string/output_safety'
 require 'active_support/number_helper'
 
@@ -10,7 +8,6 @@ module ActionView
   # = Action View Number Helpers
   module Helpers #:nodoc:
 
-
     # Provides methods for converting numbers into formatted strings.
     # Methods are provided for phone numbers, currency, percentage,
     # precision, positional notation, file size and pretty printing.
diff --git a/activesupport/lib/active_support/core_ext/numeric/conversions.rb b/activesupport/lib/active_support/core_ext/numeric/conversions.rb
index 2666387623..2bbfa78639 100644
--- a/activesupport/lib/active_support/core_ext/numeric/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/numeric/conversions.rb
@@ -2,7 +2,7 @@ require 'active_support/core_ext/big_decimal/conversions'
 require 'active_support/number_helper'
 
 class Numeric
-  
+
   # Provides options for converting numbers into formatted strings.
   # Options are provided for phone numbers, currency, percentage,
   # precision, positional notation, file size and pretty printing.
@@ -97,7 +97,7 @@ class Numeric
   #  1234567.to_s(:human, :precision => 1,
   #                   :separator => ',',
   #                   :significant => false)                   # => "1,2 Million"
-  def to_formatted_s(format = :default, options = {})    
+  def to_formatted_s(format = :default, options = {})
     case format
     when :phone
       return ActiveSupport::NumberHelper.number_to_phone(self, options)
@@ -117,19 +117,19 @@ class Numeric
       self.to_default_s
     end
   end
-  
+
   [Float, Fixnum, Bignum, BigDecimal].each do |klass|
     klass.send(:alias_method, :to_default_s, :to_s)
-    
+
     klass.send(:define_method, :to_s) do |*args|
       if args[0].is_a?(Symbol)
         format = args[0]
         options = args[1] || {}
-        
+
         self.to_formatted_s(format, options)
       else
         to_default_s(*args)
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/activesupport/lib/active_support/number_helper.rb b/activesupport/lib/active_support/number_helper.rb
index 981ab0cb36..fc97782697 100644
--- a/activesupport/lib/active_support/number_helper.rb
+++ b/activesupport/lib/active_support/number_helper.rb
@@ -498,14 +498,13 @@ module ActiveSupport
       formatted_number = self.number_to_rounded(number, options)
       decimal_format.gsub(/%n/, formatted_number).gsub(/%u/, unit).strip
     end
-    
-    
+
     def self.private_module_and_instance_method(method_name)
       private method_name
       private_class_method method_name
     end
     private_class_method :private_module_and_instance_method
-      
+
     def format_translations(namespace, locale)
       defaults_translations(locale).merge(translations_for(namespace, locale))
     end
@@ -527,6 +526,6 @@ module ActiveSupport
       false
     end
     private_module_and_instance_method :valid_float?
-    
+
   end
-end
\ No newline at end of file
+end