did_you_mean 1.1.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70f21af56b6f4e14b5c5984d3ce5180a779c81c9
-  data.tar.gz: 1f73d774f056a90eadace8401876b6f35ea54177
+  metadata.gz: 412c345b8350b7d64bcbcf09ea72178bce0fdb02
+  data.tar.gz: 4918c2d1c307b4d30d9b00178d5e62e932b0b042
 SHA512:
-  metadata.gz: 17fbd60b5fd5a951b241b1b0277b1888c3495849825fd699dd1da24a8ac9b4b0a7366505f3584a3a41c125e785b6be556ae0a7f736168e39cb3b6d6b36a3cfa5
-  data.tar.gz: 6a63b180eb98df8cfd4c59c209e9ff676d07e80b548d3d07c05e5e619cacd2725097d9f3da0037b34b517fcedb6c605229c0c4ab5c4fd68a68f124e03d85e9c1
+  metadata.gz: ab04de77990d06fe206dbc98424e812d8cdf94df29ec472c30624e3738a2ea9eb9e5b67f931c09a70baf05fb84854ceefbf4d00d03ada0e05cdefa47aa73a5ad
+  data.tar.gz: db122760d256332aac2626d3b438e0ed25a33833e9390bfc06ce6fee4ca5623027485315521da541eebafd193c25b251962b92c7a95a0799f5d8925de2010a1b

data/.ruby-version

@@ -1 +1 @@
-2.4.0-dev
+2.4.1

data/.travis.yml

@@ -11,4 +11,5 @@ after_success:
   - bundle exec rake benchmark:memory
 
 rvm:
+  - 2.4.0
   - ruby-head

data/did_you_mean.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.4.0dev'
+  spec.required_ruby_version = '>= 2.4.0'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/did_you_mean/core_ext/name_error.rb

@@ -10,18 +10,21 @@ module DidYouMean
       msg = super.dup
       bt  = caller(1, 6)
 
-      msg << Formatter.new(corrections).to_s if IGNORED_CALLERS.all? {|ignored| bt.grep(ignored).empty? }
+      if IGNORED_CALLERS.all? {|ignored| bt.grep(ignored).empty? } && (!cause.respond_to?(:corrections) || cause.corrections.empty?)
+        msg << Formatter.new(corrections).to_s
+      end
+
       msg
     rescue
       super
     end
 
     def corrections
-      spell_checker.corrections
+      @corrections ||= spell_checker.corrections
     end
 
     def spell_checker
-      @spell_checker ||= SPELL_CHECKERS[self.class.to_s].new(self)
+      SPELL_CHECKERS[self.class.to_s].new(self)
     end
   end
 end

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

@@ -6,11 +6,14 @@ module DidYouMean
     attr_reader :class_name
 
     def initialize(exception)
-      @class_name, @receiver = exception.name, exception.receiver
+      @class_name, @receiver, @original_message = exception.name, exception.receiver, exception.original_message
     end
 
     def corrections
-      @corrections ||= SpellChecker.new(dictionary: class_names).correct(class_name).map(&:full_name)
+      @corrections ||= SpellChecker.new(dictionary: class_names)
+                         .correct(class_name)
+                         .map(&:full_name)
+                         .reject {|qualified_name| @original_message.include?(qualified_name) }
     end
 
     def class_names

data/lib/did_you_mean/version.rb

@@ -1,3 +1,3 @@
 module DidYouMean
-  VERSION = "1.1.0"
+  VERSION = "1.1.3"
 end

data/test/core_ext/name_error_extension_test.rb

@@ -20,7 +20,7 @@ class NameErrorExtensionTest < Minitest::Test
 
   def test_message
     message = <<~MESSAGE.chomp
-      undefined local variable or method `doesnt_exist' for #{method(:to_s).super_method.call}
+      undefined local variable or method `doesnt_exist' for #{to_s}
       Did you mean?  does_exist
     MESSAGE
 
@@ -36,6 +36,18 @@ class NameErrorExtensionTest < Minitest::Test
     error.to_s
     assert_equal 1, error.to_s.scan("Did you mean?").count
   end
+
+  def test_correctable_error_objects_are_dumpable
+   error = begin
+             File.open('./tmp/.keep').sizee
+           rescue NoMethodError => e
+             e
+           end
+
+   error.to_s
+
+   assert_equal "undefined method `sizee' for #<File:./tmp/.keep>", Marshal.load(Marshal.dump(error)).original_message
+  end
 end
 
 class IgnoreCallersTest < Minitest::Test

data/test/edit_distance/jaro_winkler_test.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 require 'test_helper'
 
 class JaroWinklerTest < Minitest::Test

data/test/fixtures/book.rb

@@ -0,0 +1,4 @@
+class Book
+  class Cover
+  end
+end

data/test/spell_checking/class_name_test.rb

@@ -62,4 +62,16 @@ class ClassNameTest < Minitest::Test
     error = assert_raises(NameError) { ::Book::Page.new.tableof_contents }
     assert_correction "Book::TableOfContents", error.corrections
   end
+
+  def test_does_not_suggest_user_input
+    error = assert_raises(NameError) { ::Book::Cover }
+
+    # This is a weird require, but in a multi-threaded condition, a constant may
+    # be loaded between when a NameError occurred and when the spell checker
+    # attemps to find a possible suggestion. The manual require here simulates
+    # a race condition a single test.
+    require_relative '../fixtures/book'
+
+    assert_empty error.corrections
+  end
 end

data/test/spell_checking/method_name_test.rb

@@ -9,6 +9,12 @@ class MethodNameTest < Minitest::Test
       raiae NoMethodError
     end
 
+    def raise_no_method_error
+      self.firstname
+    rescue NoMethodError => e
+      raise e, e.message, e.backtrace
+    end
+
     protected
     def the_protected_method; end
 
@@ -86,4 +92,28 @@ class MethodNameTest < Minitest::Test
   ensure
     NilClass.class_eval { undef empty? }
   end
+
+  def test_does_not_append_suggestions_twice
+    error = assert_raises NoMethodError do
+      begin
+        @user.firstname
+      rescue NoMethodError => e
+        raise e, e.message, e.backtrace
+      end
+    end
+
+    assert_equal 1, error.to_s.scan(/Did you mean/).count
+  end
+
+  def test_does_not_append_suggestions_three_times
+    error = assert_raises NoMethodError do
+      begin
+        @user.raise_no_method_error
+      rescue NoMethodError => e
+        raise e, e.message, e.backtrace
+      end
+    end
+
+    assert_equal 1, error.to_s.scan(/Did you mean/).count
+  end
 end

data/test/verbose_formatter_test.rb

@@ -8,7 +8,7 @@ class VerboseFormatterTest < Minitest::Test
 
   def test_message
     assert_equal <<~MESSAGE.chomp, @error.message
-      undefined local variable or method `doesnt_exist' for #{method(:to_s).super_method.call}
+      undefined local variable or method `doesnt_exist' for #{to_s}
 
           Did you mean? does_exist
        

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: did_you_mean
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.3
 platform: ruby
 authors:
 - Yuki Nishijima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2019-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,6 +100,7 @@ files:
 - test/experimental/initializer_name_correction_test.rb
 - test/experimental/key_error_test.rb
 - test/experimental/method_name_checker_test.rb
+- test/fixtures/book.rb
 - test/spell_checker_test.rb
 - test/spell_checking/class_name_test.rb
 - test/spell_checking/method_name_test.rb
@@ -107,6 +108,7 @@ files:
 - test/spell_checking/variable_name_test.rb
 - test/test_helper.rb
 - test/verbose_formatter_test.rb
+- tmp/.keep
 homepage: https://github.com/yuki24/did_you_mean
 licenses:
 - MIT
@@ -119,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0dev
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -127,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: '"Did you mean?" experience in Ruby'
@@ -137,6 +139,7 @@ test_files:
 - test/experimental/initializer_name_correction_test.rb
 - test/experimental/key_error_test.rb
 - test/experimental/method_name_checker_test.rb
+- test/fixtures/book.rb
 - test/spell_checker_test.rb
 - test/spell_checking/class_name_test.rb
 - test/spell_checking/method_name_test.rb