Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
1b975e6a
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,发现更多精彩内容 >>
未验证
提交
1b975e6a
编写于
6月 19, 2016
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove deprecated support to passing strings to the middleware stack
上级
fda5afeb
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
60 deletion
+8
-60
actionpack/CHANGELOG.md
actionpack/CHANGELOG.md
+4
-0
actionpack/lib/action_controller/metal.rb
actionpack/lib/action_controller/metal.rb
+1
-1
actionpack/lib/action_dispatch/middleware/stack.rb
actionpack/lib/action_dispatch/middleware/stack.rb
+1
-20
actionpack/test/dispatch/middleware_stack_test.rb
actionpack/test/dispatch/middleware_stack_test.rb
+2
-39
未找到文件。
actionpack/CHANGELOG.md
浏览文件 @
1b975e6a
*
Remove deprecated support to passing strings or symbols to the middleware stack.
*Rafael Mendonça França*
*
Change HSTS subdomain to true.
*Rafael Mendonça França*
...
...
actionpack/lib/action_controller/metal.rb
浏览文件 @
1b975e6a
...
...
@@ -55,7 +55,7 @@ def build_middleware(klass, args, block)
list
=
except
end
Middleware
.
new
(
get_class
(
klass
)
,
args
,
list
,
strategy
,
block
)
Middleware
.
new
(
klass
,
args
,
list
,
strategy
,
block
)
end
end
...
...
actionpack/lib/action_dispatch/middleware/stack.rb
浏览文件 @
1b975e6a
...
...
@@ -88,7 +88,6 @@ def swap(target, *args, &block)
end
def
delete
(
target
)
target
=
get_class
target
middlewares
.
delete_if
{
|
m
|
m
.
klass
==
target
}
end
...
...
@@ -103,31 +102,13 @@ def build(app = Proc.new)
private
def
assert_index
(
index
,
where
)
index
=
get_class
index
i
=
index
.
is_a?
(
Integer
)
?
index
:
middlewares
.
index
{
|
m
|
m
.
klass
==
index
}
raise
"No such middleware to insert
#{
where
}
:
#{
index
.
inspect
}
"
unless
i
i
end
def
get_class
(
klass
)
if
klass
.
is_a?
(
String
)
||
klass
.
is_a?
(
Symbol
)
classcache
=
ActiveSupport
::
Dependencies
::
Reference
converted_klass
=
classcache
[
klass
.
to_s
]
ActiveSupport
::
Deprecation
.
warn
<<-
eowarn
Passing strings or symbols to the middleware builder is deprecated, please change
them to actual class references. For example:
"
#{
klass
}
" =>
#{
converted_klass
}
eowarn
converted_klass
else
klass
end
end
def
build_middleware
(
klass
,
args
,
block
)
Middleware
.
new
(
get_class
(
klass
)
,
args
,
block
)
Middleware
.
new
(
klass
,
args
,
block
)
end
end
end
actionpack/test/dispatch/middleware_stack_test.rb
浏览文件 @
1b975e6a
...
...
@@ -18,14 +18,6 @@ def setup
@stack
.
use
BarMiddleware
end
def
test_delete_with_string_is_deprecated
assert_deprecated
do
assert_difference
"@stack.size"
,
-
1
do
@stack
.
delete
FooMiddleware
.
name
end
end
end
def
test_delete_works
assert_difference
"@stack.size"
,
-
1
do
@stack
.
delete
FooMiddleware
...
...
@@ -39,24 +31,6 @@ def test_delete_works
assert_equal
BazMiddleware
,
@stack
.
last
.
klass
end
test
"use should push middleware as a string onto the stack"
do
assert_deprecated
do
assert_difference
"@stack.size"
do
@stack
.
use
"MiddlewareStackTest::BazMiddleware"
end
assert_equal
BazMiddleware
,
@stack
.
last
.
klass
end
end
test
"use should push middleware as a symbol onto the stack"
do
assert_deprecated
do
assert_difference
"@stack.size"
do
@stack
.
use
:"MiddlewareStackTest::BazMiddleware"
end
assert_equal
BazMiddleware
,
@stack
.
last
.
klass
end
end
test
"use should push middleware class with arguments onto the stack"
do
assert_difference
"@stack.size"
do
@stack
.
use
BazMiddleware
,
true
,
foo:
"bar"
...
...
@@ -107,10 +81,8 @@ def test_delete_works
end
test
"unshift adds a new middleware at the beginning of the stack"
do
assert_deprecated
do
@stack
.
unshift
:"MiddlewareStackTest::BazMiddleware"
assert_equal
BazMiddleware
,
@stack
.
first
.
klass
end
@stack
.
unshift
MiddlewareStackTest
::
BazMiddleware
assert_equal
BazMiddleware
,
@stack
.
first
.
klass
end
test
"raise an error on invalid index"
do
...
...
@@ -123,15 +95,6 @@ def test_delete_works
end
end
test
"lazy evaluates middleware class"
do
assert_deprecated
do
assert_difference
"@stack.size"
do
@stack
.
use
"MiddlewareStackTest::BazMiddleware"
end
assert_equal
BazMiddleware
,
@stack
.
last
.
klass
end
end
test
"can check if Middleware are equal - Class"
do
assert_equal
@stack
.
last
,
BarMiddleware
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录