Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
eae65ac2
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,发现更多精彩内容 >>
未验证
提交
eae65ac2
编写于
11月 09, 2017
作者:
A
Andrew White
提交者:
GitHub
11月 09, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #31081 from rails/allow-include-time-with-zone-range
Allow `Range#include?` on TWZ ranges
上级
518959d0
2b434d6f
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
46 addition
and
4 deletion
+46
-4
activesupport/CHANGELOG.md
activesupport/CHANGELOG.md
+13
-0
activesupport/lib/active_support/core_ext/range.rb
activesupport/lib/active_support/core_ext/range.rb
+1
-0
activesupport/lib/active_support/core_ext/range/each.rb
activesupport/lib/active_support/core_ext/range/each.rb
+3
-1
activesupport/lib/active_support/core_ext/range/include_time_with_zone.rb
...b/active_support/core_ext/range/include_time_with_zone.rb
+23
-0
activesupport/test/core_ext/range_ext_test.rb
activesupport/test/core_ext/range_ext_test.rb
+6
-3
未找到文件。
activesupport/CHANGELOG.md
浏览文件 @
eae65ac2
*
Allow
`Range#include?`
on TWZ ranges
In #11474 we prevented TWZ ranges being iterated over which matched
Ruby's handling of Time ranges and as a consequence `include?`
stopped working with both Time ranges and TWZ ranges. However in
ruby/ruby@b061634 support was added for `include?` to use `cover?`
for 'linear' objects. Since we have no way of making Ruby consider
TWZ instances as 'linear' we have to override `Range#include?`.
Fixes #30799.
*Andrew White*
*
Fix acronym support in
`humanize`
Acronym inflections are stored with lowercase keys in the hash but
...
...
activesupport/lib/active_support/core_ext/range.rb
浏览文件 @
eae65ac2
...
...
@@ -2,5 +2,6 @@
require
"active_support/core_ext/range/conversions"
require
"active_support/core_ext/range/include_range"
require
"active_support/core_ext/range/include_time_with_zone"
require
"active_support/core_ext/range/overlaps"
require
"active_support/core_ext/range/each"
activesupport/lib/active_support/core_ext/range/each.rb
浏览文件 @
eae65ac2
# frozen_string_literal: true
require
"active_support/time_with_zone"
module
ActiveSupport
module
EachTimeWithZone
#:nodoc:
def
each
(
&
block
)
...
...
@@ -15,7 +17,7 @@ def step(n = 1, &block)
private
def
ensure_iteration_allowed
raise
TypeError
,
"can't iterate from
#{
first
.
class
}
"
if
first
.
is_a?
(
Time
)
raise
TypeError
,
"can't iterate from
#{
first
.
class
}
"
if
first
.
is_a?
(
Time
WithZone
)
end
end
end
...
...
activesupport/lib/active_support/core_ext/range/include_time_with_zone.rb
0 → 100644
浏览文件 @
eae65ac2
# frozen_string_literal: true
require
"active_support/time_with_zone"
module
ActiveSupport
module
IncludeTimeWithZone
#:nodoc:
# Extends the default Range#include? to support ActiveSupport::TimeWithZone.
#
# (1.hour.ago..1.hour.from_now).include?(Time.current) # => true
#
def
include?
(
value
)
if
first
.
is_a?
(
TimeWithZone
)
cover?
(
value
)
elsif
last
.
is_a?
(
TimeWithZone
)
cover?
(
value
)
else
super
end
end
end
end
Range
.
prepend
(
ActiveSupport
::
IncludeTimeWithZone
)
activesupport/test/core_ext/range_ext_test.rb
浏览文件 @
eae65ac2
...
...
@@ -121,9 +121,12 @@ def test_step_on_time_with_zone
def
test_include_on_time_with_zone
twz
=
ActiveSupport
::
TimeWithZone
.
new
(
nil
,
ActiveSupport
::
TimeZone
[
"Eastern Time (US & Canada)"
]
,
Time
.
utc
(
2006
,
11
,
28
,
10
,
30
))
assert_raises
TypeError
do
((
twz
-
1
.
hour
)
..
twz
).
include?
(
twz
)
end
assert
((
twz
-
1
.
hour
)
..
twz
).
include?
(
twz
)
end
def
test_case_equals_on_time_with_zone
twz
=
ActiveSupport
::
TimeWithZone
.
new
(
nil
,
ActiveSupport
::
TimeZone
[
"Eastern Time (US & Canada)"
]
,
Time
.
utc
(
2006
,
11
,
28
,
10
,
30
))
assert
((
twz
-
1
.
hour
)
..
twz
)
===
twz
end
def
test_date_time_with_each
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录