Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor NumberHelpers #4560

Merged
merged 2 commits into from Jan 21, 2012
Merged

Refactor NumberHelpers #4560

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f170453
Remove code duplication
rafaelfranca Jan 20, 2012
977f6b4
Refactor translations retrieval
rafaelfranca Jan 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
86 changes: 34 additions & 52 deletions actionpack/lib/action_view/helpers/number_helper.rb
View file
Open in desktop
Expand Up @@ -125,11 +125,10 @@ def number_to_currency(number, options = {})

options.symbolize_keys!

defaults = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
currency = I18n.translate(:'number.currency.format', :locale => options[:locale], :default => {})
currency = translations_for('currency', options[:locale])
currency[:negative_format] ||= "-" + currency[:format] if currency[:format]

defaults = DEFAULT_CURRENCY_VALUES.merge(defaults).merge!(currency)
defaults = DEFAULT_CURRENCY_VALUES.merge(defaults_translations(options[:locale])).merge!(currency)
defaults[:negative_format] = "-" + options[:format] if options[:format]
options = defaults.merge!(options)

Expand All @@ -152,7 +151,6 @@ def number_to_currency(number, options = {})
e.number.to_s.html_safe? ? formatted_number.html_safe : formatted_number
end
end

end

# Formats a +number+ as a percentage string (e.g., 65%). You can customize the format in the +options+ hash.
Expand Down Expand Up @@ -190,9 +188,7 @@ def number_to_percentage(number, options = {})

options.symbolize_keys!

defaults = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
percentage = I18n.translate(:'number.percentage.format', :locale => options[:locale], :default => {})
defaults = defaults.merge(percentage)
defaults = defaults_translations(options[:locale]).merge(translations_for('percentage', options[:locale]))

options = options.reverse_merge(defaults)

Expand Down Expand Up @@ -237,23 +233,15 @@ def number_to_percentage(number, options = {})
def number_with_delimiter(number, options = {})
options.symbolize_keys!

begin
Float(number)
rescue ArgumentError, TypeError
if options[:raise]
raise InvalidNumberError, number
else
return number
end
parse_float_number(number, options[:raise]) do
return number
end

defaults = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
options = options.reverse_merge(defaults)
options = options.reverse_merge(defaults_translations(options[:locale]))

parts = number.to_s.to_str.split('.')
parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{options[:delimiter]}")
parts.join(options[:separator]).html_safe

end

# Formats a +number+ with the specified level of <tt>:precision</tt> (e.g., 112.32 has a precision
Expand Down Expand Up @@ -290,19 +278,11 @@ def number_with_delimiter(number, options = {})
def number_with_precision(number, options = {})
options.symbolize_keys!

number = begin
Float(number)
rescue ArgumentError, TypeError
if options[:raise]
raise InvalidNumberError, number
else
return number
end
number = parse_float_number(number, options[:raise]) do
return number
end

defaults = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
precision_defaults = I18n.translate(:'number.precision.format', :locale => options[:locale], :default => {})
defaults = defaults.merge(precision_defaults)
defaults = defaults_translations(options[:locale]).merge(translations_for('precision', options[:locale]))

options = options.reverse_merge(defaults) # Allow the user to unset default values: Eg.: :significant => false
precision = options.delete :precision
Expand All @@ -329,7 +309,6 @@ def number_with_precision(number, options = {})
else
formatted_number
end

end

STORAGE_UNITS = [:byte, :kb, :mb, :gb, :tb].freeze
Expand Down Expand Up @@ -367,19 +346,11 @@ def number_with_precision(number, options = {})
def number_to_human_size(number, options = {})
options.symbolize_keys!

number = begin
Float(number)
rescue ArgumentError, TypeError
if options[:raise]
raise InvalidNumberError, number
else
return number
end
number = parse_float_number(number, options[:raise]) do
return number
end

defaults = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
human = I18n.translate(:'number.human.format', :locale => options[:locale], :default => {})
defaults = defaults.merge(human)
defaults = defaults_translations(options[:locale]).merge(translations_for('human', options[:locale]))

options = options.reverse_merge(defaults)
#for backwards compatibility with those that didn't add strip_insignificant_zeros to their locale files
Expand Down Expand Up @@ -486,19 +457,11 @@ def number_to_human_size(number, options = {})
def number_to_human(number, options = {})
options.symbolize_keys!

number = begin
Float(number)
rescue ArgumentError, TypeError
if options[:raise]
raise InvalidNumberError, number
else
return number
end
number = parse_float_number(number, options[:raise]) do
return number
end

defaults = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
human = I18n.translate(:'number.human.format', :locale => options[:locale], :default => {})
defaults = defaults.merge(human)
defaults = defaults_translations(options[:locale]).merge(translations_for('human', options[:locale]))

options = options.reverse_merge(defaults)
#for backwards compatibility with those that didn't add strip_insignificant_zeros to their locale files
Expand Down Expand Up @@ -536,6 +499,25 @@ def number_to_human(number, options = {})
decimal_format.gsub(/%n/, formatted_number).gsub(/%u/, unit).strip.html_safe
end

private

def defaults_translations(locale)
I18n.translate(:'number.format', :locale => locale, :default => {})
end

def translations_for(namespace, locale)
I18n.translate(:"number.#{namespace}.format", :locale => locale, :default => {})
end

def parse_float_number(number, raise_error)
Float(number)
rescue ArgumentError, TypeError
if raise_error
raise InvalidNumberError, number
else
yield
end
end
end
end
end