removes the obsolete require_association method from dependencies

This is an obsolete method from the very early days,
apparently it was used circa 2004 because STI support
was not smart enough. This method is not public
interface, and we are heading a major version, so
removal seems right.
This commit is contained in:
Xavier Noria 2012-06-10 00:35:18 +02:00
parent 6bd729e86f
commit d3a99c32d1
3 changed files with 7 additions and 21 deletions

View File

@ -1,5 +1,7 @@
## Rails 4.0.0 (unreleased) ## ## Rails 4.0.0 (unreleased) ##
* Remove obsolete and unused `require_association` method from dependencies. *fxn*
* Add `:instance_accessor` option for `config_accessor`. * Add `:instance_accessor` option for `config_accessor`.
class User class User

View File

@ -168,8 +168,6 @@ module ActiveSupport #:nodoc:
end end
end end
# Use const_missing to autoload associations so we don't have to
# require_association when using single-table inheritance.
def const_missing(const_name, nesting = nil) def const_missing(const_name, nesting = nil)
klass_name = name.presence || "Object" klass_name = name.presence || "Object"
@ -220,11 +218,7 @@ module ActiveSupport #:nodoc:
raise ArgumentError, "the file name must be a String -- you passed #{file_name.inspect}" raise ArgumentError, "the file name must be a String -- you passed #{file_name.inspect}"
end end
Dependencies.depend_on(file_name, false, message) Dependencies.depend_on(file_name, message)
end
def require_association(file_name)
Dependencies.associate_with(file_name)
end end
def load_dependency(file) def load_dependency(file)
@ -306,20 +300,14 @@ module ActiveSupport #:nodoc:
mechanism == :load mechanism == :load
end end
def depend_on(file_name, swallow_load_errors = false, message = "No such file to load -- %s.rb") def depend_on(file_name, message = "No such file to load -- %s.rb")
path = search_for_file(file_name) path = search_for_file(file_name)
require_or_load(path || file_name) require_or_load(path || file_name)
rescue LoadError => load_error rescue LoadError => load_error
unless swallow_load_errors if file_name = load_error.message[/ -- (.*?)(\.rb)?$/, 1]
if file_name = load_error.message[/ -- (.*?)(\.rb)?$/, 1] raise LoadError.new(message % file_name).copy_blame!(load_error)
raise LoadError.new(message % file_name).copy_blame!(load_error)
end
raise
end end
end raise
def associate_with(file_name)
depend_on(file_name, true)
end end
def clear def clear

View File

@ -60,10 +60,6 @@ class DependenciesTest < ActiveSupport::TestCase
assert_raise(MissingSourceFile) { require_dependency("missing_service") } assert_raise(MissingSourceFile) { require_dependency("missing_service") }
end end
def test_missing_association_raises_nothing
assert_nothing_raised { require_association("missing_model") }
end
def test_dependency_which_raises_exception_isnt_added_to_loaded_set def test_dependency_which_raises_exception_isnt_added_to_loaded_set
with_loading do with_loading do
filename = 'dependencies/raises_exception' filename = 'dependencies/raises_exception'