diff options
| author | Carl Lerche <carllerche@mac.com> | 2009-12-15 22:07:12 -0800 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-12-15 22:13:52 -0800 |
| commit | 1b27f5c4f72384081083fa025b6b10e5ab02ae5e (patch) | |
| tree | 43bbf10ed39c70f7937709de8b0805002f93eca5 /railties/lib/rails/application.rb | |
| parent | f0bbc647c2086e9536c9d2b4ea7c4c18fe2edd3e (diff) | |
| download | rails-1b27f5c4f72384081083fa025b6b10e5ab02ae5e.tar.gz rails-1b27f5c4f72384081083fa025b6b10e5ab02ae5e.tar.bz2 rails-1b27f5c4f72384081083fa025b6b10e5ab02ae5e.zip | |
Add the ability for plugins to set default configuration settings.
Diffstat (limited to 'railties/lib/rails/application.rb')
| -rw-r--r-- | railties/lib/rails/application.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index bc74ac8646..9e57354047 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -13,7 +13,11 @@ module Rails end def config - @config ||= Configuration.new + @config ||= begin + config = Configuration.new + Plugin.plugins.each { |p| config.merge(p.config) } + config + end end # TODO: change the plugin loader to use config @@ -104,6 +108,8 @@ module Rails def plugins @plugins ||= begin + plugin_names = config.plugins || [:all] + Plugin.plugins.select { |p| plugin_names.include?(p.plugin_name) } + Plugin::Vendored.all(config.plugins || [:all], config.paths.vendor.plugins) end end |