Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
27c70ff3
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,发现更多精彩内容 >>
提交
27c70ff3
编写于
9月 04, 2008
作者:
T
Tom Lea
提交者:
gbuesing
10月 13, 2008
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Time#advance recognizes fractional days and weeks [#970 state:resolved]
上级
1abdc875
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
44 addition
and
0 deletion
+44
-0
activesupport/lib/active_support/core_ext/time/calculations.rb
...esupport/lib/active_support/core_ext/time/calculations.rb
+10
-0
activesupport/test/core_ext/duration_test.rb
activesupport/test/core_ext/duration_test.rb
+34
-0
未找到文件。
activesupport/lib/active_support/core_ext/time/calculations.rb
浏览文件 @
27c70ff3
...
...
@@ -98,6 +98,16 @@ def change(options)
# <tt>:months</tt>, <tt>:weeks</tt>, <tt>:days</tt>, <tt>:hours</tt>,
# <tt>:minutes</tt>, <tt>:seconds</tt>.
def
advance
(
options
)
unless
options
[
:weeks
].
nil?
options
[
:weeks
],
partial_weeks
=
options
[
:weeks
].
divmod
(
1
)
options
[
:days
]
=
(
options
[
:days
]
||
0
)
+
7
*
partial_weeks
end
unless
options
[
:days
].
nil?
options
[
:days
],
partial_days
=
options
[
:days
].
divmod
(
1
)
options
[
:hours
]
=
(
options
[
:hours
]
||
0
)
+
24
*
partial_days
end
d
=
to_date
.
advance
(
options
)
time_advanced_by_date
=
change
(
:year
=>
d
.
year
,
:month
=>
d
.
month
,
:day
=>
d
.
day
)
seconds_to_advance
=
(
options
[
:seconds
]
||
0
)
+
(
options
[
:minutes
]
||
0
)
*
60
+
(
options
[
:hours
]
||
0
)
*
3600
...
...
activesupport/test/core_ext/duration_test.rb
浏览文件 @
27c70ff3
...
...
@@ -31,6 +31,40 @@ def test_argument_error
end
uses_mocha
'TestDurationSinceAndAgoWithCurrentTime'
do
def
test_fractional_weeks
Time
.
stubs
(
:now
).
returns
Time
.
local
(
2000
)
assert_in_delta
((
24
*
7
*
1.5
).
hours
,
1.5
.
weeks
,
2
**
-
20
)
assert_in_delta
((
24
*
7
*
1.7
).
hours
,
1.7
.
weeks
,
2
**
-
20
)
end
def
test_fractional_days
Time
.
stubs
(
:now
).
returns
Time
.
local
(
2000
)
assert_in_delta
((
24
*
1.5
).
hours
,
1.5
.
days
,
2
**
-
20
)
assert_in_delta
((
24
*
1.7
).
hours
,
1.7
.
days
,
2
**
-
20
)
end
def
test_since_and_ago_with_fractional_days
Time
.
stubs
(
:now
).
returns
Time
.
local
(
2000
)
# since
assert_equal
36
.
hours
.
since
,
1.5
.
days
.
since
assert_equal
((
24
*
1.7
).
hours
.
since
,
1.7
.
days
.
since
)
# ago
assert_equal
36
.
hours
.
ago
,
1.5
.
days
.
ago
assert_equal
((
24
*
1.7
).
hours
.
ago
,
1.7
.
days
.
ago
)
end
def
test_since_and_ago_with_fractional_weeks
Time
.
stubs
(
:now
).
returns
Time
.
local
(
2000
)
# since
assert_equal
((
7
*
36
).
hours
.
since
,
1.5
.
weeks
.
since
)
assert_equal
((
7
*
24
*
1.7
).
hours
.
since
,
1.7
.
weeks
.
since
)
# ago
assert_equal
((
7
*
36
).
hours
.
ago
,
1.5
.
weeks
.
ago
)
assert_equal
((
7
*
24
*
1.7
).
hours
.
ago
,
1.7
.
weeks
.
ago
)
end
def
test_since_and_ago_anchored_to_time_now_when_time_zone_default_not_set
Time
.
zone_default
=
nil
with_env_tz
'US/Eastern'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录