From 675f3ead4193529de225cbb15dad3f9ed418f456 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 23 Jun 2010 23:02:02 +0200 Subject: Gather initializers from railties in engines to get rid of additional looping through initializers --- railties/lib/rails/application/railties.rb | 10 ---------- railties/lib/rails/engine.rb | 7 +++++++ 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'railties') diff --git a/railties/lib/rails/application/railties.rb b/railties/lib/rails/application/railties.rb index 2b3783e998..67352f537e 100644 --- a/railties/lib/rails/application/railties.rb +++ b/railties/lib/rails/application/railties.rb @@ -16,16 +16,6 @@ module Rails def engines @engines ||= ::Rails::Engine.subclasses.map(&:instance) end - - def plugins - @plugins ||= super + plugins_for_engines - end - - def plugins_for_engines - engines.map { |e| - e.railties.plugins - }.flatten - end end end end diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 385e3439f1..12ca553a24 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -158,6 +158,13 @@ module Rails app.call(env) end + def initializers + initializers = [] + railties.all { |r| initializers += r.initializers } + initializers += super + initializers + end + # Add configured load paths to ruby load paths and remove duplicates. initializer :set_load_path, :before => :bootstrap_hook do _all_load_paths.reverse_each do |path| -- cgit v1.2.3