method_info 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/method_info/ancestor_method_structure.rb

@@ -34,6 +34,8 @@ module MethodInfo
       @options = options
 
       @ancestors = []
+      @unattributed_methods = []
+
       if options[:singleton_methods]
         begin
           @ancestors << (class << object; self; end)
@@ -54,6 +56,9 @@ module MethodInfo
       if @ancestors.include?(ancestor)
         @ancestor_methods[ancestor] << method
       end
+      unless ancestor
+        @unattributed_methods << method
+      end
     end
 
     def to_a
@@ -91,6 +96,9 @@ module MethodInfo
       if @options[:include_names_of_excluded_ancestors] && ! @ancestor_filter.excluded.empty?
         s += "#{message_color}Excluded:#{reset_color} " + @ancestor_filter.excluded.join(', ') + "\n"
       end
+      if @options[:include_names_of_unattributed_methods] && ! @unattributed_methods.empty?
+        s += "#{message_color}Unattributed methods:#{reset_color} " + @unattributed_methods.join(', ') + "\n"
+      end
       s += reset_color
       s
     end
@@ -122,17 +130,25 @@ module MethodInfo
       # 37.method(:ceil).to_s => "#<Method: Fixnum(Integer)#ceil>"
       # 37.method(:prec).to_s => "#<Method: Fixnum(Precision)#prec>"
       # obj.method(:singleton_method).to_s => "#<Method: #<Object:0x5673b8>.singleton_method>"
-      if method.to_s =~ /^#<Method: (.*)[#.]#{Regexp.escape(method_name)}>$/
-        owner_string = $1
-        # Maybe it is a top level class and we're done
-        if owner_string =~ /\w+\((\w+)\)/
-          # Module or subclass (like 'Fixnum(Integer)')
-          owner_string = $1
-        elsif owner_string.include?("#<Object:")
-          # probably the eigen class
-          owner_string = "#<Class:#{owner_string}>"
+      # For a nested module: "#<Method: Module1::ClassName(Module1::Module2::Module3)#method>"
+
+      build_ancestor_regexp_map
+      @ancestors.each do |ancestor|
+        return ancestor if method.to_s =~ @ancestor_regexp_map[ancestor]
+      end
+      nil
+    end
+
+    def build_ancestor_regexp_map
+      unless @ancestor_regexp_map
+        @ancestor_regexp_map = Hash.new
+        @ancestors.each do |ancestor|
+          ancestor_name = ancestor.to_s
+          if ancestor_name =~ /^#<Class:(.*)>$/
+            ancestor_name = $1
+          end
+          @ancestor_regexp_map[ancestor] = /#{Regexp.escape(ancestor_name)}[)#.]/
         end
-        @ancestors.select { |a| a.to_s == owner_string }.first
       end
     end
   end

data/spec/method_info/ancestor_method_structure_spec.rb

@@ -83,6 +83,36 @@ module MethodInfo
             ams = AncestorMethodStructure.new(obj, :singleton_methods => true)
             ams.send(:poor_mans_method_owner, obj.method(:foo), "foo").should == class << obj; self; end
           end
+
+          it "finds the owner if it is nested" do
+            module TestNestOne
+              module TestNestTwo
+                def nest
+                  :nest
+                end
+              end
+            end
+
+            class TestNest
+              include TestNestOne::TestNestTwo
+            end
+            obj = TestNest.new
+
+            ams = AncestorMethodStructure.new(obj, {})
+            ams.send(:poor_mans_method_owner, obj.method(:nest), "nest").should == MethodInfo::TestNestOne::TestNestTwo
+          end
+
+          it "finds the owner if it is an anonymous module" do
+            anon = Module.new
+            anon.send(:define_method, :bla) { :bla }
+            class UsingAnonymous
+            end
+            UsingAnonymous.send(:include, anon)
+            obj = UsingAnonymous.new
+
+            ams = AncestorMethodStructure.new(obj, {})
+            ams.send(:poor_mans_method_owner, obj.method(:bla), "bla").should == anon
+          end
         end
       end
     end

data/spec/method_info/option_handler_spec.rb

@@ -113,8 +113,9 @@ module MethodInfo
     end
 
     it "provides access to it's default options" do
+      MethodInfo::OptionHandler.default_options = { :fruit => :apple }
       MethodInfo::OptionHandler.default_options[:foo] = :bar
-      MethodInfo::OptionHandler.default_options.should == { :foo => :bar }
+      MethodInfo::OptionHandler.default_options.should == { :fruit => :apple, :foo => :bar }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: method_info
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Tom ten Thij
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 +00:00
+date: 2010-02-23 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency