3 files changed, 34 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 7076d58118..2143504b33 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,20 @@
 *SVN*
 
+* Allow files in plugins to be reloaded like the rest of the application.  [rick]
+
+  Enables or disables plugin reloading.
+  
+    config.reload_plugins = true
+  
+  You can get around this setting per plugin.
+  If #reload_plugins? == false (DEFAULT), add this to your plugin's init.rb to make it reloadable:
+  
+    Dependencies.load_once_paths.delete lib_path
+  
+  If #reload_plugins? == true, add this to your plugin's init.rb to only load it once:
+  
+    Dependencies.load_once_paths << lib_path
+
 * Small tweak to allow plugins to specify gem dependencies.  [rick]
 
   # OLD open_id_authentication plugin init.rb
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 20e1f01926..40c2ad90cb 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -516,6 +516,22 @@ module Rails
     # a sub class would have access to fine grained modification of the loading behavior. See
     # the implementation of Rails::Plugin::Loader for more details.
     attr_accessor :plugin_loader
+    
+    # Enables or disables plugin reloading.  You can get around this setting per plugin.
+    # If #reload_plugins? == false, add this to your plugin's init.rb to make it reloadable:
+    #
+    #   Dependencies.load_once_paths.delete lib_path
+    #
+    # If #reload_plugins? == true, add this to your plugin's init.rb to only load it once:
+    #
+    #   Dependencies.load_once_paths << lib_path
+    #
+    attr_accessor :reload_plugins
+
+    # Returns true if plugin reloading is enabled.
+    def reload_plugins?
+      !!@reload_plugins
+    end
 
     # An array of gems that this rails application depends on.  Rails will automatically load
     # these gems during installation, and allow you to install any missing gems with:
diff --git a/railties/lib/rails/plugin/loader.rb b/railties/lib/rails/plugin/loader.rb
index 438afa4d32..1e542dd038 100644
--- a/railties/lib/rails/plugin/loader.rb
+++ b/railties/lib/rails/plugin/loader.rb
@@ -46,7 +46,9 @@ module Rails
           plugin.load_paths.each do |path|
             $LOAD_PATH.insert(application_lib_index + 1, path)
             Dependencies.load_paths      << path
-            Dependencies.load_once_paths << path
+            unless Rails.configuration.reload_plugins?
+              Dependencies.load_once_paths << path
+            end
           end
         end
         $LOAD_PATH.uniq!