Moved subclass reloading responsibilities to Dependencies

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@509 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
上级 20b14e0d
......@@ -35,6 +35,10 @@ def clear
def require_or_load(file_name)
load? ? load("#{file_name}.rb") : require(file_name)
end
def remove_subclasses_for(*classes)
classes.each { |klass| klass.remove_subclasses }
end
end
Object.send(:define_method, :require_or_load) { |file_name| Dependencies.require_or_load(file_name) } unless Object.respond_to?(:require_or_load)
......
......@@ -49,9 +49,7 @@ def dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest::DEFA
private
def reset_application
Dependencies.clear
ActiveRecord::Base.remove_subclasses
ActiveRecord::Observer.remove_subclasses
ActionController::Base.remove_subclasses
Dependencies.remove_subclasses_for(ActiveRecord::Base, ActiveRecord::Observer, ActionController::Base)
end
def controller_path(controller_name, module_name = nil)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册