Permalink
Browse files

Abolished ActionController::Base.require_or_load in favor of require_…

…dependency and ActiveRecord::Base.require_or_load in favor of require_association. Both methods are now also available in the global namespace when you need to require dependencies or associations outside of whats done automatically.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@32 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
dhh committed Nov 30, 2004
1 parent 5b38d85 commit d82f73ecabe71fc3814eff0bd26f4f431f690266
@@ -256,9 +256,11 @@ def controller_name
end
# Loads the <tt>file_name</tt> if reload_dependencies is true or requires if it's false.
- def require_or_load(file_name)
+ def require_dependency(file_name)
reload_dependencies ? silence_warnings { load("#{file_name}.rb") } : require(file_name)
end
+
+ Object.send(:define_method, :require_dependency) { |file_name| ActiveRecord::Base.require_dependency(file_name) }
end
public
@@ -38,7 +38,7 @@ def instantiate_observers(observers)
def require_dependencies(layer, dependencies)
dependencies.flatten.each do |dependency|
begin
- require_or_load(dependency.to_s)
+ require_dependency(dependency.to_s)
rescue LoadError
raise LoadError, "Missing #{layer} #{dependency}.rb"
end
@@ -54,7 +54,7 @@ def helper(*args, &block)
file_name = Inflector.underscore(arg.to_s.downcase) + '_helper'
class_name = Inflector.camelize(file_name)
begin
- require_or_load(file_name)
+ require_dependency(file_name)
rescue LoadError
raise LoadError, "Missing helper file helpers/#{file_name}.rb"
end
@@ -562,7 +562,7 @@ def #{method_prefix + collection_name}(attributes = nil)
def require_association_class(class_name)
begin
- require_or_load(Inflector.underscore(class_name))
+ require_association(Inflector.underscore(class_name))
rescue LoadError
# Failed to load the associated class -- let's hope the developer is doing the requiring himself.
end
@@ -546,13 +546,15 @@ def benchmark(title)
end
# Loads the <tt>file_name</tt> if reload_associations is true or requires if it's false.
- def require_or_load(file_name)
+ def require_association(file_name)
if !associations_loaded.include?(file_name)
associations_loaded << file_name
reload_associations ? silence_warnings { load("#{file_name}.rb") } : require(file_name)
end
end
+ Object.send(:define_method, :require_association) { |file_name| ActiveRecord::Base.require_association(file_name) }
+
# Resets the list of dependencies loaded (typically to be called by the end of a request), so when require_or_load is
# called for that dependency it'll be loaded anew.
def reset_associations_loaded
@@ -782,10 +784,16 @@ def respond_to?(method)
self.class.column_methods_hash[method.to_sym] || respond_to_without_attributes?(method)
end
- def require_or_load(file_name)
- self.class.require_or_load(file_name)
+ # Loads the <tt>file_name</tt> if reload_associations is true or requires if it's false.
+ def require_association(file_name)
+ if !associations_loaded.include?(file_name)
+ associations_loaded << file_name
+ reload_associations ? silence_warnings { load("#{file_name}.rb") } : require(file_name)
+ end
end
+ Object.send(:define_method, :require_association) { |file_name| ActiveRecord::Base.require_association(file_name) }
+
private
def create_or_update
if new_record? then create else update end
@@ -35,7 +35,7 @@
# Environment-specific configuration.
-ActionController::Base.require_or_load "environments/#{RAILS_ENV}"
+require_dependency "environments/#{RAILS_ENV}"
ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml"))
ActiveRecord::Base.establish_connection
@@ -32,7 +32,7 @@
# Environment-specific configuration.
-ActionController::Base.require_or_load "environments/#{RAILS_ENV}"
+require_dependency "environments/#{RAILS_ENV}"
ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml"))
ActiveRecord::Base.establish_connection
@@ -31,8 +31,8 @@ def self.dispatch(cgi = CGI.new, session_options = DEFAULT_SESSION_OPTIONS, erro
controller_name, module_name = controller_name(request.parameters), module_name(request.parameters)
- ActionController::Base.require_or_load("abstract_application")
- ActionController::Base.require_or_load(controller_path(controller_name, module_name))
+ require_dependency("abstract_application")
+ require_dependency(controller_path(controller_name, module_name))
controller_class(controller_name).process(request, response).out
rescue Object => e

0 comments on commit d82f73e

Please sign in to comment.