Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ec5e03bf
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,发现更多精彩内容 >>
提交
ec5e03bf
编写于
7月 03, 2013
作者:
V
Vipul A M
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove deprecated `Time#time_with_datetime_fallback`, `Time#utc_time`
and `Time#local_time` in favour of `Time#utc` and `Time#local`
上级
9adbbe93
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
90 deletion
+5
-90
activesupport/CHANGELOG.md
activesupport/CHANGELOG.md
+5
-0
activesupport/lib/active_support/core_ext/time/calculations.rb
...esupport/lib/active_support/core_ext/time/calculations.rb
+0
-35
activesupport/test/core_ext/time_ext_test.rb
activesupport/test/core_ext/time_ext_test.rb
+0
-55
未找到文件。
activesupport/CHANGELOG.md
浏览文件 @
ec5e03bf
*
Remove deprecated
`Time#time_with_datetime_fallback`
,
`Time#utc_time`
and
`Time#local_time`
in favor of
`Time#utc`
and
`Time#local`
.
*Vipul A M*
*
Remove deprecated
`Hash#diff`
with no replacement.
If you're using it to compare hashes for the purpose of testing, please use
...
...
activesupport/lib/active_support/core_ext/time/calculations.rb
浏览文件 @
ec5e03bf
...
...
@@ -26,41 +26,6 @@ def days_in_month(month, year = now.year)
end
end
# *DEPRECATED*: Use +Time#utc+ or +Time#local+ instead.
#
# Returns a new Time if requested year can be accommodated by Ruby's Time class
# (i.e., if year is within either 1970..2038 or 1902..2038, depending on system architecture);
# otherwise returns a DateTime.
def
time_with_datetime_fallback
(
utc_or_local
,
year
,
month
=
1
,
day
=
1
,
hour
=
0
,
min
=
0
,
sec
=
0
,
usec
=
0
)
ActiveSupport
::
Deprecation
.
warn
'time_with_datetime_fallback is deprecated. Use Time#utc or Time#local instead'
,
caller
time
=
::
Time
.
send
(
utc_or_local
,
year
,
month
,
day
,
hour
,
min
,
sec
,
usec
)
# This check is needed because Time.utc(y) returns a time object in the 2000s for 0 <= y <= 138.
if
time
.
year
==
year
time
else
::
DateTime
.
civil_from_format
(
utc_or_local
,
year
,
month
,
day
,
hour
,
min
,
sec
)
end
rescue
::
DateTime
.
civil_from_format
(
utc_or_local
,
year
,
month
,
day
,
hour
,
min
,
sec
)
end
# *DEPRECATED*: Use +Time#utc+ instead.
#
# Wraps class method +time_with_datetime_fallback+ with +utc_or_local+ set to <tt>:utc</tt>.
def
utc_time
(
*
args
)
ActiveSupport
::
Deprecation
.
warn
'utc_time is deprecated. Use Time#utc instead'
,
caller
time_with_datetime_fallback
(
:utc
,
*
args
)
end
# *DEPRECATED*: Use +Time#local+ instead.
#
# Wraps class method +time_with_datetime_fallback+ with +utc_or_local+ set to <tt>:local</tt>.
def
local_time
(
*
args
)
ActiveSupport
::
Deprecation
.
warn
'local_time is deprecated. Use Time#local instead'
,
caller
time_with_datetime_fallback
(
:local
,
*
args
)
end
# Returns <tt>Time.zone.now</tt> when <tt>Time.zone</tt> or <tt>config.time_zone</tt> are set, otherwise just returns <tt>Time.now</tt>.
def
current
::
Time
.
zone
?
::
Time
.
zone
.
now
:
::
Time
.
now
...
...
activesupport/test/core_ext/time_ext_test.rb
浏览文件 @
ec5e03bf
...
...
@@ -578,58 +578,6 @@ def test_days_in_month_feb_in_leap_year_without_year_arg
assert_equal
29
,
Time
.
days_in_month
(
2
)
end
def
test_time_with_datetime_fallback
ActiveSupport
::
Deprecation
.
silence
do
assert_equal
Time
.
time_with_datetime_fallback
(
:utc
,
2005
,
2
,
21
,
17
,
44
,
30
),
Time
.
utc
(
2005
,
2
,
21
,
17
,
44
,
30
)
assert_equal
Time
.
time_with_datetime_fallback
(
:local
,
2005
,
2
,
21
,
17
,
44
,
30
),
Time
.
local
(
2005
,
2
,
21
,
17
,
44
,
30
)
assert_equal
Time
.
time_with_datetime_fallback
(
:utc
,
2039
,
2
,
21
,
17
,
44
,
30
),
DateTime
.
civil
(
2039
,
2
,
21
,
17
,
44
,
30
,
0
)
assert_equal
Time
.
time_with_datetime_fallback
(
:local
,
2039
,
2
,
21
,
17
,
44
,
30
),
DateTime
.
civil_from_format
(
:local
,
2039
,
2
,
21
,
17
,
44
,
30
)
assert_equal
Time
.
time_with_datetime_fallback
(
:utc
,
1900
,
2
,
21
,
17
,
44
,
30
),
DateTime
.
civil
(
1900
,
2
,
21
,
17
,
44
,
30
,
0
)
assert_equal
Time
.
time_with_datetime_fallback
(
:utc
,
2005
),
Time
.
utc
(
2005
)
assert_equal
Time
.
time_with_datetime_fallback
(
:utc
,
2039
),
DateTime
.
civil
(
2039
,
1
,
1
,
0
,
0
,
0
,
0
)
assert_equal
Time
.
time_with_datetime_fallback
(
:utc
,
2005
,
2
,
21
,
17
,
44
,
30
,
1
),
Time
.
utc
(
2005
,
2
,
21
,
17
,
44
,
30
,
1
)
#with usec
# This won't overflow on 64bit linux
unless
time_is_64bits?
assert_equal
Time
.
time_with_datetime_fallback
(
:local
,
1900
,
2
,
21
,
17
,
44
,
30
),
DateTime
.
civil_from_format
(
:local
,
1900
,
2
,
21
,
17
,
44
,
30
)
assert_equal
Time
.
time_with_datetime_fallback
(
:utc
,
2039
,
2
,
21
,
17
,
44
,
30
,
1
),
DateTime
.
civil
(
2039
,
2
,
21
,
17
,
44
,
30
,
0
,
0
)
assert_equal
::
Date
::
ITALY
,
Time
.
time_with_datetime_fallback
(
:utc
,
2039
,
2
,
21
,
17
,
44
,
30
,
1
).
start
# use Ruby's default start value
end
silence_warnings
do
0
.
upto
(
138
)
do
|
year
|
[
:utc
,
:local
].
each
do
|
format
|
assert_equal
year
,
Time
.
time_with_datetime_fallback
(
format
,
year
).
year
end
end
end
end
end
def
test_utc_time
ActiveSupport
::
Deprecation
.
silence
do
assert_equal
Time
.
utc_time
(
2005
,
2
,
21
,
17
,
44
,
30
),
Time
.
utc
(
2005
,
2
,
21
,
17
,
44
,
30
)
assert_equal
Time
.
utc_time
(
2039
,
2
,
21
,
17
,
44
,
30
),
DateTime
.
civil
(
2039
,
2
,
21
,
17
,
44
,
30
,
0
)
assert_equal
Time
.
utc_time
(
1901
,
2
,
21
,
17
,
44
,
30
),
DateTime
.
civil
(
1901
,
2
,
21
,
17
,
44
,
30
,
0
)
end
end
def
test_local_time
ActiveSupport
::
Deprecation
.
silence
do
assert_equal
Time
.
local_time
(
2005
,
2
,
21
,
17
,
44
,
30
),
Time
.
local
(
2005
,
2
,
21
,
17
,
44
,
30
)
assert_equal
Time
.
local_time
(
2039
,
2
,
21
,
17
,
44
,
30
),
DateTime
.
civil_from_format
(
:local
,
2039
,
2
,
21
,
17
,
44
,
30
)
unless
time_is_64bits?
assert_equal
Time
.
local_time
(
1901
,
2
,
21
,
17
,
44
,
30
),
DateTime
.
civil_from_format
(
:local
,
1901
,
2
,
21
,
17
,
44
,
30
)
end
end
end
def
test_time_with_datetime_fallback_deprecations
assert_deprecated
(
/time_with_datetime_fallback/
)
{
Time
.
time_with_datetime_fallback
(
:utc
,
2012
,
6
,
7
)
}
assert_deprecated
(
/utc_time/
)
{
Time
.
utc_time
(
2012
,
6
,
7
)
}
assert_deprecated
(
/local_time/
)
{
Time
.
local_time
(
2012
,
6
,
7
)
}
end
def
test_last_month_on_31st
assert_equal
Time
.
local
(
2004
,
2
,
29
),
Time
.
local
(
2004
,
3
,
31
).
last_month
end
...
...
@@ -832,9 +780,6 @@ def with_env_tz(new_tz = 'US/Eastern')
old_tz
?
ENV
[
'TZ'
]
=
old_tz
:
ENV
.
delete
(
'TZ'
)
end
def
time_is_64bits?
Time
.
time_with_datetime_fallback
(
:utc
,
2039
,
2
,
21
,
17
,
44
,
30
,
1
).
is_a?
(
Time
)
end
end
class
TimeExtMarshalingTest
<
ActiveSupport
::
TestCase
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录