From 63d8f56774dcb1ea601928c3eb6c119d359fae10 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 26 Nov 2008 14:41:20 +0100
Subject: Added app/[models|controllers|helpers] to the load path for plugins
 that has an app directory (go engines ;)) [DHH]

---
 railties/lib/rails/plugin.rb        | 25 ++++++++++++++++++++++---
 railties/lib/rails/plugin/loader.rb | 10 +++++++---
 2 files changed, 29 insertions(+), 6 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 4d983843af..3b9e7dec2d 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -28,13 +28,17 @@ module Rails
     end
     
     def valid?
-      File.directory?(directory) && (has_lib_directory? || has_init_file?)
+      File.directory?(directory) && (has_app_directory? || has_lib_directory? || has_init_file?)
     end
   
     # Returns a list of paths this plugin wishes to make available in <tt>$LOAD_PATH</tt>.
     def load_paths
       report_nonexistant_or_empty_plugin! unless valid?
-      has_lib_directory? ? [lib_path] : []
+      
+      returning [] do |load_paths|
+        load_paths << lib_path  if has_lib_directory?
+        load_paths << app_paths if has_app_directory?
+      end.flatten
     end
 
     # Evaluates a plugin's init.rb file.
@@ -68,7 +72,16 @@ module Rails
 
       def report_nonexistant_or_empty_plugin!
         raise LoadError, "Can not find the plugin named: #{name}"
-      end      
+      end
+
+      
+      def app_paths
+        [ 
+          File.join(directory, 'app', 'models'), 
+          File.join(directory, 'app', 'controllers'),
+          File.join(directory, 'app', 'helpers')
+        ]
+      end
     
       def lib_path
         File.join(directory, 'lib')
@@ -86,6 +99,11 @@ module Rails
         File.file?(gem_init_path) ? gem_init_path : classic_init_path
       end
 
+
+      def has_app_directory?
+        File.directory?(File.join(directory, 'app'))
+      end
+
       def has_lib_directory?
         File.directory?(lib_path)
       end
@@ -94,6 +112,7 @@ module Rails
         File.file?(init_path)
       end
 
+
       def evaluate_init_rb(initializer)
         if has_init_file?
           silence_warnings do
diff --git a/railties/lib/rails/plugin/loader.rb b/railties/lib/rails/plugin/loader.rb
index 948d497007..8d7eac53c5 100644
--- a/railties/lib/rails/plugin/loader.rb
+++ b/railties/lib/rails/plugin/loader.rb
@@ -33,6 +33,7 @@ module Rails
           plugin.load(initializer)
           register_plugin_as_loaded(plugin)
         end
+
         ensure_all_registered_plugins_are_loaded!
       end
       
@@ -45,12 +46,15 @@ module Rails
         plugins.each do |plugin|
           plugin.load_paths.each do |path|
             $LOAD_PATH.insert(application_lib_index + 1, path)
-            ActiveSupport::Dependencies.load_paths      << path
+
+            ActiveSupport::Dependencies.load_paths << path
+
             unless Rails.configuration.reload_plugins?
               ActiveSupport::Dependencies.load_once_paths << path
             end
           end
         end
+
         $LOAD_PATH.uniq!
       end      
       
@@ -59,9 +63,9 @@ module Rails
         # The locate_plugins method uses each class in config.plugin_locators to
         # find the set of all plugins available to this Rails application.
         def locate_plugins
-          configuration.plugin_locators.map { |locator|
+          configuration.plugin_locators.map do |locator|
             locator.new(initializer).plugins
-          }.flatten
+          end.flatten
           # TODO: sorting based on config.plugins
         end
 
-- 
cgit v1.2.3