did_you_mean 1.0.0.beta3 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad488ff1d9e183f4789342bedca9e195be934b6a
-  data.tar.gz: 755225707c5e7ef906bba989dad41d4130c8b410
+  metadata.gz: 60c129eec72ca04e09a5f0514c53156b27f309e2
+  data.tar.gz: c0f1132a91404efafe5919a9144eda26a779d7be
 SHA512:
-  metadata.gz: ecb0285487ed45ff04f470581b621a0d50681b62d6b4c099e04139b1082ca9ed92373bc3d2a6f1b4207172dfa62b90b112bd7df0d782ab43ffb4b0741608250a
-  data.tar.gz: 43ef649c7a45e82492938bf3ed90dad0c02337eb40f1873986cdd8bca8dc0c4b170495f277eed7b6b018f82f36f1ca954b46ecd8e5fc7cb6f16845665f7251c8
+  metadata.gz: 34f6395d7a241ab9bc18aac2292ea59a4677bfffc44d6ed57db26b0c72cb91f5abfe9945a8bc86c89de29144e6d571218fa249c0de51a5a264069a2fd63b622f
+  data.tar.gz: 8732e1821ba7d7834b90e58f77d094ba3caf36093a21f9aba37bf64e4c0c14fabab01eff7be5c1325a59bf3b29a79a3aa252556789763975bb4e4602b00ae52b

data/lib/did_you_mean/core_ext/name_error.rb

@@ -1,7 +1,6 @@
 module DidYouMean
   module Correctable
     prepend_features NameError
-    attr_reader :frame_binding
 
     def original_message
       method(:to_s).super_method.call

data/lib/did_you_mean/spell_checkers/method_name_checker.rb

@@ -3,50 +3,56 @@ module DidYouMean
     include SpellCheckable
     attr_reader :method_name, :receiver
 
-    REPLS = {
-      "(irb)" => -> { Readline::HISTORY.to_a.last }
-    }
-
     def initialize(exception)
       @method_name = exception.name
       @receiver    = exception.receiver
-      @binding     = exception.frame_binding
-      @location    = exception.backtrace_locations.first
-      @ivar_names  = @binding.receiver.instance_variables
     end
 
     def candidates
-      {
-        method_name        => method_names,
-        receiver_name.to_s => @ivar_names
-      }
+      { method_name => method_names }
     end
 
     def method_names
-      method_names = receiver.methods + receiver.singleton_methods
-      method_names += receiver.private_methods if receiver.equal?(@binding.receiver)
+      method_names = receiver.methods + receiver.singleton_methods + receiver.private_methods
       method_names.delete(method_name)
       method_names.uniq!
       method_names
     end
 
-    def receiver_name
-      return unless @receiver.nil?
+    module IvarNameCorrectable
+      REPLS = {
+        "(irb)" => -> { Readline::HISTORY.to_a.last }
+      }
 
-      abs_path = @location.absolute_path
-      lineno   = @location.lineno
+      def initialize(exception)
+        super
 
-      /@(\w+)*\.#{@method_name}/ =~ line(abs_path, lineno).to_s && $1
-    end
+        @location   = exception.backtrace_locations.first
+        @ivar_names = exception.instance_variable_get(:@frame_binding).receiver.instance_variables
+      end
 
-    private
+      def candidates
+        super.merge(receiver_name.to_s => @ivar_names)
+      end
+
+      private
+
+      def receiver_name
+        return unless receiver.nil?
+
+        abs_path = @location.absolute_path
+        lineno   = @location.lineno
+
+        /@(\w+)*\.#{method_name}/ =~ line(abs_path, lineno).to_s && $1
+      end
 
-    def line(abs_path, lineno)
-      if REPLS[abs_path]
-        REPLS[abs_path].call
-      elsif File.exist?(abs_path)
-        File.open(abs_path) do |file|
-          file.detect { file.lineno == lineno }
+      def line(abs_path, lineno)
+        if REPLS[abs_path]
+          REPLS[abs_path].call
+        elsif File.exist?(abs_path)
+          File.open(abs_path) do |file|
+            file.detect { file.lineno == lineno }
+          end
         end
       end
     end

data/lib/did_you_mean/spell_checkers/name_error_checkers/variable_name_checker.rb

@@ -7,12 +7,13 @@ module DidYouMean
 
     def initialize(exception)
       @name       = exception.name.to_s.tr("@", "")
-      @lvar_names = exception.frame_binding.local_variables
-      receiver    = exception.frame_binding.receiver
+      @lvar_names = exception.local_variables
+      receiver    = exception.receiver
 
       @method_names = receiver.methods + receiver.private_methods
-      @cvar_names   = receiver.class.class_variables
       @ivar_names   = receiver.instance_variables
+      @cvar_names   = receiver.class.class_variables
+      @cvar_names  += receiver.class_variables if receiver.kind_of?(Module)
     end
 
     def candidates

data/lib/did_you_mean/version.rb

@@ -1,3 +1,3 @@
 module DidYouMean
-  VERSION = "1.0.0.beta3"
+  VERSION = "1.0.0.rc1"
 end

data/lib/did_you_mean.rb

@@ -9,14 +9,13 @@ require 'did_you_mean/spell_checkers/null_checker'
 require "did_you_mean/formatter"
 
 module DidYouMean
-  @@trace = TracePoint.new(:raise) do |tp|
+  TRACE = TracePoint.new(:raise) do |tp|
     e = tp.raised_exception
 
     if SPELL_CHECKERS.include?(e.class.to_s) && !e.instance_variable_defined?(:@frame_binding)
       e.instance_variable_set(:@frame_binding, tp.binding)
     end
   end
-  @@trace.enable
 
   IGNORED_CALLERS = []
 

data/test/correctable/method_name_test.rb

@@ -72,7 +72,13 @@ class MethodNameTest < Minitest::Test
     assert_match "Did you mean?  raise", error.to_s
   end
 
+  D = DidYouMean
+  M = D::MethodNameChecker
+
   def test_corrects_incorrect_ivar_name
+    D::TRACE.enable
+    D::SPELL_CHECKERS['NoMethodError'] = M.dup.prepend(M::IvarNameCorrectable)
+
     @number = 1
     @nubmer = nil
     error = assert_raises(NoMethodError) { @nubmer.zero? }
@@ -80,5 +86,8 @@ class MethodNameTest < Minitest::Test
 
     assert_correction :@number, error.corrections
     assert_match "Did you mean?  @number", error.to_s
+  ensure
+    D::TRACE.disable
+    D::SPELL_CHECKERS['NoMethodError'] = M
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: did_you_mean
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta3
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Yuki Nishijima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler