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

Find nested module definitions [Fixes #832]

This fixes `$ ActionController::ForceSSL`
This commit is contained in:
Conrad Irwin 2013-04-07 13:24:28 -07:00
parent d267b64188
commit bb23c4bb31
2 changed files with 35 additions and 4 deletions

View file

@ -348,7 +348,17 @@ class Pry
# given module. # given module.
# @return [Array<Pry::Method>] # @return [Array<Pry::Method>]
def all_methods_for(mod) def all_methods_for(mod)
all_from_common(mod, :instance_method) + all_from_common(mod, :method) methods = all_from_common(mod, :instance_method) + all_from_common(mod, :method)
return methods unless methods.empty?
safe_send(mod, :constants).map do |const_name|
if const = nested_module?(mod, const_name)
all_methods_for(const)
else
[]
end
end.flatten
end end
# FIXME: a variant of this method is also found in Pry::Method # FIXME: a variant of this method is also found in Pry::Method
@ -366,6 +376,13 @@ class Pry
end.flatten end.flatten
end end
def nested_module?(parent, name)
child = safe_send(parent, :const_get, name)
return unless Module === child
return unless safe_send(child, :name) == "#{safe_send(parent, :name)}::#{name}"
child
end
# Detect methods that are defined with `def_delegator` from the Forwardable # Detect methods that are defined with `def_delegator` from the Forwardable
# module. We want to reject these methods as they screw up module # module. We want to reject these methods as they screw up module
# extraction since the `source_location` for such methods points at forwardable.rb # extraction since the `source_location` for such methods points at forwardable.rb

View file

@ -22,6 +22,11 @@ describe Pry::WrappedModule do
end end
end end
class PitifullyBlank
DEFAULT_TEST = CandidateTest
end
FOREVER_ALONE_LINE = __LINE__ + 1
class ForeverAlone class ForeverAlone
class DoublyNested class DoublyNested
# nested docs # nested docs
@ -39,8 +44,12 @@ describe Pry::WrappedModule do
Pry::WrappedModule(Host::CandidateTest).number_of_candidates.should == 3 Pry::WrappedModule(Host::CandidateTest).number_of_candidates.should == 3
end end
it 'should return 0 candidates for a class with no methods and no other definitions' do it 'should return 0 candidates for a class with no nested modules or methods' do
Pry::WrappedModule(Host::ForeverAlone).number_of_candidates.should == 0 Pry::WrappedModule(Host::PitifullyBlank).number_of_candidates.should == 0
end
it 'should return 1 candidate for a class with a nested module with methods' do
Pry::WrappedModule(Host::ForeverAlone).number_of_candidates.should == 1
end end
end end
@ -68,8 +77,13 @@ describe Pry::WrappedModule do
wm.source_location.should == wm.candidate(0).source_location wm.source_location.should == wm.candidate(0).source_location
end end
it 'should return the location of the outer module if an inner module has methods' do
wm = Pry::WrappedModule(Host::ForeverAlone)
wm.source_location.should == [__FILE__, Host::FOREVER_ALONE_LINE]
end
it 'should return nil if no source_location can be found' do it 'should return nil if no source_location can be found' do
Pry::WrappedModule(Host::ForeverAlone).source_location.should == nil Pry::WrappedModule(Host::PitifullyBlank).source_location.should == nil
end end
end end