method_locator 0.0.2 → 0.0.3

data/README.md

@@ -4,7 +4,7 @@ Method Locator is a Ruby gem that allows you to easily determine the method look
 object / class / module, as well as find all places (represented as UnboundMethod instances) where
 a callable method is defined on an object. This is very useful in an environment such as Rails where
 you are unsure where a method may be defined or overridden. Note that by default, Ruby tends to hide
-singleton classes when you invoke Class#ancestors. The new Object#method_lookup_path does not hide
+singleton classes when you invoke Module#ancestors. The new Object#method_lookup_path does not hide
 these singleton classes and will return them, so that you get a true representation of how Ruby
 performs lookups for methods.
 

data/lib/method_locator/version.rb

@@ -1,3 +1,3 @@
 module MethodLocator
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/method_locator.rb

@@ -13,27 +13,35 @@ module MethodLocator
   end
 
   def method_lookup_path
-    is_a?(Class) ? class_lookup_path : nonclass_lookup_path
+    lookup_path = is_a?(Class) ? class_lookup_path : nonclass_lookup_path
+    insert_modules_into(lookup_path)
+  end
+
+  def class_only_ancestors
+    ancestors.grep(Class)
   end
 
   private
 
+  def instance_methods_for(clazz)
+    clazz.instance_methods(false) + clazz.private_instance_methods(false)
+  end
+
   def nonclass_lookup_path
-    self.class.ancestors.unshift(singleton_class)
+    self.class.class_only_ancestors.unshift(singleton_class)
   end
 
   def class_lookup_path
-    lookup_path = ancestors.grep(Class).map(&:singleton_class) + Class.ancestors
+    class_only_ancestors.map(&:singleton_class) + Class.class_only_ancestors
+  end
+
+  def insert_modules_into(lookup_path)
     # reverse is used here since included_modules contains all modules defined in
     # the current class as well as in its ancestors.
     lookup_path.reverse.map do |clazz|
-      [clazz.included_modules, clazz]
+      [clazz.included_modules.reverse, clazz]
     end.flatten.uniq.reverse
   end
-
-  def instance_methods_for(clazz)
-    clazz.instance_methods(false) + clazz.private_instance_methods(false)
-  end
 end
 
 Object.send(:include, MethodLocator)

data/spec/method_locator/method_locator_spec.rb

@@ -6,11 +6,13 @@ describe MethodLocator do
   describe "#methods_for" do
     it "returns proper methods for regular object instances" do
       instance = B.new
+      instance.extend(M5)
 
       def instance.foo
       end
 
       instance.methods_for(:foo).map(&:owner).should == [instance.singleton_class,
+                                                         M5,
                                                          B,
                                                          M2,
                                                          M1,
@@ -29,7 +31,10 @@ describe MethodLocator do
   describe "#method_lookup_path" do
     it "returns proper path for regular object instances" do
       instance = B.new
+      instance.extend(M5)
+
       method_lookup_path_for(instance).should == [instance.singleton_class,
+                                                  M5,
                                                   B,
                                                   M2,
                                                   M1,
@@ -65,7 +70,7 @@ describe MethodLocator do
   end
 
   def method_lookup_path_for(obj)
-    allowed_items = [obj, M1, M2, M3, M4, A, B, Class, Module, Object, MethodLocator, Kernel, BasicObject]
+    allowed_items = [obj, M1, M2, M3, M4, M5, A, B, Class, Module, Object, MethodLocator, Kernel, BasicObject]
     allowed_items = allowed_items + allowed_items.map(&:singleton_class)
     obj.method_lookup_path.keep_if { |c| allowed_items.include?(c) }
   end
@@ -92,6 +97,11 @@ module M4
   end
 end
 
+module M5
+  def foo
+  end
+end
+
 class A
   def foo
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: method_locator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70151278604820 !ruby/object:Gem::Requirement
+  requirement: &70185155876540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70151278604820
+  version_requirements: *70185155876540
 description: Method Locator provides a way to traverse an object's method lookup path
   to find all places where a method may be defined.
 email: