From 4999d52e08a02ebba344f6c318f0af4b5b18f0e5 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 26 Nov 2008 20:03:25 +0100
Subject: Added that config/routes.rb files in engine plugins are automatically
 loaded (and reloaded when they change in dev mode) [DHH]

---
 railties/lib/initializer.rb         |  9 +++++++--
 railties/lib/rails/plugin.rb        | 23 +++++++++++++++++++++--
 railties/lib/rails/plugin/loader.rb | 17 ++++++++++++++++-
 3 files changed, 44 insertions(+), 5 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 038288dc88..b0abf3379c 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -486,8 +486,13 @@ Run `rake gems:install` to install the missing gems.
     # loading module used to lazily load controllers (Configuration#controller_paths).
     def initialize_routing
       return unless configuration.frameworks.include?(:action_controller)
-      ActionController::Routing.controller_paths = configuration.controller_paths
-      ActionController::Routing::Routes.configuration_file = configuration.routes_configuration_file
+
+      ActionController::Routing.controller_paths = configuration.controller_paths + plugin_loader.controller_paths
+
+      ([ configuration.routes_configuration_file ] + plugin_loader.routing_files).each do |routing_file|
+        ActionController::Routing::Routes.add_configuration_file(routing_file)
+      end
+
       ActionController::Routing::Routes.reload
     end
 
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 3b9e7dec2d..2b1e877e2b 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -40,7 +40,7 @@ module Rails
         load_paths << app_paths if has_app_directory?
       end.flatten
     end
-
+    
     # Evaluates a plugin's init.rb file.
     def load(initializer)
       return if loaded?
@@ -60,7 +60,26 @@ module Rails
     def about
       @about ||= load_about_information
     end
+
+    # Engines are plugins with an app/ directory.
+    def engine?
+      has_app_directory?
+    end
     
+    # Returns true if the engine ships with a routing file
+    def routed?
+      File.exist?(routing_file)
+    end
+
+    def controller_path
+      File.join(directory, 'app', 'controllers')
+    end
+
+    def routing_file
+      File.join(directory, 'config', 'routes.rb')
+    end
+    
+
     private
       def load_about_information
         about_yml_path = File.join(@directory, "about.yml")
@@ -82,7 +101,7 @@ module Rails
           File.join(directory, 'app', 'helpers')
         ]
       end
-    
+      
       def lib_path
         File.join(directory, 'lib')
       end
diff --git a/railties/lib/rails/plugin/loader.rb b/railties/lib/rails/plugin/loader.rb
index 8d7eac53c5..ba3f67d1d0 100644
--- a/railties/lib/rails/plugin/loader.rb
+++ b/railties/lib/rails/plugin/loader.rb
@@ -22,6 +22,11 @@ module Rails
         @plugins ||= all_plugins.select { |plugin| should_load?(plugin) }.sort { |p1, p2| order_plugins(p1, p2) }
       end
 
+      # Returns the plugins that are in engine-form (have an app/ directory)
+      def engines
+        @engines ||= plugins.select(&:engine?)
+      end
+
       # Returns all the plugins that could be found by the current locators.
       def all_plugins
         @all_plugins ||= locate_plugins
@@ -56,7 +61,17 @@ module Rails
         end
 
         $LOAD_PATH.uniq!
-      end      
+      end
+      
+      # Returns an array of all the controller paths found inside engine-type plugins.
+      def controller_paths
+        engines.collect(&:controller_path)
+      end
+      
+      def routing_files
+        engines.select(&:routed?).collect(&:routing_file)
+      end
+      
       
       protected
       
-- 
cgit v1.2.3