Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
24bf3f08
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,发现更多精彩内容 >>
提交
24bf3f08
编写于
12月 05, 2019
作者:
R
Ryuta Kamizono
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge pull request #37882 from kamipo/should_keep_zero_duration_parts
Should keep the original parts for zero duration
上级
596e1250
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
4 deletion
+14
-4
activesupport/lib/active_support/duration.rb
activesupport/lib/active_support/duration.rb
+4
-4
activesupport/test/core_ext/duration_test.rb
activesupport/test/core_ext/duration_test.rb
+10
-0
未找到文件。
activesupport/lib/active_support/duration.rb
浏览文件 @
24bf3f08
...
...
@@ -182,15 +182,15 @@ def years(value) #:nodoc:
#
def
build
(
value
)
parts
=
{}
remainder
=
value
.
to_f
remainder
=
value
.
round
(
9
)
PARTS
.
each
do
|
part
|
unless
part
==
:seconds
part_in_seconds
=
PARTS_IN_SECONDS
[
part
]
parts
[
part
]
=
remainder
.
div
(
part_in_seconds
)
remainder
=
(
remainder
%
part_in_seconds
).
round
(
9
)
remainder
%=
part_in_seconds
end
end
end
unless
value
==
0
parts
[
:seconds
]
=
remainder
...
...
@@ -209,7 +209,7 @@ def calculate_total_seconds(parts)
def
initialize
(
value
,
parts
)
#:nodoc:
@value
,
@parts
=
value
,
parts
.
to_h
@parts
.
default
=
0
@parts
.
reject!
{
|
k
,
v
|
v
.
zero?
}
@parts
.
reject!
{
|
k
,
v
|
v
.
zero?
}
unless
value
==
0
end
def
coerce
(
other
)
#:nodoc:
...
...
activesupport/test/core_ext/duration_test.rb
浏览文件 @
24bf3f08
...
...
@@ -62,6 +62,7 @@ def test_eql
def
test_inspect
assert_equal
"0 seconds"
,
0
.
seconds
.
inspect
assert_equal
"0 days"
,
0
.
days
.
inspect
assert_equal
"1 month"
,
1
.
month
.
inspect
assert_equal
"1 month and 1 day"
,
(
1
.
month
+
1
.
day
).
inspect
assert_equal
"6 months and -2 days"
,
(
6
.
months
-
2
.
days
).
inspect
...
...
@@ -155,20 +156,29 @@ def test_modulo
assert_instance_of
ActiveSupport
::
Duration
,
13
.
months
%
1
.
year
end
def
test_date_added_with_zero_days
assert_equal
Date
.
civil
(
2017
,
1
,
1
),
Date
.
civil
(
2017
,
1
,
1
)
+
0
.
days
assert_instance_of
Date
,
Date
.
civil
(
2017
,
1
,
1
)
+
0
.
days
end
def
test_date_added_with_multiplied_duration
assert_equal
Date
.
civil
(
2017
,
1
,
3
),
Date
.
civil
(
2017
,
1
,
1
)
+
1
.
day
*
2
assert_instance_of
Date
,
Date
.
civil
(
2017
,
1
,
1
)
+
1
.
day
*
2
end
def
test_date_added_with_multiplied_duration_larger_than_one_month
assert_equal
Date
.
civil
(
2017
,
2
,
15
),
Date
.
civil
(
2017
,
1
,
1
)
+
1
.
day
*
45
assert_instance_of
Date
,
Date
.
civil
(
2017
,
1
,
1
)
+
1
.
day
*
45
end
def
test_date_added_with_divided_duration
assert_equal
Date
.
civil
(
2017
,
1
,
3
),
Date
.
civil
(
2017
,
1
,
1
)
+
4
.
days
/
2
assert_instance_of
Date
,
Date
.
civil
(
2017
,
1
,
1
)
+
4
.
days
/
2
end
def
test_date_added_with_divided_duration_larger_than_one_month
assert_equal
Date
.
civil
(
2017
,
2
,
15
),
Date
.
civil
(
2017
,
1
,
1
)
+
90
.
days
/
2
assert_instance_of
Date
,
Date
.
civil
(
2017
,
1
,
1
)
+
90
.
days
/
2
end
def
test_plus_with_time
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录