0
@@ -18,8 +18,8 @@
0
       loaded << file_name
0
       begin
0
         require_or_load(file_name)
0
-      rescue LoadError
0
-        raise unless swallow_load_errors
0
+      rescue Object => e
0
+        raise ScriptError, "#{e.message}" unless e.is_a?(LoadError) && swallow_load_errors
0
       end
0
     end
0
   end
0
0
@@ -32,18 +32,8 @@
0
     self.loaded = [ ]
0
   end
0
   
0
-  def reload
0
-    loaded.each do |file_name| 
0
-      begin
0
-        silence_warnings { load("#{file_name}.rb") }
0
-      rescue LoadError
0
-        # We don't care if the file was removed now
0
-      end
0
-    end
0
-  end
0
-  
0
   def require_or_load(file_name)
0
-    mechanism == :load ? silence_warnings { load("#{file_name}.rb") } : require(file_name)
0
+    load? ? load("#{file_name}.rb") : require(file_name)
0
   end
0
 end
0
 
0
@@ -57,7 +47,7 @@
0
     # require_association when using single-table inheritance.
0
     def const_missing(class_id)
0
       begin
0
-        require_dependency(Inflector.underscore(Inflector.demodulize(class_id.to_s)))
0
+        require_or_load(class_id.to_s.demodulize.underscore)
0
         if Object.const_defined?(class_id) then return Object.const_get(class_id) else raise LoadError end
0
       rescue LoadError
0
         raise NameError, "uninitialized constant #{class_id}"

0
@@ -34,8 +34,6 @@
0
     
0
         controller_name, module_name = controller_name(request.parameters), module_name(request.parameters)
0
 
0
-        reload_models
0
-
0
         require_or_load("application")
0
         require_or_load(controller_path(controller_name, module_name))
0
 
0
0
0
@@ -43,24 +41,18 @@
0
       rescue Object => exception
0
         ActionController::Base.process_with_exception(request, response, exception).out
0
       ensure
0
-        remove_controllers(controller_name)
0
+        reset_application if Dependencies.load?
0
         Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT)
0
       end
0
     end
0
     
0
     private
0
-      def reload_models
0
-        if Dependencies.load?
0
-          ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses
0
-          Dependencies.reload
0
-        end
0
+      def reset_application
0
+        Dependencies.clear
0
+        ActiveRecord::Base.remove_subclasses
0
+        ActiveRecord::Observer.remove_subclasses
0
+        ActionController::Base.remove_subclasses
0
       end
0
-      
0
-      def remove_controllers(controller_name)
0
-        if Dependencies.load? && defined?(ApplicationController)
0
-          remove_class_hierarchy(controller_class(controller_name), ActionController::Base)
0
-        end
0
-      end
0
     
0
       def controller_path(controller_name, module_name = nil)
0
         if module_name
0
@@ -84,13 +76,6 @@
0
 
0
       def module_name(parameters)
0
         parameters["module"].downcase.gsub(/[^_a-zA-Z0-9]/, "").untaint if parameters["module"]
0
-      end
0
-
0
-      def remove_class_hierarchy(klass, until_superclass)
0
-        while klass
0
-          Object.send(:remove_const, "#{klass}".intern)
0
-          klass = (klass.superclass unless until_superclass == klass.superclass)
0
-        end
0
       end
0
   end
0
 end