Load plugin initializers from lib/rails/initializers/*.rb

1 files changed, 13 insertions, 6 deletions

diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 98f329cc17..5d6144959d 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -47,13 +47,20 @@ module Rails
     end
 
     initializer :load_init_rb, :before => :load_application_initializers do |app|
-      files = %w(rails/init.rb init.rb).map { |path| File.expand_path path, root }
-      if initrb = files.find { |path| File.file? path }
-        if initrb == files.first
-          ActiveSupport::Deprecation.warn "Use toplevel init.rb; rails/init.rb is deprecated: #{initrb}"
+      initializers = Dir["#{root}/lib/rails/initializers/*.rb"]
+
+      if initializers.any?
+        initializers.each do |initializer|
+          config = app.config
+          eval(File.read(initializer), binding, initializer)
+        end
+      else
+        files = %w(rails/init.rb init.rb).map { |path| File.expand_path path, root }
+        if initrb = files.find { |path| File.file? path }
+          ActiveSupport::Deprecation.warn "init.rb is deprecated: #{initrb}. Use lib/rails/initializers/#{name}.rb"
+          config = app.config
+          eval(File.read(initrb), binding, initrb)
         end
-        config = app.config
-        eval(File.read(initrb), binding, initrb)
       end
     end