did_you_mean 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5509e055c92a7ad119659c470aa4b5fc37ff80bb
-  data.tar.gz: 4211ac63c9d35021747789c742cae7a624ed724d
+  metadata.gz: e5f3bcb4803e10d0fc470b852daabeb13100378f
+  data.tar.gz: 1d0b43e694999ee1e512f5c55177e8d6e61538a1
 SHA512:
-  metadata.gz: 0ab6388979a7f5fd782549c69f9f4d12c615d2fa5d4356cbb78b3af04fac2e5c340a5a5fec8eda8ef456e2190b3339e98fcd1aae9b6158c93dbeaf2d483be908
-  data.tar.gz: d7d75f1f6e14ecd1da18ad7b53b4cbb89e9f2a087eaa2ee098c9e9c9f4c5e8bc391a755ad56b2b7412b3b93fb37fc89e61d8187e0bf965750cb7dbe5f7e479a0
+  metadata.gz: b62459e83c059e069c7a43a5e67161044757a636bcbb570205cf8bba3b1f21076e9e2843dbcc8030dc8c917297a1a9df4f6442456c6a7b0f6f903a24e677e51d
+  data.tar.gz: a921df196d4a1be1074660d7b6988bae7d81c460d82324bd1ca9201f9c3fa8b488b1682eaeaac856907eb045f801569958a13fffb5cdbd921ee1fafd49baa96f

data/Rakefile

@@ -4,28 +4,15 @@ def mri?
   defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby"
 end
 
-def jruby?
-  defined?(JRuby)
-end
-
 desc "run tests"
 task default: [:test]
 
-if mri? || jruby?
-  if mri?
-    require 'rake/extensiontask'
+if mri?
+  require 'rake/extensiontask'
 
-    Rake::ExtensionTask.new('did_you_mean') do |ext|
-      ext.name    = "method_missing"
-      ext.lib_dir = "lib/did_you_mean"
-    end
-  elsif jruby?
-    require 'rake/javaextensiontask'
-
-    Rake::JavaExtensionTask.new('did_you_mean') do |ext|
-      ext.name    = "receiver_capturer"
-      ext.lib_dir = "lib/did_you_mean"
-    end
+  Rake::ExtensionTask.new('did_you_mean') do |ext|
+    ext.name    = "method_missing"
+    ext.lib_dir = "lib/did_you_mean"
   end
 
   desc "Run tests"

data/ext/did_you_mean/extconf.rb

@@ -1,7 +1,2 @@
-case RUBY_ENGINE
-when 'ruby'
-  require 'mkmf'
-  create_makefile 'did_you_mean/method_missing'
-else
-  File.open("Makefile", "w") {|file| file.write "install:\n\t:\n" }
-end
+require 'mkmf'
+create_makefile 'did_you_mean/method_missing'

data/lib/did_you_mean.rb

@@ -2,6 +2,7 @@ require "interception"
 
 require "did_you_mean/version"
 require "did_you_mean/core_ext/name_error"
+require "did_you_mean/core_ext/no_method_error"
 require "did_you_mean/finders"
 
 module DidYouMean

data/lib/did_you_mean/core_ext/name_error.rb

@@ -9,7 +9,9 @@ class NameError
 
   def to_s_with_did_you_mean
     msg = original_message
-    msg << did_you_mean?.to_s if IGNORED_CALLERS.all? {|ignored| caller.first(8).grep(ignored).empty? }
+    bt  = caller.first(6)
+
+    msg << did_you_mean?.to_s if IGNORED_CALLERS.all? {|ignored| bt.grep(ignored).empty? }
     msg
   rescue
     original_message

data/lib/did_you_mean/core_ext/no_method_error.rb

@@ -0,0 +1,35 @@
+case RUBY_ENGINE
+when 'ruby'
+  require 'did_you_mean/method_missing'
+
+when 'jruby'
+  NoMethodError.class_eval do
+    def to_s
+      receiver unless defined?(@receiver)
+      super
+    end
+
+    def receiver
+      @receiver ||= begin
+        field = JRuby.reference(__message__).java_class.getDeclaredField("object")
+        field.setAccessible(true)
+        field.get(__message__)
+      rescue
+        super
+      end
+    end
+
+    private
+
+    if JRUBY_VERSION >= '9.0.0.0'
+      def __message__
+        JRuby.reference(self).getMessage
+      end
+    else
+      def __message__
+        error = JRuby.reference(self)
+        error.java_class.getField("message").get(error)
+      end
+    end
+  end
+end

data/lib/did_you_mean/finders/similar_method_finder.rb

@@ -28,18 +28,7 @@ module DidYouMean
     end
   end
 
-  if defined?(RUBY_ENGINE)
+  if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'jruby'
     finders["NoMethodError"] = SimilarMethodFinder
-
-    case RUBY_ENGINE
-    when 'ruby'
-      require 'did_you_mean/method_missing'
-    when 'jruby'
-      require 'did_you_mean/receiver_capturer'
-      org.yukinishijima.ReceiverCapturer.setup(JRuby.runtime)
-      NoMethodError.send(:attr, :receiver)
-    else
-      finders.delete("NoMethodError")
-    end
   end
 end

data/lib/did_you_mean/levenshtein.rb

@@ -12,11 +12,12 @@ module DidYouMean
       x = nil
 
       # to avoid duplicating an enumerable object, create it outside of the loop
-      str2_codepoint_enumerable = str2.each_codepoint
+      str2_codepoints = str2.codepoints.to_a
 
       str1.each_codepoint.with_index(1) do |char1, i|
-        str2_codepoint_enumerable.with_index do |char2, j|
-          cost = (char1 == char2) ? 0 : 1
+        j = 0
+        while j < m
+          cost = (char1 == str2_codepoints[j]) ? 0 : 1
           x = min3(
             d[j+1] + 1, # insertion
             i + 1,      # deletion
@@ -24,6 +25,8 @@ module DidYouMean
           )
           d[j] = i
           i = x
+
+          j += 1
         end
         d[m] = x
       end

data/lib/did_you_mean/version.rb

@@ -1,3 +1,3 @@
 module DidYouMean
-  VERSION = "0.9.8"
+  VERSION = "0.9.9"
 end

data/lib/did_you_mean/word_collection.rb

@@ -15,7 +15,10 @@ module DidYouMean
       target_word = target_word.to_s
       threshold   = threshold(target_word)
 
-      select {|word| Levenshtein.distance(word.to_s, target_word) <= threshold }
+      map {|word| [Levenshtein.distance(word.to_s, target_word), word] }
+        .select {|distance, _| distance <= threshold }
+        .sort
+        .map(&:last)
     end
 
     private

data/test/all_test.rb

@@ -1,4 +1,5 @@
 require_relative 'null_finder_test'
+require_relative 'word_collection_test'
 require_relative 'name_error_extension_test'
 require_relative 'similar_name_finder_test'
 

data/test/no_method_error_extension_test.rb

@@ -1,14 +1,38 @@
 require_relative 'test_helper'
 
 class NoMethodErrorExtensionTest < Minitest::Test
-  def setup
-    @receiver = "receiver"
-    @error = assert_raises(NoMethodError) do
-      @receiver.doesnt_exist
+  def test_receiver_with_string
+    receiver = "receiver"
+    error = assert_raises(NoMethodError) do
+      receiver.doesnt_exist
     end
+
+    assert_same receiver, error.receiver
+  end
+
+  def test_receiver_with_class
+    error = assert_raises(NoMethodError) do
+      Object.doesnt_exist
+    end
+
+    assert_same Object, error.receiver
   end
 
-  def test_receiver
-    assert_same @receiver, @error.receiver
+  def test_receiver_with_class_after_calling_to_s
+    error = assert_raises(NoMethodError) do
+      Object.doesnt_exist
+    end
+
+    error.to_s
+    assert_same Object, error.receiver
+  end
+
+  def test_receiver_with_class_after_calling_message
+    error = assert_raises(NoMethodError) do
+      Object.doesnt_exist
+    end
+
+    error.message
+    assert_same Object, error.receiver
   end
 end

data/test/word_collection_test.rb

@@ -0,0 +1,26 @@
+require_relative 'test_helper'
+
+class WordCollectionTest < Minitest::Test
+  def setup
+    names = %w(
+      name12
+      name123
+      name1234
+      name12345
+      name123456
+    )
+
+    @word_collection = DidYouMean::WordCollection.new(names)
+  end
+
+  def test_similar_to
+    expected = %w(
+      name123456
+      name12345
+      name1234
+      name123
+    )
+
+    assert_equal expected, @word_collection.similar_to("name123456")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: did_you_mean
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Yuki Nishijima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: interception
@@ -102,7 +102,6 @@ files:
 - doc/did_you_mean_example.png
 - ext/did_you_mean/extconf.rb
 - ext/did_you_mean/method_missing.c
-- ext/did_you_mean/org/yukinishijima/ReceiverCapturer.java
 - gemfiles/activerecord_32.gemfile
 - gemfiles/activerecord_40.gemfile
 - gemfiles/activerecord_41.gemfile
@@ -110,6 +109,7 @@ files:
 - gemfiles/activerecord_edge.gemfile
 - lib/did_you_mean.rb
 - lib/did_you_mean/core_ext/name_error.rb
+- lib/did_you_mean/core_ext/no_method_error.rb
 - lib/did_you_mean/finders.rb
 - lib/did_you_mean/finders/name_error_finders.rb
 - lib/did_you_mean/finders/name_error_finders/similar_class_finder.rb
@@ -117,7 +117,6 @@ files:
 - lib/did_you_mean/finders/similar_attribute_finder.rb
 - lib/did_you_mean/finders/similar_method_finder.rb
 - lib/did_you_mean/levenshtein.rb
-- lib/did_you_mean/receiver_capturer.jar
 - lib/did_you_mean/test_helper.rb
 - lib/did_you_mean/version.rb
 - lib/did_you_mean/word_collection.rb
@@ -130,6 +129,7 @@ files:
 - test/similar_method_finder_test.rb
 - test/similar_name_finder_test.rb
 - test/test_helper.rb
+- test/word_collection_test.rb
 homepage: https://github.com/yuki24/did_you_mean
 licenses:
 - MIT
@@ -164,3 +164,4 @@ test_files:
 - test/similar_method_finder_test.rb
 - test/similar_name_finder_test.rb
 - test/test_helper.rb
+- test/word_collection_test.rb

data/ext/did_you_mean/org/yukinishijima/ReceiverCapturer.java

@@ -1,57 +0,0 @@
-package org.yukinishijima;
-
-import org.jruby.anno.JRubyMethod;
-import org.jruby.exceptions.RaiseException;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.runtime.Block;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.Visibility;
-import org.jruby.Ruby;
-import org.jruby.RubyArray;
-import org.jruby.RubyException;
-import org.jruby.RubyModule;
-import org.jruby.RubyNoMethodError;
-import org.jruby.internal.runtime.methods.CallConfiguration;
-import org.jruby.internal.runtime.methods.DynamicMethod;
-import org.jruby.internal.runtime.methods.JavaMethod.JavaMethodNBlock;
-
-public class ReceiverCapturer extends JavaMethodNBlock {
-    private DynamicMethod methodMissingMethod;
-
-    public ReceiverCapturer(RubyModule implementationClass, DynamicMethod methodMissingMethod) {
-        super(implementationClass, Visibility.PRIVATE, CallConfiguration.FrameFullScopeNone);
-        this.methodMissingMethod = methodMissingMethod;
-    }
-
-    @Override
-    public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
-        try {
-            return this.methodMissingMethod.call(context, self, clazz, name, args, block);
-        } catch (RaiseException exception) {
-            appendReceiverToException(exception, self);
-            throw exception;
-        }
-    }
-
-    @JRubyMethod
-    public static void setup(Ruby runtime) {
-        RubyModule module = runtime.defineModule("Kernel");
-
-        DynamicMethod privateMethodMissing = runtime.getPrivateMethodMissing();
-        DynamicMethod protectedMethodMissing = runtime.getProtectedMethodMissing();
-        DynamicMethod superMethodMissing = runtime.getSuperMethodMissing();
-        DynamicMethod normalMethodMissing = runtime.getNormalMethodMissing();
-
-        runtime.setPrivateMethodMissing(new ReceiverCapturer(module, privateMethodMissing));
-        runtime.setProtectedMethodMissing(new ReceiverCapturer(module, protectedMethodMissing));
-        runtime.setSuperMethodMissing(new ReceiverCapturer(module, superMethodMissing));
-        runtime.setNormalMethodMissing(new ReceiverCapturer(module, normalMethodMissing));
-    }
-
-    private void appendReceiverToException(RaiseException exception, IRubyObject self) {
-        if (exception.getException() instanceof RubyNoMethodError) {
-            RubyNoMethodError noMethodError = (RubyNoMethodError) exception.getException();
-            noMethodError.setInstanceVariable("@receiver", self);
-        }
-    }
-}