looksee 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d5b5cb3860af73f5d3800d9f580eecafa4c4f6f
-  data.tar.gz: eafb21b450e03a9a1620937aa646013aa3684516
+  metadata.gz: b329abd3db89e86131b91f3d9fb3f7c6dfa84f6e
+  data.tar.gz: 07f340c3a34e5ca7a769c99cd0355030b70c2939
 SHA512:
-  metadata.gz: 9be481e1b3359c05ec6be675284bf370dc9fecab2c9f42a6c6b81ecf454ed238b243111f48d5d17c1549afaf05cc06c44be4745bb0f64be31bd2de13526762c5
-  data.tar.gz: c146b1c1b04970ae648d561eea58ef80e9cc9b309c8740a2696592284d360ac6ec60a45f7aa342c92dd14a057b0365ba79488b65d3e0c810a6c2d96e9a7a1cb7
+  metadata.gz: 369e6f4f8f4128b969b9e446190438d6eaa83a9815a42cf77fa3c86a7fa027c221b98ff439d4d6a9ade2ae17651712ade1fbb955260120e82e5465fc4a4f1000
+  data.tar.gz: 595ecc16a319e375a34159656c5c7ccb99fb4230641d97e7fdaab8bcfde66aa01ea724a72de583b8a8c35db9571b1c1b939e545b7693683e31d7b0e67e7928b1

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 2.1.1 2014-07-13
+
+ * Fix error for objects with an unnamed module in the lookup path.
+ * Fix editing for included methods.
+
 == 2.1.0 2014-03-05
 
  * Add alternative syntax: Looksee[object, *args]. Useful for BasicObject

data/ext/mri/mri.c

@@ -213,6 +213,13 @@ VALUE Looksee_singleton_instance(VALUE self, VALUE singleton_class) {
   }
 }
 
+VALUE Looksee_real_module(VALUE self, VALUE module_or_included_class) {
+  if (BUILTIN_TYPE(module_or_included_class) == T_ICLASS)
+    return RBASIC(module_or_included_class)->klass;
+  else
+    return module_or_included_class;
+}
+
 VALUE Looksee_module_name(VALUE self, VALUE module) {
   if (BUILTIN_TYPE(module) == T_CLASS || BUILTIN_TYPE(module) == T_MODULE) {
     VALUE name = rb_mod_name(module);
@@ -294,6 +301,7 @@ void Init_mri(void) {
   rb_define_method(mMRI, "included_class?", Looksee_included_class_p, 1);
   rb_define_method(mMRI, "singleton_class?", Looksee_singleton_class_p, 1);
   rb_define_method(mMRI, "singleton_instance", Looksee_singleton_instance, 1);
+  rb_define_method(mMRI, "real_module", Looksee_real_module, 1);
   rb_define_method(mMRI, "module_name", Looksee_module_name, 1);
 #if RUBY_VERSION < 190
   rb_define_method(mMRI, "source_location", Looksee_source_location, 1);

data/lib/looksee/adapter/base.rb

@@ -31,7 +31,8 @@ module Looksee
         if included_class?(mod) || object.is_a?(Module)
           description = module_name(object)
           if description.empty?
-            description = "unnamed #{object.is_a?(Class) ? 'Class' : 'Module'}"
+            is_class = real_module(object).is_a?(Class)
+            description = "unnamed #{is_class ? 'Class' : 'Module'}"
           end
         else
           description = "#{module_name(object.class)} instance"
@@ -44,6 +45,10 @@ module Looksee
         end
       end
 
+      def real_module(module_or_included_class)
+        module_or_included_class
+      end
+
       def internal_superclass(klass)
         raise NotImplementedError, "abstract"
       end

data/lib/looksee/lookup_path.rb

@@ -28,7 +28,7 @@ module Looksee
         if visibility == :undefined
           return nil
         else
-          return entry.module.instance_method(name)
+          return Looksee.adapter.real_module(entry.module).instance_method(name)
         end
       end
       nil

data/lib/looksee/version.rb

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

data/spec/looksee/adapter_spec.rb

@@ -227,44 +227,44 @@ describe "Looksee.adapter" do
   describe "#singleton_class?" do
     it "should return true if the object is a singleton class of an object" do
       object = (class << Object.new; self; end)
-      @adapter.singleton_class?(object).should be_true
+      @adapter.singleton_class?(object).should == true
     end
 
     it "should return true if the object is a singleton class of a class" do
       object = (class << Class.new; self; end)
-      @adapter.singleton_class?(object).should be_true
+      @adapter.singleton_class?(object).should == true
     end
 
     it "should return true if the object is a singleton class of a singleton class" do
       object = (class << (class << Class.new; self; end); self; end)
-      @adapter.singleton_class?(object).should be_true
+      @adapter.singleton_class?(object).should == true
     end
 
     it "should return false if the object is just a class" do
       object = Class.new
-      @adapter.singleton_class?(object).should be_false
+      @adapter.singleton_class?(object).should == false
     end
 
     it "should return false if the object is just a module" do
       object = Module.new
-      @adapter.singleton_class?(object).should be_false
+      @adapter.singleton_class?(object).should == false
     end
 
     it "should return false if the object is just an object" do
       object = Object.new
-      @adapter.singleton_class?(object).should be_false
+      @adapter.singleton_class?(object).should == false
     end
 
     it "should return false if the object is TrueClass" do
-      @adapter.singleton_class?(TrueClass).should be_false
+      @adapter.singleton_class?(TrueClass).should == false
     end
 
     it "should return false if the object is FalseClass" do
-      @adapter.singleton_class?(FalseClass).should be_false
+      @adapter.singleton_class?(FalseClass).should == false
     end
 
     it "should return false if the object is NilClass" do
-      @adapter.singleton_class?(NilClass).should be_false
+      @adapter.singleton_class?(NilClass).should == false
     end
   end
 
@@ -401,6 +401,16 @@ describe "Looksee.adapter" do
       end
     end
 
+    describe "for an included class of an unnamed module" do
+      it "should describe the object as 'unnamed Module'" do
+        klass = Class.new do
+          include Module.new
+        end
+        mod = @adapter.lookup_modules(klass.new)[1]
+        @adapter.describe_module(mod).should == 'unnamed Module'
+      end
+    end
+
     describe "for a singleton class of an object" do
       it "should describe the object in brackets" do
         begin

data/spec/looksee/clean_spec.rb

@@ -4,7 +4,7 @@ describe Looksee do
   describe ".[]" do
     before do
       @object = Object.new
-      Looksee.stub(:default_specifiers).and_return([:public, :overridden])
+      Looksee.stub(default_specifiers: [:public, :overridden])
     end
 
     it "should return an Inspector for the object's lookup path" do

data/spec/looksee/editor_spec.rb

@@ -65,11 +65,8 @@ describe Looksee::Editor do
       set_up_editor
 
       file, line = *source_location
-      FileUtils.touch file
-      Object.const_set(:C, Class.new { def f; end })
-      Looksee.adapter.set_methods(C, [:f], [], [], [])
-      Looksee.adapter.set_source_location(C, :f, source_location)
-      Looksee.adapter.ancestors[object] = [C, Object]
+      open(file, 'w') { |f| f.puts "class C\n  def f\n  end\nend" }
+      load file
     end
 
     after do
@@ -102,7 +99,7 @@ describe Looksee::Editor do
     end
 
     it "should raise NoSourceLocationError and not run the editor if no source location is available" do
-      Looksee.adapter.set_source_location(C, :f, nil)
+      Looksee.adapter.stub(source_location: nil)
       expect { editor.edit(object, :f) }.to raise_error(Looksee::NoSourceLocationError)
       editor_invocation.should be_nil
     end

data/spec/looksee/inspector_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Looksee::Inspector do
   include TemporaryClasses
+  use_test_adapter
 
   describe "#inspect" do
     before do

data/spec/looksee/lookup_path_spec.rb

@@ -4,6 +4,8 @@ describe Looksee::LookupPath do
   include TemporaryClasses
 
   describe "#entries" do
+    use_test_adapter
+
     before do
       temporary_module :M
       temporary_class(:C) { include M }
@@ -34,8 +36,8 @@ describe Looksee::LookupPath do
     end
 
     it "should know which methods have been overridden" do
-      @lookup_path.entries[0].overridden?('public1').should be_false
-      @lookup_path.entries[1].overridden?('public1').should be_true
+      @lookup_path.entries[0].overridden?('public1').should == false
+      @lookup_path.entries[1].overridden?('public1').should == true
     end
   end
 
@@ -43,10 +45,7 @@ describe Looksee::LookupPath do
     before do
       temporary_module(:M) { def f; end }
       temporary_class(:C) { include M; def f; end }
-      @object = Object.new
-      Looksee.adapter.ancestors[@object] = [C, M]
-      Looksee.adapter.set_methods(M, [:f], [], [], [])
-      Looksee.adapter.set_methods(C, [:f], [], [], [])
+      @object = C.new
     end
 
     it "should return the unoverridden UnboundMethod for the given method name" do
@@ -56,6 +55,14 @@ describe Looksee::LookupPath do
       method.name.should == (RUBY_VERSION < "1.9.0" ? 'f' : :f)
     end
 
+    it "should find methods in included modules" do
+      M.class_eval { def g; end }
+      lookup_path = Looksee::LookupPath.new(@object)
+      method = lookup_path.find('g')
+      method.owner.should == M
+      method.name.should == (RUBY_VERSION < "1.9.0" ? 'g' : :g)
+    end
+
     it "should return nil if the method does not exist" do
       lookup_path = Looksee::LookupPath.new(@object)
       lookup_path.find('g').should be_nil
@@ -63,8 +70,6 @@ describe Looksee::LookupPath do
 
     it "should return nil if the method has been undefined" do
       C.send(:undef_method, :f)
-      Looksee.adapter.public_methods[C].delete(:f)
-      Looksee.adapter.undefined_methods[C] << :f
       lookup_path = Looksee::LookupPath.new(@object)
       lookup_path.find('f').should be_nil
     end
@@ -73,11 +78,9 @@ describe Looksee::LookupPath do
   describe Looksee::LookupPath::Entry do
     it "should iterate over methods in alphabetical order" do
       temporary_class(:C)
-      @object = Object.new
-      Looksee.adapter.public_methods[C] = [:a, :c, :b]
-      Looksee.adapter.ancestors[@object] = [C]
+      @object = C.new
+      Looksee.adapter.stub(internal_public_instance_methods: [:a, :c, :b])
       @lookup_path = Looksee::LookupPath.new(@object)
-      @lookup_path.entries.size.should == 1
       @lookup_path.entries.first.map{|name, visibility| name}.should == ['a', 'b', 'c']
     end
   end

data/spec/spec_helper.rb

@@ -17,5 +17,13 @@ end
 NATIVE_ADAPTER = Looksee.adapter
 
 RSpec.configure do |config|
-  config.before { Looksee.adapter = TestAdapter.new }
+  config.extend TestAdapter::Mixin
+
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+
+  config.mock_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
 end

data/spec/support/test_adapter.rb

@@ -1,4 +1,11 @@
 class TestAdapter < Looksee::Adapter::Base
+  module Mixin
+    def use_test_adapter
+      before { Looksee.adapter = TestAdapter.new }
+      after { Looksee.adapter = NATIVE_ADAPTER }
+    end
+  end
+
   def lookup_modules(object)
     ancestors[object]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: looksee
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - George Ogata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: