methodfinder 1.2.2 → 1.2.3

data/README.markdown

@@ -38,6 +38,12 @@ Inside `find_method`'s block, the receiver is available as block
 argument and the special method `unknown` is used as a placeholder for
 the desired method.
 
+You can also call `find_method` without passing a block. This is the
+same as calling `MethodFinder.find`.
+
+    >> 10.find_method(1,3)
+    [:%, :<=>, :>>, :[], :modulo, :remainder]
+
 #### Blacklists
 
 You can exclude methods from being tried by editing the hashes
@@ -100,7 +106,9 @@ Thanks
 [suggesting](https://github.com/citizen428/methodfinder/issues/closed#issue/3)
 what eventually became `Object#find_method`.
 * Jan Lelis for [implementing blacklists](https://github.com/citizen428/methodfinder/issues/closed#issue/4).
-* [Brian Morearty] for pointing out an [incompatibility with Ruby 1.8.7](https://github.com/citizen428/methodfinder/issues/closed#issue/5).
+* Brian Morearty for pointing out an
+  [incompatibility with Ruby 1.8.7](https://github.com/citizen428/methodfinder/pull/5)
+  and adding the [blockless version](https://github.com/citizen428/methodfinder/pull/6) of `Object#find_method`.
 
 License
 ---

data/lib/methodfinder.rb

@@ -2,75 +2,81 @@ require 'stringio'
 
 class Object
   def find_method(*args, &block)
-    MethodFinder.methods_to_try(self).select do |met|
-      self.class.class_eval %{ alias :unknown #{met} }
+    if block_given?
+      MethodFinder.methods_to_try(self).select do |met|
+        self.class.class_eval %{ alias :unknown #{met} }
         obj = self.dup rescue self
         yield obj rescue nil
       end
+    else
+      MethodFinder.find(self, *args)
     end
   end
+end
 
-  class MethodFinder
-    ARGS = {
-      :cycle => [1] # prevent cycling forever
-    }
+class MethodFinder
+  ARGS = {
+    :cycle => [1] # prevent cycling forever
+  }
 
-    # Blacklisting methods, e.g. { :Object => [:ri, :vim] }
-    INSTANCE_METHOD_BLACKLIST = Hash.new { |h, k| h[k] = [] }
-    CLASS_METHOD_BLACKLIST = Hash.new { |h, k| h[k] = [] }
+  # Blacklisting methods, e.g. { :Object => [:ri, :vim] }
+  INSTANCE_METHOD_BLACKLIST = Hash.new { |h, k| h[k] = [] }
+  CLASS_METHOD_BLACKLIST = Hash.new { |h, k| h[k] = [] }
+  INSTANCE_METHOD_BLACKLIST[:Object] << :find_method # prevent stack overflow
 
-    class << self
-      def find(obj, res, *args, &block)
-        redirect_streams
+  class << self
+    def find(obj, res, *args, &block)
+      redirect_streams
 
-        methods_to_try(obj).select do |met|
-          o = obj.dup rescue obj
-          m = o.method(met)
-          if m.arity <= args.size
-            a = args.empty? && ARGS.has_key?(met) ? ARGS[met] : args
-            m.call(*a, &block) == res rescue nil
-          end
+      methods_to_try(obj).select do |met|
+        o = obj.dup rescue obj
+        m = o.method(met)
+        if m.arity <= args.size
+          a = args.empty? && ARGS.has_key?(met) ? ARGS[met] : args
+          m.call(*a, &block) == res rescue nil
         end
-      ensure
-        restore_streams
       end
+    ensure
+      restore_streams
+    end
 
-      # Added by Jan Lelis
-      def methods_to_try(obj)
-        ret = obj.methods.map(&:intern)
-        blacklist = obj.is_a?(Module) ? CLASS_METHOD_BLACKLIST : INSTANCE_METHOD_BLACKLIST
-        klass = obj.is_a?(Module) ? obj : obj.class
+    # Added by Jan Lelis
+    def methods_to_try(obj)
+      ret = obj.methods.map(&:intern)
+      blacklist = obj.is_a?(Module) ? CLASS_METHOD_BLACKLIST : INSTANCE_METHOD_BLACKLIST
+      klass = obj.is_a?(Module) ? obj : obj.class
 
-        klass.ancestors.each { |ancestor| ret -= blacklist[ancestor.to_s.intern] }
+      klass.ancestors.each { |ancestor| ret -= blacklist[ancestor.to_s.intern] }
 
-        ret.sort_by(&:to_s)
-      end
+      # 1.8.7 lacks Symbol#<=>
+      ret.sort_by(&:to_s)
+    end
 
-      def find_classes_and_modules
-        constants = Object.constants.sort.map { |c| Object.const_get(c) }
-        constants.select { |c| c.class == Class || c.class == Module}
-      end
+    def find_classes_and_modules
+      constants = Object.constants.sort.map { |c| Object.const_get(c) }
+      constants.select { |c| c.class == Class || c.class == Module}
+    end
 
-      def find_in_class_or_module(c, pattern=/./)
-        cs = Object.const_get(c.to_s)
-        class_methods = cs.methods(false) rescue []
-        instance_methods = cs.instance_methods(false)
-        all_methods = class_methods + instance_methods
-        all_methods.grep(/#{pattern}/).sort
-      end
+    def find_in_class_or_module(c, pattern=/./)
+      cs = Object.const_get(c.to_s)
+      class_methods = cs.methods(false) rescue []
+      instance_methods = cs.instance_methods(false)
+      all_methods = class_methods + instance_methods
+      all_methods.grep(/#{pattern}/).sort
+    end
 
-      def redirect_streams
-        @orig_stdout = $stdout
-        @orig_stderr = $stderr
-        $stdout = StringIO.new
-        $stderr = StringIO.new
-      end
+    def redirect_streams
+      @orig_stdout = $stdout
+      @orig_stderr = $stderr
+      $stdout = StringIO.new
+      $stderr = StringIO.new
+    end
 
-      def restore_streams
-        $stdout = @orig_stdout
-        $stderr = @orig_stderr
-      end
+    def restore_streams
+      $stdout = @orig_stdout
+      $stderr = @orig_stderr
     end
-    private_class_method :redirect_streams, :restore_streams
   end
+  private_class_method :redirect_streams, :restore_streams
+end
 

metadata

@@ -2,7 +2,7 @@
 name: methodfinder
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - Michael Kohl
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-23 00:00:00 Z
+date: 2011-04-24 00:00:00 Z
 dependencies: []
 
 description: