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/application | |
| 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/application')
| -rw-r--r-- | railties/lib/rails/application/configurable.rb | 19 | ||||
| -rw-r--r-- | railties/lib/rails/application/railties.rb | 2 |
2 files changed, 1 insertions, 20 deletions
diff --git a/railties/lib/rails/application/configurable.rb b/railties/lib/rails/application/configurable.rb deleted file mode 100644 index f598e33965..0000000000 --- a/railties/lib/rails/application/configurable.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Rails - class Application - module Configurable - def self.included(base) - base.extend ClassMethods - end - - module ClassMethods - def inherited(base) - raise "You cannot inherit from a Rails::Application child" - end - end - - def config - @config ||= Application::Configuration.new(self.class.find_root_with_flag("config.ru", Dir.pwd)) - end - end - end -end
\ No newline at end of file diff --git a/railties/lib/rails/application/railties.rb b/railties/lib/rails/application/railties.rb index 67352f537e..c1d2de571f 100644 --- a/railties/lib/rails/application/railties.rb +++ b/railties/lib/rails/application/railties.rb @@ -10,7 +10,7 @@ module Rails end def railties - @railties ||= ::Rails::Railtie.subclasses.map(&:new) + @railties ||= ::Rails::Railtie.subclasses.map(&:instance) end def engines |