github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@32 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2004-11-30 18:52:20 +00:00
parent 5b38d85571
commit d82f73ecab
8 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/associations.rb
View File

@@ -562,7 +562,7 @@ module ActiveRecord
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

14
activerecord/lib/active_record/base.rb
View File

@@ -546,13 +546,15 @@ module ActiveRecord #:nodoc:
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 @@ module ActiveRecord #:nodoc:
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