diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-02-08 11:37:56 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-02-08 11:37:56 -0800 |
commit | ad98f21c21862a46f821ac3ae59992c01860f2d3 (patch) | |
tree | af8144546ecb25740e8275a4849a445100685db5 /activesupport | |
parent | 7f7dfd2babf0de37f64a1caf5c0f9e65a91112d1 (diff) | |
parent | cf9a52a7b6a4cb28709f116b306e06395b40b752 (diff) | |
download | rails-ad98f21c21862a46f821ac3ae59992c01860f2d3.tar.gz rails-ad98f21c21862a46f821ac3ae59992c01860f2d3.tar.bz2 rails-ad98f21c21862a46f821ac3ae59992c01860f2d3.zip |
Merge remote branch 'fxn/master'
Diffstat (limited to 'activesupport')
5 files changed, 0 insertions, 74 deletions
diff --git a/activesupport/lib/active_support/core_ext/module.rb b/activesupport/lib/active_support/core_ext/module.rb index fbe89fe07c..41600929f4 100644 --- a/activesupport/lib/active_support/core_ext/module.rb +++ b/activesupport/lib/active_support/core_ext/module.rb @@ -1,10 +1,8 @@ require 'active_support/core_ext/module/aliasing' require 'active_support/core_ext/module/introspection' -require 'active_support/core_ext/module/inclusion' 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/inclusion.rb b/activesupport/lib/active_support/core_ext/module/inclusion.rb deleted file mode 100644 index 4f23841645..0000000000 --- a/activesupport/lib/active_support/core_ext/module/inclusion.rb +++ /dev/null @@ -1,30 +0,0 @@ -class Module - # Returns the classes in the current ObjectSpace where this module has been - # mixed in according to Module#included_modules. - # - # module M - # end - # - # module N - # include M - # end - # - # class C - # include M - # end - # - # class D < C - # end - # - # p M.included_in_classes # => [C, D] - # - def included_in_classes - classes = [] - ObjectSpace.each_object(Class) { |k| classes << k if k.included_modules.include?(self) } - - classes.reverse.inject([]) do |unique_classes, klass| - unique_classes << klass unless unique_classes.collect { |k| k.to_s }.include?(klass.to_s) - unique_classes - end - end -end
\ No newline at end of file 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 87f056ea85..1fe75d5930 100644 --- a/activesupport/test/core_ext/module_test.rb +++ b/activesupport/test/core_ext/module_test.rb @@ -72,13 +72,6 @@ class ModuleTest < Test::Unit::TestCase @david = Someone.new("David", Somewhere.new("Paulina", "Chicago")) end - def test_included_in_classes - assert One.included_in_classes.include?(Ab) - assert One.included_in_classes.include?(Xy::Bc) - assert One.included_in_classes.include?(Yz::Zy::Cd) - assert !One.included_in_classes.include?(De) - end - def test_delegation_to_methods assert_equal "Paulina", @david.street assert_equal "Chicago", @david.city @@ -170,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 |