Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
8cf4725f
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,发现更多精彩内容 >>
提交
8cf4725f
编写于
5月 11, 2011
作者:
S
Santiago Pastorino
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #227 from farski/master
Unnecessary redundancy in Time/Date calculations
上级
f5fcfc2a
377bd69e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
6 deletion
+6
-6
activesupport/lib/active_support/core_ext/date/calculations.rb
...esupport/lib/active_support/core_ext/date/calculations.rb
+3
-3
activesupport/lib/active_support/core_ext/time/calculations.rb
...esupport/lib/active_support/core_ext/time/calculations.rb
+3
-3
未找到文件。
activesupport/lib/active_support/core_ext/date/calculations.rb
浏览文件 @
8cf4725f
...
...
@@ -206,7 +206,7 @@ def next_week(day = :monday)
# Returns a new ; DateTime objects will have time set to 0:00DateTime representing the start of the month (1st of the month; DateTime objects will have time set to 0:00)
def
beginning_of_month
self
.
acts_like?
(
:time
)
?
change
(
:day
=>
1
,
:hour
=>
0
,
:min
=>
0
,
:sec
=>
0
)
:
change
(
:day
=>
1
)
self
.
acts_like?
(
:time
)
?
change
(
:day
=>
1
,
:hour
=>
0
)
:
change
(
:day
=>
1
)
end
alias
:at_beginning_of_month
:beginning_of_month
...
...
@@ -231,13 +231,13 @@ def end_of_quarter
# Returns a new Date/DateTime representing the start of the year (1st of january; DateTime objects will have time set to 0:00)
def
beginning_of_year
self
.
acts_like?
(
:time
)
?
change
(
:month
=>
1
,
:day
=>
1
,
:hour
=>
0
,
:min
=>
0
,
:sec
=>
0
)
:
change
(
:month
=>
1
,
:day
=>
1
)
self
.
acts_like?
(
:time
)
?
change
(
:month
=>
1
,
:day
=>
1
,
:hour
=>
0
)
:
change
(
:month
=>
1
,
:day
=>
1
)
end
alias
:at_beginning_of_year
:beginning_of_year
# Returns a new Time representing the end of the year (31st of december; DateTime objects will have time set to 23:59:59)
def
end_of_year
self
.
acts_like?
(
:time
)
?
change
(
:month
=>
12
,
:day
=>
31
,
:hour
=>
23
,
:min
=>
59
,
:sec
=>
59
)
:
change
(
:month
=>
12
,
:day
=>
31
)
self
.
acts_like?
(
:time
)
?
change
(
:month
=>
12
,
:day
=>
31
,
:hour
=>
23
,
:min
=>
59
,
:sec
=>
59
)
:
change
(
:month
=>
12
,
:day
=>
31
)
end
alias
:at_end_of_year
:end_of_year
...
...
activesupport/lib/active_support/core_ext/time/calculations.rb
浏览文件 @
8cf4725f
...
...
@@ -187,7 +187,7 @@ def next_week(day = :monday)
# Returns a new Time representing the start of the day (0:00)
def
beginning_of_day
#(self - seconds_since_midnight).change(:usec => 0)
change
(
:hour
=>
0
,
:min
=>
0
,
:sec
=>
0
,
:usec
=>
0
)
change
(
:hour
=>
0
)
end
alias
:midnight
:beginning_of_day
alias
:at_midnight
:beginning_of_day
...
...
@@ -201,7 +201,7 @@ def end_of_day
# Returns a new Time representing the start of the month (1st of the month, 0:00)
def
beginning_of_month
#self - ((self.mday-1).days + self.seconds_since_midnight)
change
(
:day
=>
1
,
:hour
=>
0
,
:min
=>
0
,
:sec
=>
0
,
:usec
=>
0
)
change
(
:day
=>
1
,
:hour
=>
0
)
end
alias
:at_beginning_of_month
:beginning_of_month
...
...
@@ -227,7 +227,7 @@ def end_of_quarter
# Returns a new Time representing the start of the year (1st of january, 0:00)
def
beginning_of_year
change
(
:month
=>
1
,
:day
=>
1
,
:hour
=>
0
,
:min
=>
0
,
:sec
=>
0
,
:usec
=>
0
)
change
(
:month
=>
1
,
:day
=>
1
,
:hour
=>
0
)
end
alias
:at_beginning_of_year
:beginning_of_year
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录