did_you_mean 0.9.6-java → 0.9.9-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13329e71de97d9e4cda167360459805c0db8c76c
-  data.tar.gz: 9d7a6935356b77b99b37b8b05bcb41484a75884f
+  metadata.gz: a14f6d52030ffe8485f65b6dd385af94ea7d4ac5
+  data.tar.gz: 0141c3bf6c03e228e50183cf53f17249cce51816
 SHA512:
-  metadata.gz: acf487a2a5b82bd13dff01e93ed33167684ffbcf1695aaefb46a19ff37ab3608a26c306641262ccb15dc25c1d9c0da58f3f852d9da7c9cad92cc94988cf3da45
-  data.tar.gz: 4ca91bcb998eb4b39abc3e49b0c1f13962977cb374d92dbf8f39fae4febe08bde1aeb2a3d377d1d72eb37a3f5b2e8d021b877df74f19e5e8a99b04ccd4ef03fc
+  metadata.gz: 90654e5f54d4ee208b2c3cdd5e1aab61fddcba22fc65055a709ce54521c8f4f58e456092f5f087215bdce4ae730c13453c4748763c59604b40cd15a271669459
+  data.tar.gz: 981f2d3fd6db87e537bfdb44f1ca932065c342c2a059d2b62e65dfdc014e1014d9d24157763bbdb89afd9107c5d6fec59674280fdca6c2f6f0565876356f6ee0

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/did_you_mean.gemspec

@@ -12,16 +12,10 @@ Gem::Specification.new do |spec|
   spec.description   = '"did you mean?" experience in Ruby: the error message will tell you the right one when you misspelled something.'
   spec.homepage      = "https://github.com/yuki24/did_you_mean"
   spec.license       = "MIT"
-  spec.files         = `git ls-files`.split($/)
-
-  case RUBY_ENGINE
-  when 'ruby'
-    spec.extensions = ["ext/did_you_mean/extconf.rb"]
-  when 'jruby'
-    spec.platform = "java"
-    spec.files    << "lib/did_you_mean/receiver_capturer.jar"
-  end
 
+  spec.files         = `git ls-files`.split($/)
+  # spec.extensions    = ["ext/did_you_mean/extconf.rb"]
+  spec.platform      = 'java'
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/ext/did_you_mean/extconf.rb

@@ -1,3 +1,2 @@
 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

@@ -11,9 +11,13 @@ module DidYouMean
       d = (0..m).to_a
       x = nil
 
-      str1.each_char.with_index(1) do |char1, i|
-        str2.each_char.with_index do |char2, j|
-          cost = (char1 == char2) ? 0 : 1
+      # to avoid duplicating an enumerable object, create it outside of the loop
+      str2_codepoints = str2.codepoints.to_a
+
+      str1.each_codepoint.with_index(1) do |char1, i|
+        j = 0
+        while j < m
+          cost = (char1 == str2_codepoints[j]) ? 0 : 1
           x = min3(
             d[j+1] + 1, # insertion
             i + 1,      # deletion
@@ -21,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.6"
+  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.6
+  version: 0.9.9
 platform: java
 authors:
 - Yuki Nishijima
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: interception
@@ -101,7 +101,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
@@ -109,6 +108,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
@@ -116,7 +116,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
@@ -129,6 +128,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
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key:
 specification_version: 4
 summary: '"Did you mean?" experience in Ruby'
@@ -163,3 +163,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);
-        }
-    }
-}