Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
45e8cf59
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,发现更多精彩内容 >>
提交
45e8cf59
编写于
3月 23, 2010
作者:
W
wycats
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
init.rb in plugins is here to stay
上级
b92963f9
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
22 addition
and
54 deletion
+22
-54
railties/lib/rails/engine.rb
railties/lib/rails/engine.rb
+0
-7
railties/lib/rails/engine/configuration.rb
railties/lib/rails/engine/configuration.rb
+17
-19
railties/lib/rails/plugin.rb
railties/lib/rails/plugin.rb
+5
-5
railties/test/railties/plugin_test.rb
railties/test/railties/plugin_test.rb
+0
-13
railties/test/railties/shared_tests.rb
railties/test/railties/shared_tests.rb
+0
-10
未找到文件。
railties/lib/rails/engine.rb
浏览文件 @
45e8cf59
...
...
@@ -109,13 +109,6 @@ def load_tasks
config
.
generators
.
templates
.
unshift
(
*
paths
.
lib
.
templates
.
to_a
)
end
initializer
:load_lib_initializers
do
|
app
|
paths
.
lib
.
rails
.
initializers
.
to_a
.
sort
.
each
do
|
initializer
|
config
=
app
.
config
eval
(
File
.
read
(
initializer
),
binding
,
initializer
)
end
end
initializer
:load_application_initializers
do
paths
.
config
.
initializers
.
to_a
.
sort
.
each
do
|
initializer
|
load
(
initializer
)
...
...
railties/lib/rails/engine/configuration.rb
浏览文件 @
45e8cf59
...
...
@@ -14,25 +14,23 @@ def initialize(root=nil)
def
paths
@paths
||=
begin
paths
=
Rails
::
Paths
::
Root
.
new
(
@root
)
paths
.
app
"app"
,
:eager_load
=>
true
,
:glob
=>
"*"
paths
.
app
.
controllers
"app/controllers"
,
:eager_load
=>
true
paths
.
app
.
helpers
"app/helpers"
,
:eager_load
=>
true
paths
.
app
.
models
"app/models"
,
:eager_load
=>
true
paths
.
app
.
mailers
"app/mailers"
,
:eager_load
=>
true
paths
.
app
.
metals
"app/metal"
,
:eager_load
=>
true
paths
.
app
.
views
"app/views"
,
:eager_load
=>
true
paths
.
lib
"lib"
,
:load_path
=>
true
paths
.
lib
.
rails
"lib/rails"
,
:glob
=>
"**/*.rake"
paths
.
lib
.
rails
.
initializers
"lib/rails/initializers"
,
:glob
=>
"**/*.rb"
paths
.
lib
.
tasks
"lib/tasks"
,
:glob
=>
"**/*.rake"
paths
.
lib
.
templates
"lib/templates"
paths
.
config
"config"
paths
.
config
.
initializers
"config/initializers"
,
:glob
=>
"**/*.rb"
paths
.
config
.
locales
"config/locales"
,
:glob
=>
"*.{rb,yml}"
paths
.
config
.
routes
"config/routes.rb"
paths
.
public
"public"
paths
.
public
.
javascripts
"public/javascripts"
paths
.
public
.
stylesheets
"public/stylesheets"
paths
.
app
"app"
,
:eager_load
=>
true
,
:glob
=>
"*"
paths
.
app
.
controllers
"app/controllers"
,
:eager_load
=>
true
paths
.
app
.
helpers
"app/helpers"
,
:eager_load
=>
true
paths
.
app
.
models
"app/models"
,
:eager_load
=>
true
paths
.
app
.
mailers
"app/mailers"
,
:eager_load
=>
true
paths
.
app
.
metals
"app/metal"
,
:eager_load
=>
true
paths
.
app
.
views
"app/views"
,
:eager_load
=>
true
paths
.
lib
"lib"
,
:load_path
=>
true
paths
.
lib
.
tasks
"lib/tasks"
,
:glob
=>
"**/*.rake"
paths
.
lib
.
templates
"lib/templates"
paths
.
config
"config"
paths
.
config
.
initializers
"config/initializers"
,
:glob
=>
"**/*.rb"
paths
.
config
.
locales
"config/locales"
,
:glob
=>
"*.{rb,yml}"
paths
.
config
.
routes
"config/routes.rb"
paths
.
public
"public"
paths
.
public
.
javascripts
"public/javascripts"
paths
.
public
.
stylesheets
"public/stylesheets"
paths
end
end
...
...
railties/lib/rails/plugin.rb
浏览文件 @
45e8cf59
...
...
@@ -47,11 +47,11 @@ def config
end
initializer
:load_init_rb
,
:before
=>
:load_application_initializers
do
|
app
|
lib_initializers
=
paths
.
lib
.
rails
.
initializers
.
to_a
files
=
%w(rails/init.rb init.rb)
.
map
{
|
path
|
File
.
expand_path
(
path
,
root
)
}
if
lib_initializers
.
empty?
&&
initrb
=
files
.
find
{
|
path
|
File
.
file?
(
path
)
}
ActiveSupport
::
Deprecation
.
warn
"init.rb is deprecated:
#{
initrb
}
. Use lib/rails/initializers/
#{
name
}
.rb"
files
=
%w(rails/init.rb init.rb)
.
map
{
|
path
|
File
.
expand_path
path
,
root
}
if
initrb
=
files
.
find
{
|
path
|
File
.
file?
path
}
if
initrb
==
files
.
first
ActiveSupport
::
Deprecation
.
warn
"Use toplevel init.rb; rails/init.rb is deprecated:
#{
initrb
}
"
end
config
=
app
.
config
eval
(
File
.
read
(
initrb
),
binding
,
initrb
)
end
...
...
railties/test/railties/plugin_test.rb
浏览文件 @
45e8cf59
...
...
@@ -94,19 +94,6 @@ class Engine < Rails::Engine
assert
rescued
,
"Expected boot rails to fail"
end
test
"skips init.rb if initializer is present"
do
@plugin
.
write
"lib/rails/initializers/foo.rb"
,
<<-
RUBY
$loaded = true
RUBY
@plugin
.
write
"init.rb"
,
<<-
RUBY
raise "b00m"
RUBY
boot_rails
assert
$loaded
end
test
"loads deprecated rails/init.rb"
do
@plugin
.
write
"rails/init.rb"
,
<<-
RUBY
$loaded = true
...
...
railties/test/railties/shared_tests.rb
浏览文件 @
45e8cf59
...
...
@@ -297,16 +297,6 @@ def test_plugin_initializers
assert
$plugin_initializer
end
def
test_rails_plugin_initializers
$plugin_initializer
=
false
@plugin
.
write
"lib/rails/initializers/foo.rb"
,
<<-
RUBY
$plugin_initializer = true
RUBY
boot_rails
assert
$plugin_initializer
end
def
test_plugin_midleware_referenced_in_configuration
@plugin
.
write
"lib/bukkits.rb"
,
<<-
RUBY
class Bukkits
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录