Browse files

Cherry-picking patch for rails#1460

from 3-1-stable to master

[3.1.0.rc1] Plugins inside engines not eager-loaded properly and their
rake tasks ignored

Working with the new support for plugins inside engines in Rails 3.1,
I found that certain things that work for regular plugins don't work
for these new nested plugins. In particular, these methods in
Rails::Engine don't seem to understand that an engine could have
nested plugins:

#load_tasks
#load_generators
#load_console
#eager_load!

A solution which worked out for me is to move the calls to
railties.all { ... } from the overriding methods in Rails::Application
into Rails::Engine.
  • Loading branch information...
1 parent 3625391 commit 245dba0c8941463e4b07733443bb0e161889b153 @jhtwong jhtwong committed Jun 16, 2011
Showing with 10 additions and 8 deletions.
  1. +0 −6 railties/lib/rails/application.rb
  2. +10 −2 railties/lib/rails/engine.rb
View
6 railties/lib/rails/application.rb
@@ -78,10 +78,6 @@ def require_environment! #:nodoc:
require environment if environment
end
- def eager_load! #:nodoc:
- railties.all(&:eager_load!)
- super
- end
def reload_routes!
routes_reloader.reload!
@@ -100,14 +96,12 @@ def initialize!
def load_tasks(app=self)
initialize_tasks
- railties.all { |r| r.load_tasks(app) }
super
self
end
def load_console(app=self)
initialize_console
- railties.all { |r| r.load_console(app) }
super
self
end
View
12 railties/lib/rails/engine.rb
@@ -395,12 +395,20 @@ def find(path)
delegate :middleware, :root, :paths, :to => :config
delegate :engine_name, :isolated?, :to => "self.class"
- def load_tasks(*)
+ def load_tasks(app=self)
+ railties.all { |r| r.load_tasks(app) }
super
paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
end
-
+
+ def load_console(app=self)
+ railties.all { |r| r.load_console(app) }
+ super
+ end
+
def eager_load!
+ railties.all(&:eager_load!)
+
config.eager_load_paths.each do |load_path|
matcher = /\A#{Regexp.escape(load_path)}\/(.*)\.rb\Z/
Dir.glob("#{load_path}/**/*.rb").sort.each do |file|

0 comments on commit 245dba0

Please sign in to comment.