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

require_dependency should require using the normal mechanism if possible to avoid double-requires

Browse Source
This commit is contained in:
wycats
2010-08-04 02:16:48 -07:00
parent 91e4249c02
commit d599e94e45
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
activesupport/lib/active_support/dependencies.rb
View File

@@ -276,14 +276,22 @@ module ActiveSupport #:nodoc:
end
def depend_on(file_name, swallow_load_errors = false, message = "No such file to load -- %s.rb")
path = search_for_file(file_name)
require_or_load(path || file_name)
rescue LoadError => load_error
unless swallow_load_errors
if file_name = load_error.message[/ -- (.*?)(\.rb)?$/, 1]
raise LoadError.new(message % file_name).copy_blame!(load_error)
#path = search_for_file(file_name)
require_or_load(file_name)
rescue LoadError
begin
if path = search_for_file(file_name)
require_or_load(path)
else
raise
end
rescue LoadError => load_error
unless swallow_load_errors
if file_name = load_error.message[/ -- (.*?)(\.rb)?$/, 1]
raise LoadError.new(message % file_name).copy_blame!(load_error)
end
raise
end
raise
end
end