1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

require_dependency should allow Pathname-like objects, not just String

This commit is contained in:
Benjamin Fleischer 2013-09-30 15:20:28 -05:00
parent 432ffdb073
commit 0b0beb71d6
2 changed files with 14 additions and 1 deletions

View file

@ -198,9 +198,11 @@ module ActiveSupport #:nodoc:
Dependencies.require_or_load(file_name)
end
# Files required this way can be reloaded in development mode
def require_dependency(file_name, message = "No such file to load -- %s")
file_name = file_name.to_path if file_name.respond_to?(:to_path)
unless file_name.is_a?(String)
raise ArgumentError, "the file name must be a String -- you passed #{file_name.inspect}"
raise ArgumentError, "the file name must either be a String or implement #to_path -- you passed #{file_name.inspect}"
end
Dependencies.depend_on(file_name, message)

View file

@ -35,6 +35,17 @@ class DependenciesTest < ActiveSupport::TestCase
assert_equal expected.path, e.path
end
def test_require_dependency_accepts_an_object_which_implements_to_path
o = Object.new
def o.to_path; 'dependencies/service_one'; end
assert_nothing_raised {
require_dependency o
}
assert defined?(ServiceOne)
ensure
remove_constants(:ServiceOne)
end
def test_tracking_loaded_files
require_dependency 'dependencies/service_one'
require_dependency 'dependencies/service_two'