Added the :all option to config.plugins thatll include the rest of the plugins not already explicitly named (closes #9613) [fcheung]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7531 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 33 insertions, 7 deletions

diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 4339c4b996..111b5237ba 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -177,6 +177,9 @@ module Rails
     # If an array of plugin names is specified in config.plugins, only those plugins will be loaded
     # and they plugins will be loaded in that order. Otherwise, plugins are loaded in alphabetical
     # order.
+    #
+    # if config.plugins ends contains :all then the named plugins will be loaded in the given order and all other
+    # plugins will be loaded in alphabetical order
     def load_plugins
       configuration.plugin_locators.each do |locator|
         locator.new(self).each do |plugin|
@@ -339,8 +342,8 @@ module Rails
     private
       def ensure_all_registered_plugins_are_loaded!
         unless configuration.plugins.nil?
-          unless loaded_plugins == configuration.plugins
-            missing_plugins = configuration.plugins - loaded_plugins
+          if configuration.plugins.detect {|plugin| plugin != :all && !loaded_plugins.include?( plugin)}
+            missing_plugins = configuration.plugins - (loaded_plugins + [:all])
             raise LoadError, "Could not locate the following plugins: #{missing_plugins.to_sentence}"
           end
         end
diff --git a/railties/lib/rails/plugin/loader.rb b/railties/lib/rails/plugin/loader.rb
index d5ad3aa8e3..e935f9b34b 100644
--- a/railties/lib/rails/plugin/loader.rb
+++ b/railties/lib/rails/plugin/loader.rb
@@ -36,8 +36,16 @@ module Rails
       def enabled?
         !explicit_plugin_loading_order? || registered?
       end
-        
+      
+      def explicitly_enabled?
+        !explicit_plugin_loading_order? || explicitly_registered?
+      end
+      
       def registered?
+        explicit_plugin_loading_order? && registered_plugins_names_plugin?(name)
+      end
+
+      def explicitly_registered?
         explicit_plugin_loading_order? && registered_plugins.include?(name)
       end
       
@@ -54,6 +62,10 @@ module Rails
           config.plugins
         end
         
+        def registered_plugins_names_plugin?(plugin_name)
+          registered_plugins.include?(plugin_name) || registered_plugins.include?(:all)
+        end
+        
         def explicit_plugin_loading_order?
           !registered_plugins.nil?
         end
@@ -104,20 +116,31 @@ module Rails
   
         # Evaluate in init.rb
         def evaluate
-          silence_warnings { eval(IO.read(init_path), binding, init_path)} if has_init_file?
+          silence_warnings { eval(IO.read(init_path), binding, init_path) } if has_init_file?
         end
       
         def <=>(other_plugin_loader)
           if explicit_plugin_loading_order?
-            if non_existent_plugin = [self, other_plugin_loader].detect {|plugin| !registered_plugins.include?(plugin.name)}
+            if non_existent_plugin = [self, other_plugin_loader].detect { |plugin| !registered_plugins_names_plugin?(plugin.name) }
               plugin_does_not_exist!(non_existent_plugin.name)
             end
             
-            registered_plugins.index(name) <=> registered_plugins.index(other_plugin_loader.name)
+            if !explicitly_enabled? && !other_plugin_loader.explicitly_enabled?
+              name <=> other_plugin_loader.name
+            elsif registered_plugins.include?(:all) && (!explicitly_enabled? || !other_plugin_loader.explicitly_enabled?)
+              effective_index = explicitly_enabled? ? registered_plugins.index(name) : registered_plugins.index(:all)
+              other_effective_index = other_plugin_loader.explicitly_enabled? ? 
+                registered_plugins.index(other_plugin_loader.name) : registered_plugins.index(:all)
+
+              effective_index <=> other_effective_index
+            else
+              registered_plugins.index(name) <=> registered_plugins.index(other_plugin_loader.name)
+            end
+            
           else
             name <=> other_plugin_loader.name
           end
         end
     end
   end
-end
+end
\ No newline at end of file