Fixed that auto reloading would some times not work or would reload the models...

Fixed that auto reloading would some times not work or would reload the models twice #475 [Tobias Luetke]


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

railties/CHANGELOG

 *SVN*
 
+* Fixed that auto reloading would some times not work or would reload the models twice #475 [Tobias Luetke]
+
 * Added rewrite rules to deal with caching to public/.htaccess
 
 * Added the option to specify a controller name to "generate scaffold" and made the default controller name the plural form of the model.

railties/lib/dispatcher.rb

@@ -24,7 +24,10 @@
 require 'breakpoint'
 
 class Dispatcher
-  def self.dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS)
+  
+  class <<self
+    
+    def dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS)
      Breakpoint.activate_drb("druby://localhost:#{BREAKPOINT_SERVER_PORT}", nil, !defined?(FastCGI)) if defined?(BREAKPOINT_SERVER_PORT)
 
       begin
@@ -36,21 +39,27 @@ def self.dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest:
         require_dependency("application")
         require_dependency(controller_path(controller_name, module_name))
         
+        reload_application rescue nil # Ignore out of order reloading errors for Controllers
+        
         controller_class(controller_name).process(request, response).out
       rescue Object => exception
         ActionController::Base.process_with_exception(request, response, exception).out
       ensure      
-      if Dependencies.mechanism == :load
-        ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses
-        Dependencies.reload rescue nil # Ignore out of order reloading errors for Controllers
-        remove_class_hierarchy(controller_class(controller_name), ActionController::Base)
+        remove_class_hierarchy(controller_class(controller_name), ActionController::Base) if Dependencies.mechanism == :load
+        Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT)
+      end
     end
     
-      Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT)
+    private
+    
+      def reload_application
+        if Dependencies.mechanism == :load
+          ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses
+          Dependencies.reload 
         end    
       end
 
-  def self.controller_path(controller_name, module_name = nil)
+      def controller_path(controller_name, module_name = nil)
         if module_name
           "#{module_name}/#{Inflector.underscore(controller_name)}_controller"
         else
@@ -58,26 +67,27 @@ def self.controller_path(controller_name, module_name = nil)
         end
       end
 
-  def self.controller_class(controller_name)
+      def controller_class(controller_name)
         Object.const_get(controller_class_name(controller_name))
       end
 
-  def self.controller_class_name(controller_name)
+      def controller_class_name(controller_name)
         "#{Inflector.camelize(controller_name)}Controller"
       end
 
-  def self.controller_name(parameters)
+      def controller_name(parameters)
         parameters["controller"].gsub(/[^_a-zA-Z0-9]/, "").untaint
       end
 
-  def self.module_name(parameters)
+      def module_name(parameters)
         parameters["module"].gsub(/[^_a-zA-Z0-9]/, "").untaint if parameters["module"]
       end
 
-  def self.remove_class_hierarchy(klass, until_superclass)
+      def remove_class_hierarchy(klass, until_superclass)
         while klass
           Object.send(:remove_const, "#{klass}".intern)
           klass = (klass.superclass unless until_superclass == klass.superclass)
         end
       end
+  end
 end
\ No newline at end of file