Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote branch 'fxn/master'

  • Loading branch information...
commit ad98f21c21862a46f821ac3ae59992c01860f2d3 2 parents 7f7dfd2 + cf9a52a
Jeremy Kemper jeremy authored
2  activesupport/lib/active_support/core_ext/module.rb
View
@@ -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'
30 activesupport/lib/active_support/core_ext/module/inclusion.rb
View
@@ -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
25 activesupport/lib/active_support/core_ext/module/loading.rb
View
@@ -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
12 activesupport/test/core_ext/module_test.rb
View
@@ -72,13 +72,6 @@ def setup
@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 @@ def test_parents
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
5 activesupport/test/dependencies_test.rb
View
@@ -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 @@ def test_mutual_dependencies_dont_infinite_loop
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
Please sign in to comment.
Something went wrong with that request. Please try again.