looksee 3.1.0-universal-java-1.8 → 4.0.0-universal-java-1.8

data/lib/looksee/adapter/rubinius.rb

@@ -4,25 +4,6 @@ require 'looksee/rbx'
 module Looksee
   module Adapter
     class Rubinius < Base
-      def internal_superclass(klass)
-        klass.direct_superclass
-      end
-
-      def internal_public_instance_methods(mod)
-        return [] if !mod.origin.equal?(mod)
-        mod.method_table.public_names
-      end
-
-      def internal_protected_instance_methods(mod)
-        return [] if !mod.origin.equal?(mod)
-        mod.method_table.protected_names
-      end
-
-      def internal_private_instance_methods(mod)
-        return [] if !mod.origin.equal?(mod)
-        mod.method_table.private_names
-      end
-
       def internal_undefined_instance_methods(mod)
         return [] if !mod.origin.equal?(mod)
         names = []
@@ -32,51 +13,11 @@ module Looksee
         names
       end
 
-      def included_class?(object)
-        object.is_a?(::Rubinius::IncludedModule)
-      end
-
-      def singleton_class?(object)
-        object.is_a?(Class) && !!::Rubinius::Type.singleton_class_object(object)
-      end
-
       def singleton_instance(singleton_class)
-        singleton_class?(singleton_class) or
-          raise TypeError, "expected singleton class, got #{singleton_class.class}"
-        ::Rubinius::Type.singleton_class_object(singleton_class)
-      end
-
-      def module_name(mod)
-        mod.is_a?(Module) or
-          raise TypeError, "expected module, got #{mod.class}"
-
-        if ::Rubinius::IncludedModule === mod
-          if Class === mod.module
-            "#{module_name(mod.module)} (origin)"
-          else
-            module_name(mod.module)
-          end
-        elsif ::Rubinius::Type.respond_to?(:module_name)
-          ::Rubinius::Type.module_name(mod) || ''
+        if Class === singleton_class && (instance = ::Rubinius::Type.singleton_class_object(singleton_class))
+          instance
         else
-          mod.__name__
-        end
-      end
-
-      def source_location(method)
-        method.is_a?(UnboundMethod) or
-          raise TypeError, "expected UnboundMethod, got #{method.class}"
-        source_location = method.source_location and
-          return source_location
-
-        # #source_location doesn't always work. If it returns nil, try
-        # a little harder.
-        case (executable = method.executable)
-        when ::Rubinius::BlockEnvironment::AsMethod
-          method = executable.instance_variable_get(:@block_env).method
-          [method.file.to_s, method.lines[1]]
-        when ::Rubinius::DelegatedMethod
-          executable.instance_variable_get(:@receiver).source_location
+          nil
         end
       end
     end

data/lib/looksee/clean.rb

@@ -15,7 +15,6 @@ module Looksee
   autoload :Help, 'looksee/help'
   autoload :Inspector, 'looksee/inspector'
   autoload :LookupPath, 'looksee/lookup_path'
-  autoload :WirbleCompatibility, 'looksee/wirble_compatibility'
 
   class << self
     #
@@ -138,6 +137,11 @@ module Looksee
     def help
       Help.new
     end
+
+    # Call mod#method on receiver, ignoring any overrides in receiver's class.
+    def safe_call(mod, name, receiver, *args) # :nodoc:
+      mod.instance_method(name).bind(receiver).call(*args)
+    end
   end
 
   self.default_specifiers = [:public, :protected, :private, :undefined, :overridden]

data/lib/looksee/editor.rb

@@ -15,7 +15,7 @@ module Looksee
     def edit(object, method_name)
       method = LookupPath.new(object).find(method_name.to_s) or
         raise NoMethodError, "no method `#{method_name}' in lookup path of #{object.class} instance"
-      file, line = Looksee.adapter.source_location(method)
+      file, line = method.source_location
       if !file
         raise NoSourceLocationError, "no source location for #{method.owner}##{method.name}"
       elsif !File.exist?(file)

data/lib/looksee/help.rb

@@ -4,7 +4,8 @@ module Looksee
       <<-EOS.gsub(/^ *\|/, '')
         |== Looksee Quick Reference
         |
-        |  object.ls(*specifiers)  or  Looksee[object, *specifiers]
+        |  \e[1mobject.ls(*specifiers)\e[0m  or  \e[1mLooksee[object, *specifiers]\e[0m
+        |
         |    Print the methods of \`object\'.
         |
         |    Available specifiers:
@@ -40,7 +41,7 @@ module Looksee
         |          ...
         |        }
         |
-        |  object.ls.edit(method)
+        |  \e[1mobject.ls.edit(method)\e[0m
         |
         |    Jump to the source of the given method. Set your editor
         |    with Looksee.editor or the LOOKSEE_EDITOR environment

data/lib/looksee/lookup_path.rb

@@ -28,7 +28,7 @@ module Looksee
         if visibility == :undefined
           return nil
         else
-          return Looksee.adapter.real_module(entry.module).instance_method(name)
+          return Looksee.safe_call(Module, :instance_method, entry.module, name)
         end
       end
       nil
@@ -83,11 +83,15 @@ module Looksee
 
       def find_methods
         methods = {}
-        [:public, :protected, :private, :undefined].each do |visibility|
-          Looksee.adapter.send("internal_#{visibility}_instance_methods", @module).each do |method|
+        [:public, :protected, :private].each do |visibility|
+          meths = Looksee.safe_call(Module, "#{visibility}_instance_methods", @module, false)
+          meths.each do |method|
             methods[method.to_s] = visibility
           end
         end
+        Looksee.adapter.send("internal_undefined_instance_methods", @module).each do |method|
+          methods[method.to_s] = :undefined
+        end
         methods
       end
     end

data/lib/looksee/version.rb

@@ -1,5 +1,5 @@
 module Looksee
-  VERSION = [3, 1, 0]
+  VERSION = [4, 0, 0]
 
   class << VERSION
     include Comparable