Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
192e55c3
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,发现更多精彩内容 >>
提交
192e55c3
编写于
12月 16, 2011
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Do not raise an exception if an invalid route was generated automatically.
上级
53592626
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
13 addition
and
4 deletion
+13
-4
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+11
-3
actionpack/test/dispatch/routing_test.rb
actionpack/test/dispatch/routing_test.rb
+1
-0
activerecord/lib/active_record/relation/delegation.rb
activerecord/lib/active_record/relation/delegation.rb
+1
-1
未找到文件。
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
192e55c3
...
...
@@ -1286,7 +1286,7 @@ def add_route(action, options) # :nodoc:
action
=
nil
end
if
!
options
.
fetch
(
:as
)
{
true
}
if
!
options
.
fetch
(
:as
,
true
)
options
.
delete
(
:as
)
else
options
[
:as
]
=
name_for_action
(
options
[
:as
],
action
)
...
...
@@ -1472,8 +1472,16 @@ def name_for_action(as, action) #:nodoc:
[
name_prefix
,
member_name
,
prefix
]
end
candidate
=
name
.
select
(
&
:present?
).
join
(
"_"
).
presence
candidate
unless
as
.
nil?
&&
@set
.
routes
.
find
{
|
r
|
r
.
name
==
candidate
}
if
candidate
=
name
.
select
(
&
:present?
).
join
(
"_"
).
presence
# If a name was not explicitly given, we check if it is valid
# and return nil in case it isn't. Otherwise, we pass the invalid name
# forward so the underlying router engine treats it and raises an exception.
if
as
.
nil?
candidate
unless
@set
.
routes
.
find
{
|
r
|
r
.
name
==
candidate
}
||
candidate
!~
/\A[_a-z]/i
else
candidate
end
end
end
end
...
...
actionpack/test/dispatch/routing_test.rb
浏览文件 @
192e55c3
...
...
@@ -91,6 +91,7 @@ def self.call(params, request)
match
"/local/:action"
,
:controller
=>
"local"
match
"/projects/status(.:format)"
match
"/404"
,
:to
=>
lambda
{
|
env
|
[
404
,
{
"Content-Type"
=>
"text/plain"
},
[
"NOT FOUND"
]]
}
constraints
(
:ip
=>
/192\.168\.1\.\d\d\d/
)
do
get
'admin'
=>
"queenbee#index"
...
...
activerecord/lib/active_record/relation/delegation.rb
浏览文件 @
192e55c3
...
...
@@ -8,7 +8,7 @@ module Delegation
:connection
,
:columns_hash
,
:auto_explain_threshold_in_seconds
,
:to
=>
:klass
def
self
.
delegate_to_scoped_klass
(
method
)
if
method
.
to_s
=~
/
[a-z]\w*!?
/
if
method
.
to_s
=~
/
\A[a-zA-Z_]\w*[!?]?\z
/
module_eval
<<-
RUBY
,
__FILE__
,
__LINE__
+
1
def
#{
method
}
(*args, &block)
scoping { @klass.
#{
method
}
(*args, &block) }
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录