Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
a3b36438
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a3b36438
编写于
1月 25, 2012
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4667 from carlosantoniodasilva/av-number-helper
Action View number helpers improvements
上级
a6aea14e
74fabdf6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
55 addition
and
44 deletion
+55
-44
actionpack/lib/action_view/helpers/number_helper.rb
actionpack/lib/action_view/helpers/number_helper.rb
+30
-44
actionpack/test/template/number_helper_test.rb
actionpack/test/template/number_helper_test.rb
+25
-0
未找到文件。
actionpack/lib/action_view/helpers/number_helper.rb
浏览文件 @
a3b36438
...
@@ -57,15 +57,11 @@ def initialize(number)
...
@@ -57,15 +57,11 @@ def initialize(number)
# # => +1.123.555.1234 x 1343
# # => +1.123.555.1234 x 1343
def
number_to_phone
(
number
,
options
=
{})
def
number_to_phone
(
number
,
options
=
{})
return
unless
number
return
unless
number
options
=
options
.
symbolize_keys
begin
parse_float
(
number
,
true
)
if
options
[
:raise
]
Float
(
number
)
rescue
ArgumentError
,
TypeError
raise
InvalidNumberError
,
number
end
if
options
[
:raise
]
number
=
number
.
to_s
.
strip
number
=
number
.
to_s
.
strip
options
=
options
.
symbolize_keys
area_code
=
options
[
:area_code
]
area_code
=
options
[
:area_code
]
delimiter
=
options
[
:delimiter
]
||
"-"
delimiter
=
options
[
:delimiter
]
||
"-"
extension
=
options
[
:extension
]
extension
=
options
[
:extension
]
...
@@ -75,7 +71,7 @@ def number_to_phone(number, options = {})
...
@@ -75,7 +71,7 @@ def number_to_phone(number, options = {})
number
.
gsub!
(
/(\d{1,3})(\d{3})(\d{4}$)/
,
"(
\\
1)
\\
2
#{
delimiter
}
\\
3"
)
number
.
gsub!
(
/(\d{1,3})(\d{3})(\d{4}$)/
,
"(
\\
1)
\\
2
#{
delimiter
}
\\
3"
)
else
else
number
.
gsub!
(
/(\d{0,3})(\d{3})(\d{4})$/
,
"
\\
1
#{
delimiter
}
\\
2
#{
delimiter
}
\\
3"
)
number
.
gsub!
(
/(\d{0,3})(\d{3})(\d{4})$/
,
"
\\
1
#{
delimiter
}
\\
2
#{
delimiter
}
\\
3"
)
number
.
slice!
(
0
,
1
)
if
number
.
start
s
_with?
(
delimiter
)
&&
!
delimiter
.
blank?
number
.
slice!
(
0
,
1
)
if
number
.
start_with?
(
delimiter
)
&&
!
delimiter
.
blank?
end
end
str
=
[]
str
=
[]
...
@@ -122,8 +118,7 @@ def number_to_phone(number, options = {})
...
@@ -122,8 +118,7 @@ def number_to_phone(number, options = {})
# # => 1234567890,50 £
# # => 1234567890,50 £
def
number_to_currency
(
number
,
options
=
{})
def
number_to_currency
(
number
,
options
=
{})
return
unless
number
return
unless
number
options
=
options
.
symbolize_keys
options
.
symbolize_keys!
currency
=
translations_for
(
'currency'
,
options
[
:locale
])
currency
=
translations_for
(
'currency'
,
options
[
:locale
])
currency
[
:negative_format
]
||=
"-"
+
currency
[
:format
]
if
currency
[
:format
]
currency
[
:negative_format
]
||=
"-"
+
currency
[
:format
]
if
currency
[
:format
]
...
@@ -185,12 +180,10 @@ def number_to_currency(number, options = {})
...
@@ -185,12 +180,10 @@ def number_to_currency(number, options = {})
# number_to_percentage("98a", :raise => true) # => InvalidNumberError
# number_to_percentage("98a", :raise => true) # => InvalidNumberError
def
number_to_percentage
(
number
,
options
=
{})
def
number_to_percentage
(
number
,
options
=
{})
return
unless
number
return
unless
number
options
=
options
.
symbolize_keys
options
.
symbolize_keys!
defaults
=
format_translations
(
'percentage'
,
options
[
:locale
])
options
=
defaults
.
merge!
(
options
)
defaults
=
defaults_translations
(
options
[
:locale
]).
merge
(
translations_for
(
'percentage'
,
options
[
:locale
]))
options
=
options
.
reverse_merge
(
defaults
)
format
=
options
[
:format
]
||
"%n%"
format
=
options
[
:format
]
||
"%n%"
...
@@ -201,7 +194,8 @@ def number_to_percentage(number, options = {})
...
@@ -201,7 +194,8 @@ def number_to_percentage(number, options = {})
if
options
[
:raise
]
if
options
[
:raise
]
raise
raise
else
else
e
.
number
.
to_s
.
html_safe?
?
format
.
gsub
(
/%n/
,
e
.
number
).
html_safe
:
format
.
gsub
(
/%n/
,
e
.
number
)
formatted_number
=
format
.
gsub
(
/%n/
,
e
.
number
)
e
.
number
.
to_s
.
html_safe?
?
formatted_number
.
html_safe
:
formatted_number
end
end
end
end
end
end
...
@@ -231,13 +225,11 @@ def number_to_percentage(number, options = {})
...
@@ -231,13 +225,11 @@ def number_to_percentage(number, options = {})
#
#
# number_with_delimiter("112a", :raise => true) # => raise InvalidNumberError
# number_with_delimiter("112a", :raise => true) # => raise InvalidNumberError
def
number_with_delimiter
(
number
,
options
=
{})
def
number_with_delimiter
(
number
,
options
=
{})
options
.
symbolize_keys!
options
=
options
.
symbolize_keys
parse_float_number
(
number
,
options
[
:raise
])
do
parse_float
(
number
,
options
[
:raise
])
or
return
number
return
number
end
options
=
options
.
reverse_merge
(
defaults_translations
(
options
[
:locale
])
)
options
=
defaults_translations
(
options
[
:locale
]).
merge
(
options
)
parts
=
number
.
to_s
.
to_str
.
split
(
'.'
)
parts
=
number
.
to_s
.
to_str
.
split
(
'.'
)
parts
[
0
].
gsub!
(
/(\d)(?=(\d\d\d)+(?!\d))/
,
"
\\
1
#{
options
[
:delimiter
]
}
"
)
parts
[
0
].
gsub!
(
/(\d)(?=(\d\d\d)+(?!\d))/
,
"
\\
1
#{
options
[
:delimiter
]
}
"
)
...
@@ -277,15 +269,13 @@ def number_with_delimiter(number, options = {})
...
@@ -277,15 +269,13 @@ def number_with_delimiter(number, options = {})
# number_with_precision(1111.2345, :precision => 2, :separator => ',', :delimiter => '.')
# number_with_precision(1111.2345, :precision => 2, :separator => ',', :delimiter => '.')
# # => 1.111,23
# # => 1.111,23
def
number_with_precision
(
number
,
options
=
{})
def
number_with_precision
(
number
,
options
=
{})
options
.
symbolize_keys!
options
=
options
.
symbolize_keys
number
=
parse_float_number
(
number
,
options
[
:raise
])
do
number
=
(
parse_float
(
number
,
options
[
:raise
])
or
return
number
)
return
number
end
defaults
=
defaults_translations
(
options
[
:locale
]).
merge
(
translations_for
(
'precision'
,
options
[
:locale
]))
defaults
=
format_translations
(
'precision'
,
options
[
:locale
])
options
=
defaults
.
merge!
(
options
)
options
=
options
.
reverse_merge
(
defaults
)
# Allow the user to unset default values: Eg.: :significant => false
precision
=
options
.
delete
:precision
precision
=
options
.
delete
:precision
significant
=
options
.
delete
:significant
significant
=
options
.
delete
:significant
strip_insignificant_zeros
=
options
.
delete
:strip_insignificant_zeros
strip_insignificant_zeros
=
options
.
delete
:strip_insignificant_zeros
...
@@ -346,15 +336,13 @@ def number_with_precision(number, options = {})
...
@@ -346,15 +336,13 @@ def number_with_precision(number, options = {})
# number_to_human_size(1234567890123, :precision => 5) # => "1.1229 TB"
# number_to_human_size(1234567890123, :precision => 5) # => "1.1229 TB"
# number_to_human_size(524288000, :precision => 5) # => "500 MB"
# number_to_human_size(524288000, :precision => 5) # => "500 MB"
def
number_to_human_size
(
number
,
options
=
{})
def
number_to_human_size
(
number
,
options
=
{})
options
.
symbolize_keys!
options
=
options
.
symbolize_keys
number
=
parse_float_number
(
number
,
options
[
:raise
])
do
number
=
(
parse_float
(
number
,
options
[
:raise
])
or
return
number
)
return
number
end
defaults
=
defaults_translations
(
options
[
:locale
]).
merge
(
translations_for
(
'human'
,
options
[
:locale
]))
defaults
=
format_translations
(
'human'
,
options
[
:locale
])
options
=
defaults
.
merge!
(
options
)
options
=
options
.
reverse_merge
(
defaults
)
#for backwards compatibility with those that didn't add strip_insignificant_zeros to their locale files
#for backwards compatibility with those that didn't add strip_insignificant_zeros to their locale files
options
[
:strip_insignificant_zeros
]
=
true
if
not
options
.
key?
(
:strip_insignificant_zeros
)
options
[
:strip_insignificant_zeros
]
=
true
if
not
options
.
key?
(
:strip_insignificant_zeros
)
...
@@ -458,15 +446,13 @@ def number_to_human_size(number, options = {})
...
@@ -458,15 +446,13 @@ def number_to_human_size(number, options = {})
# number_to_human(0.34, :units => :distance) # => "34 centimeters"
# number_to_human(0.34, :units => :distance) # => "34 centimeters"
#
#
def
number_to_human
(
number
,
options
=
{})
def
number_to_human
(
number
,
options
=
{})
options
.
symbolize_keys!
options
=
options
.
symbolize_keys
number
=
parse_float_number
(
number
,
options
[
:raise
])
do
number
=
(
parse_float
(
number
,
options
[
:raise
])
or
return
number
)
return
number
end
defaults
=
defaults_translations
(
options
[
:locale
]).
merge
(
translations_for
(
'human'
,
options
[
:locale
]))
defaults
=
format_translations
(
'human'
,
options
[
:locale
])
options
=
defaults
.
merge!
(
options
)
options
=
options
.
reverse_merge
(
defaults
)
#for backwards compatibility with those that didn't add strip_insignificant_zeros to their locale files
#for backwards compatibility with those that didn't add strip_insignificant_zeros to their locale files
options
[
:strip_insignificant_zeros
]
=
true
if
not
options
.
key?
(
:strip_insignificant_zeros
)
options
[
:strip_insignificant_zeros
]
=
true
if
not
options
.
key?
(
:strip_insignificant_zeros
)
...
@@ -504,6 +490,10 @@ def number_to_human(number, options = {})
...
@@ -504,6 +490,10 @@ def number_to_human(number, options = {})
private
private
def
format_translations
(
namespace
,
locale
)
defaults_translations
(
locale
).
merge
(
translations_for
(
namespace
,
locale
))
end
def
defaults_translations
(
locale
)
def
defaults_translations
(
locale
)
I18n
.
translate
(
:'number.format'
,
:locale
=>
locale
,
:default
=>
{})
I18n
.
translate
(
:'number.format'
,
:locale
=>
locale
,
:default
=>
{})
end
end
...
@@ -512,14 +502,10 @@ def translations_for(namespace, locale)
...
@@ -512,14 +502,10 @@ def translations_for(namespace, locale)
I18n
.
translate
(
:"number.
#{
namespace
}
.format"
,
:locale
=>
locale
,
:default
=>
{})
I18n
.
translate
(
:"number.
#{
namespace
}
.format"
,
:locale
=>
locale
,
:default
=>
{})
end
end
def
parse_float
_number
(
number
,
raise_error
)
def
parse_float
(
number
,
raise_error
)
Float
(
number
)
Float
(
number
)
rescue
ArgumentError
,
TypeError
rescue
ArgumentError
,
TypeError
if
raise_error
raise
InvalidNumberError
,
number
if
raise_error
raise
InvalidNumberError
,
number
else
yield
end
end
end
end
end
end
end
...
...
actionpack/test/template/number_helper_test.rb
浏览文件 @
a3b36438
...
@@ -268,6 +268,31 @@ def test_number_helpers_should_return_nil_when_given_nil
...
@@ -268,6 +268,31 @@ def test_number_helpers_should_return_nil_when_given_nil
assert_nil
number_to_human
(
nil
)
assert_nil
number_to_human
(
nil
)
end
end
def
test_number_helpers_do_not_mutate_options_hash
options
=
{
'raise'
=>
true
}
number_to_phone
(
1
,
options
)
assert_equal
({
'raise'
=>
true
},
options
)
number_to_currency
(
1
,
options
)
assert_equal
({
'raise'
=>
true
},
options
)
number_to_percentage
(
1
,
options
)
assert_equal
({
'raise'
=>
true
},
options
)
number_with_delimiter
(
1
,
options
)
assert_equal
({
'raise'
=>
true
},
options
)
number_with_precision
(
1
,
options
)
assert_equal
({
'raise'
=>
true
},
options
)
number_to_human_size
(
1
,
options
)
assert_equal
({
'raise'
=>
true
},
options
)
number_to_human
(
1
,
options
)
assert_equal
({
'raise'
=>
true
},
options
)
end
def
test_number_helpers_should_return_non_numeric_param_unchanged
def
test_number_helpers_should_return_non_numeric_param_unchanged
assert_equal
(
"+1-x x 123"
,
number_to_phone
(
"x"
,
:country_code
=>
1
,
:extension
=>
123
))
assert_equal
(
"+1-x x 123"
,
number_to_phone
(
"x"
,
:country_code
=>
1
,
:extension
=>
123
))
assert_equal
(
"x"
,
number_to_phone
(
"x"
))
assert_equal
(
"x"
,
number_to_phone
(
"x"
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录