Merge pull request #1460 from SAP-Oxygen/27d7083addd1bc8ecf0ef258a50c…

…5e36eb980060 [3.1.0.rc1] Plugins inside engines not eager-loaded properly and their rake tasks ignored
rails · Jun 16, 2011 · 60a3190 · 60a3190
2 parents 014008d + 27d7083
commit 60a3190
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/railties/lib/rails/application.rb b/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,22 +96,18 @@ def initialize!
 
     def load_tasks(app=self)
       initialize_tasks
-      railties.all { |r| r.load_tasks(app) }
       super
       self
     end
 
     def load_generators(app=self)
       initialize_generators
-      railties.all { |r| r.load_generators(app) }
-
       super
       self
     end
 
     def load_console(app=self)
       initialize_console
-      railties.all { |r| r.load_console(app) }
       super
       self
     end

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
@@ -387,12 +387,25 @@ 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_generators(app=self)
+      railties.all { |r| r.load_generators(app) }
+      super
+    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|