diff options
author | Piotr Sarnacki <drogus@gmail.com> | 2010-07-19 17:53:14 +0200 |
---|---|---|
committer | Piotr Sarnacki <drogus@gmail.com> | 2010-09-03 22:59:05 +0200 |
commit | 32a5b49911b88e8e410583d382e8253004abce50 (patch) | |
tree | 292bf3c88524241e8740b34a937937b08b3b00b0 /railties/lib/rails/railtie.rb | |
parent | 939d4255e690bd0406179cad00836975273fd49e (diff) | |
download | rails-32a5b49911b88e8e410583d382e8253004abce50.tar.gz rails-32a5b49911b88e8e410583d382e8253004abce50.tar.bz2 rails-32a5b49911b88e8e410583d382e8253004abce50.zip |
Move singleton pattern to Railtie and remove Engine::Configurable and Application::Configurable in favor of unified Railtie::Configurable
Diffstat (limited to 'railties/lib/rails/railtie.rb')
-rw-r--r-- | railties/lib/rails/railtie.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb index 7126ec1699..0514e425fd 100644 --- a/railties/lib/rails/railtie.rb +++ b/railties/lib/rails/railtie.rb @@ -130,13 +130,15 @@ module Rails ABSTRACT_RAILTIES = %w(Rails::Railtie Rails::Plugin Rails::Engine Rails::Application) class << self + private :new + def subclasses @subclasses ||= [] end def inherited(base) unless base.abstract_railtie? - base.send(:include, self::Configurable) + base.send(:include, Railtie::Configurable) subclasses << base end end @@ -164,6 +166,10 @@ module Rails end end + def config + @config ||= Railtie::Configuration.new + end + def eager_load! end |