diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-02-07 23:06:15 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-02-07 23:06:15 +0100 |
| commit | cf9a52a7b6a4cb28709f116b306e06395b40b752 (patch) | |
| tree | 8182c2010cfff8eaa4e5fbc5bc3ecd61c3bd770c /activesupport | |
| parent | afd2e19be3b74effa3fdb9c4affd48f0aaede838 (diff) | |
| download | rails-cf9a52a7b6a4cb28709f116b306e06395b40b752.tar.gz rails-cf9a52a7b6a4cb28709f116b306e06395b40b752.tar.bz2 rails-cf9a52a7b6a4cb28709f116b306e06395b40b752.zip | |
removes Module#as_load_path, which is no longer used
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/module.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/module/loading.rb | 25 | ||||
| -rw-r--r-- | activesupport/test/core_ext/module_test.rb | 5 | ||||
| -rw-r--r-- | activesupport/test/dependencies_test.rb | 5 |
4 files changed, 0 insertions, 36 deletions
diff --git a/activesupport/lib/active_support/core_ext/module.rb b/activesupport/lib/active_support/core_ext/module.rb index b9c9614ca6..41600929f4 100644 --- a/activesupport/lib/active_support/core_ext/module.rb +++ b/activesupport/lib/active_support/core_ext/module.rb @@ -5,5 +5,4 @@ require 'active_support/core_ext/module/attribute_accessors' require 'active_support/core_ext/module/attr_internal' require 'active_support/core_ext/module/attr_accessor_with_default' require 'active_support/core_ext/module/delegation' -require 'active_support/core_ext/module/loading' require 'active_support/core_ext/module/synchronization' diff --git a/activesupport/lib/active_support/core_ext/module/loading.rb b/activesupport/lib/active_support/core_ext/module/loading.rb deleted file mode 100644 index 43d0578ae6..0000000000 --- a/activesupport/lib/active_support/core_ext/module/loading.rb +++ /dev/null @@ -1,25 +0,0 @@ -require 'active_support/core_ext/string/inflections' - -class Module - # Returns String#underscore applied to the module name minus trailing classes. - # - # ActiveRecord.as_load_path # => "active_record" - # ActiveRecord::Associations.as_load_path # => "active_record/associations" - # ActiveRecord::Base.as_load_path # => "active_record" (Base is a class) - # - # The Kernel module gives an empty string by definition. - # - # Kernel.as_load_path # => "" - # Math.as_load_path # => "math" - def as_load_path - if self == Object || self == Kernel - '' - elsif is_a? Class - parent == self ? '' : parent.as_load_path - else - name.split('::').collect do |word| - word.underscore - end * '/' - end - end -end
\ No newline at end of file diff --git a/activesupport/test/core_ext/module_test.rb b/activesupport/test/core_ext/module_test.rb index 23016fd329..1fe75d5930 100644 --- a/activesupport/test/core_ext/module_test.rb +++ b/activesupport/test/core_ext/module_test.rb @@ -163,11 +163,6 @@ class ModuleTest < Test::Unit::TestCase def test_local_constants assert_equal %w(Constant1 Constant3), Ab.local_constants.sort.map(&:to_s) end - - def test_as_load_path - assert_equal 'yz/zy', Yz::Zy.as_load_path - assert_equal 'yz', Yz.as_load_path - end end module BarMethodAliaser diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb index 0fcf1eaf00..f782313411 100644 --- a/activesupport/test/dependencies_test.rb +++ b/activesupport/test/dependencies_test.rb @@ -1,7 +1,6 @@ require 'abstract_unit' require 'pp' require 'active_support/dependencies' -require 'active_support/core_ext/module/loading' require 'active_support/core_ext/kernel/reporting' module ModuleWithMissing @@ -130,10 +129,6 @@ class DependenciesTest < Test::Unit::TestCase end end - def test_as_load_path - assert_equal '', DependenciesTest.as_load_path - end - def test_module_loading with_autoloading_fixtures do assert_kind_of Module, A |