Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
7cccfed5
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,发现更多精彩内容 >>
提交
7cccfed5
编写于
7月 18, 2010
作者:
P
Piotr Sarnacki
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow Engines loading its own environment file from config/environments
上级
15f95b98
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
50 addition
and
18 deletion
+50
-18
railties/lib/rails/application.rb
railties/lib/rails/application.rb
+0
-4
railties/lib/rails/application/bootstrap.rb
railties/lib/rails/application/bootstrap.rb
+2
-5
railties/lib/rails/application/configuration.rb
railties/lib/rails/application/configuration.rb
+0
-1
railties/lib/rails/engine.rb
railties/lib/rails/engine.rb
+9
-0
railties/lib/rails/engine/configuration.rb
railties/lib/rails/engine/configuration.rb
+1
-0
railties/test/application/loading_test.rb
railties/test/application/loading_test.rb
+17
-0
railties/test/railties/engine_test.rb
railties/test/railties/engine_test.rb
+21
-8
未找到文件。
railties/lib/rails/application.rb
浏览文件 @
7cccfed5
...
...
@@ -43,10 +43,6 @@ class Application < Engine
class
<<
self
private
:new
def
configure
(
&
block
)
class_eval
(
&
block
)
end
def
instance
if
self
==
Rails
::
Application
if
Rails
.
application
...
...
railties/lib/rails/application/bootstrap.rb
浏览文件 @
7cccfed5
...
...
@@ -6,10 +6,7 @@ class Application
module
Bootstrap
include
Initializable
initializer
:load_environment_config
do
environment
=
config
.
paths
.
config
.
environments
.
to_a
.
first
require
environment
if
environment
end
initializer
:load_environment_hook
do
end
initializer
:load_active_support
do
require
'active_support/dependencies'
...
...
@@ -73,4 +70,4 @@ module Bootstrap
end
end
end
end
\ No newline at end of file
end
railties/lib/rails/application/configuration.rb
浏览文件 @
7cccfed5
...
...
@@ -48,7 +48,6 @@ def paths
paths
.
app
.
controllers
<<
builtin_controller
if
builtin_controller
paths
.
config
.
database
"config/database.yml"
paths
.
config
.
environment
"config/environment.rb"
paths
.
config
.
environments
"config/environments"
,
:glob
=>
"
#{
Rails
.
env
}
.rb"
paths
.
lib
.
templates
"lib/templates"
paths
.
log
"log/
#{
Rails
.
env
}
.log"
paths
.
tmp
"tmp"
...
...
railties/lib/rails/engine.rb
浏览文件 @
7cccfed5
...
...
@@ -129,6 +129,10 @@ def endpoint(endpoint = nil)
@endpoint
end
def
configure
(
&
block
)
class_eval
(
&
block
)
end
protected
def
method_missing
(
*
args
,
&
block
)
...
...
@@ -249,6 +253,11 @@ def initializers
# consistently executed after all the initializers above across all engines.
end
initializer
:load_environment_config
,
:before
=>
:load_environment_hook
do
environment
=
config
.
paths
.
config
.
environments
.
to_a
.
first
require
environment
if
environment
end
protected
def
default_middleware_stack
ActionDispatch
::
MiddlewareStack
.
new
...
...
railties/lib/rails/engine/configuration.rb
浏览文件 @
7cccfed5
...
...
@@ -28,6 +28,7 @@ def paths
paths
.
config
.
initializers
"config/initializers"
,
:glob
=>
"**/*.rb"
paths
.
config
.
locales
"config/locales"
,
:glob
=>
"*.{rb,yml}"
paths
.
config
.
routes
"config/routes.rb"
paths
.
config
.
environments
"config/environments"
,
:glob
=>
"
#{
Rails
.
env
}
.rb"
paths
.
public
"public"
paths
.
public
.
javascripts
"public/javascripts"
paths
.
public
.
stylesheets
"public/stylesheets"
...
...
railties/test/application/loading_test.rb
浏览文件 @
7cccfed5
...
...
@@ -42,6 +42,23 @@ class User < ActiveRecord::Base
User
end
test
"load config/environments/environment before Bootstrap initializers"
do
app_file
"config/environments/development.rb"
,
<<-
RUBY
AppTemplate::Application.configure do
config.development_environment_loaded = true
end
RUBY
add_to_config
<<-
RUBY
config.before_initialize do
config.loaded = config.development_environment_loaded
end
RUBY
require
"
#{
app_path
}
/config/environment"
assert
::
AppTemplate
::
Application
.
config
.
loaded
end
def
test_descendants_are_cleaned_on_each_request_without_cache_classes
add_to_config
<<-
RUBY
config.cache_classes = false
...
...
railties/test/railties/engine_test.rb
浏览文件 @
7cccfed5
...
...
@@ -54,15 +54,9 @@ class Engine < ::Rails::Engine
initializers
=
Rails
.
application
.
initializers
.
tsort
index
=
initializers
.
index
{
|
i
|
i
.
name
==
"dummy_initializer"
}
selection
=
initializers
[(
index
-
3
)
..
(
index
)].
map
(
&
:name
).
map
(
&
:to_s
)
assert_equal
%w(
load_config_initializers
load_config_initializers
engines_blank_point
dummy_initializer
)
,
selection
assert
index
>
initializers
.
index
{
|
i
|
i
.
name
==
:load_config_initializers
}
assert
index
>
initializers
.
index
{
|
i
|
i
.
name
==
:engines_blank_point
}
assert
index
<
initializers
.
index
{
|
i
|
i
.
name
==
:build_middleware_stack
}
end
...
...
@@ -164,5 +158,24 @@ class Engine < ::Rails::Engine
assert
!
Bukkits
::
Engine
.
config
.
respond_to?
(
:engine_yaffle_loaded
)
assert
Rails
.
application
.
config
.
app_yaffle_loaded
end
test
"it loads its environment file"
do
@plugin
.
write
"lib/bukkits.rb"
,
<<-
RUBY
class Bukkits
class Engine < ::Rails::Engine
end
end
RUBY
@plugin
.
write
"config/environments/development.rb"
,
<<-
RUBY
Bukkits::Engine.configure do
config.environment_loaded = true
end
RUBY
boot_rails
assert
Bukkits
::
Engine
.
config
.
environment_loaded
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录