Changeset 7531

Timestamp:

09/21/07 22:31:19 (1 year ago)

Author:

david

Message:

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

Files:

• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/environments/environment.rb (modified) (1 diff)
• trunk/railties/lib/initializer.rb (modified) (2 diffs)
• trunk/railties/lib/rails/plugin/loader.rb (modified) (3 diffs)
• trunk/railties/test/plugin_loader_test.rb (modified) (1 diff)
• trunk/railties/test/plugin_locator_test.rb (modified) (1 diff)

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added the :all option to config.plugins that'll include the rest of the plugins not already explicitly named #9613 [fcheung]. Example:
+
+    # Loads :classic_pagination before all the other plugins
+    config.plugins = [ :classic_pagination, :all ]
+
+* Removed deprecated task names, like clear_logs, in favor of the new namespaced style [DHH]
-
-* Support multiple config.after_initialize blocks so plugins and apps can more easily cooperate.  #9582 [zdennis]

trunk/railties/environments/environment.rb

@@ -17 +17 @@
-  # config.frameworks -= [ :active_resource, :action_mailer ]
-
-
-
+
+
+
-
-  # Add additional load paths for your own custom dirs

trunk/railties/lib/initializer.rb

@@ -178 +178 @@
-    # 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|
@@ -340 +343 @@
-      def ensure_all_registered_plugins_are_loaded!
-        unless configuration.plugins.nil?
-unless loaded_plugins == configuration.plugins
-loaded_plugins
+if configuration.plugins.detect {|plugin| plugin != :all && !loaded_plugins.include?( plugin)}
+(loaded_plugins + [:all])
-            raise LoadError, "Could not locate the following plugins: #{missing_plugins.to_sentence}"
-          end

trunk/railties/lib/rails/plugin/loader.rb

@@ -37 +37 @@
-        !explicit_plugin_loading_order? || 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
@@ -53 +61 @@
-        def registered_plugins
-          config.plugins
+        end
+        
+        def registered_plugins_names_plugin?(plugin_name)
+          registered_plugins.include?(plugin_name) || registered_plugins.include?(:all)
-        end
-        
@@ -105 +117 @@
-        # Evaluate in init.rb
-        def evaluate
-
+ 
-        end
-      
-        def <=>(other_plugin_loader)
-          if explicit_plugin_loading_order?
-|plugin| !registered_plugins.include?(plugin.name)
+ |plugin| !registered_plugins_names_plugin?(plugin.name) 
-              plugin_does_not_exist!(non_existent_plugin.name)
-            end
-            
-
+
+
+
+
+
+
+
+
+
+
+
+
-          else
-            name <=> other_plugin_loader.name

trunk/railties/test/plugin_loader_test.rb

@@ -13 +13 @@
-    only_load_the_following_plugins! %w(stubby acts_as_chunky_bacon)
-    assert loader.send(:explicit_plugin_loading_order?)
+  end
+  
+  def test_enabled_if_not_named_explicitly
+    stubby_loader = loader_for(@valid_plugin_path)
+    acts_as_loader = loader_for('acts_as/acts_as_chunky_bacon')
+    
+    only_load_the_following_plugins! ['stubby', :all]
+    assert stubby_loader.send(:enabled?)
+    assert acts_as_loader.send(:enabled?)
+    
+    assert stubby_loader.send(:explicitly_enabled?)
+    assert !acts_as_loader.send(:explicitly_enabled?)
-  end
-  

trunk/railties/test/plugin_locator_test.rb

@@ -27 +27 @@
-  end
-  
+  def test_all_plugins_loaded_when_all_is_used
+    plugin_names = ['stubby', 'acts_as_chunky_bacon', :all]
+    only_load_the_following_plugins! plugin_names
+    failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
+    assert_equal %w(stubby acts_as_chunky_bacon a plugin_with_no_lib_dir), @locator.plugin_names, failure_tip
+  end
+  
+  def test_all_plugins_loaded_after_all
+    plugin_names = ['stubby', :all, 'acts_as_chunky_bacon']
+    only_load_the_following_plugins! plugin_names
+    failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
+    assert_equal %w(stubby a plugin_with_no_lib_dir acts_as_chunky_bacon ), @locator.plugin_names, failure_tip
+  end
+  
-  
-  def test_registering_a_plugin_name_that_does_not_exist_raises_a_load_error