Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed problems with dependency caching and controller hierarchies on …

…Ruby 1.8.2 in development mode #351

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@317 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 375568b7cb476285a9f8ea2c748d4987a477a119 1 parent 569f2ea
@dhh dhh authored
View
2  railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed problems with dependency caching and controller hierarchies on Ruby 1.8.2 in development mode #351
+
* Added automated rewriting of the shebang lines on installs through the gem rails command #379 [Manfred Stienstra]
* Fixed that generated action_mailers doesnt need to require the action_mailer since thats already done in the environment #382 [Lucas Carlson]
View
2  railties/Rakefile
@@ -233,7 +233,7 @@ spec = Gem::Specification.new do |s|
on top of either MySQL, PostgreSQL, or SQLite with eRuby-based templates.
EOF
- s.add_dependency('rake', '>= 0.4.11')
+ s.add_dependency('rake', '>= 0.4.14')
s.add_dependency('activerecord', '>= 1.3.0')
s.add_dependency('actionpack', '>= 1.1.0')
s.add_dependency('actionmailer', '>= 0.5.0')
View
12 railties/lib/dispatcher.rb
@@ -41,10 +41,9 @@ def self.dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest:
ActionController::Base.process_with_exception(request, response, exception).out
ensure
if Dependencies.mechanism == :load
- Object.send(:remove_const, "ApplicationController") if Object.const_defined?(:ApplicationController)
- Object.send(:remove_const, controller_class_name(controller_name)) if Object.const_defined?(controller_class_name(controller_name))
+ remove_class_hierarchy(controller_class(controller_name), ActionController::Base)
ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses
- Dependencies.reload
+ Dependencies.reload rescue nil # Ignore out of order reloading errors for Controllers
end
Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT)
@@ -74,4 +73,11 @@ def self.controller_name(parameters)
def self.module_name(parameters)
parameters["module"].gsub(/[^_a-zA-Z0-9]/, "").untaint if parameters["module"]
end
+
+ def self.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
Please sign in to comment.
Something went wrong with that request. Please try again.