did_you_mean 0.10.0 → 1.0.0.beta2

data/test/{word_collection_test.rb → spell_checker_test.rb}

@@ -1,40 +1,40 @@
 require 'test_helper'
 
-class FinderTest < Minitest::Test
+class SpellCheckerTest < Minitest::Test
   class WordCollection
-    include DidYouMean::BaseFinder
+    include DidYouMean::SpellCheckable
 
     def initialize(words)
       @words = words
     end
 
-    def similar_to(input, filter = EMPTY)
-      @suggestions, @input = nil, input
+    def similar_to(input)
+      @corrections, @input = nil, input
 
-      suggestions
+      corrections
     end
 
-    def searches
+    def candidates
       { @input => @words }
     end
   end
 
   def test_similar_to_corrects_mistypes
 
-    assert_suggestion 'foo',         collection('foo', 'fork')          .similar_to('doo')
-    assert_suggestion 'email',       collection('email', 'fail', 'eval').similar_to('meail')
-    assert_suggestion 'fail',        collection('email', 'fail', 'eval').similar_to('fial')
-    assert_suggestion 'fail',        collection('email', 'fail', 'eval').similar_to('afil')
-    assert_suggestion 'eval',        collection('email', 'fail', 'eval').similar_to('eavl')
-    assert_suggestion 'eval',        collection('email', 'fail', 'eval').similar_to('veal')
-    assert_suggestion 'sub!',        collection('sub', 'gsub', 'sub!')  .similar_to('suv!')
-    assert_suggestion 'sub',         collection('sub', 'gsub', 'sub!')  .similar_to('suv')
+    assert_correction 'foo',         collection('foo', 'fork')          .similar_to('doo')
+    assert_correction 'email',       collection('email', 'fail', 'eval').similar_to('meail')
+    assert_correction 'fail',        collection('email', 'fail', 'eval').similar_to('fial')
+    assert_correction 'fail',        collection('email', 'fail', 'eval').similar_to('afil')
+    assert_correction 'eval',        collection('email', 'fail', 'eval').similar_to('eavl')
+    assert_correction 'eval',        collection('email', 'fail', 'eval').similar_to('veal')
+    assert_correction 'sub!',        collection('sub', 'gsub', 'sub!')  .similar_to('suv!')
+    assert_correction 'sub',         collection('sub', 'gsub', 'sub!')  .similar_to('suv')
 
     assert_equal %w(gsub! gsub),     collection('sub', 'gsub', 'gsub!').similar_to('gsuv!')
     assert_equal %w(sub! sub gsub!), collection('sub', 'sub!', 'gsub', 'gsub!').similar_to('ssub!')
 
     group_methods = %w(groups group_url groups_url group_path)
-    assert_suggestion 'groups', collection(group_methods).similar_to('group')
+    assert_correction 'groups', collection(group_methods).similar_to('group')
 
     group_classes = %w(
       GroupMembership
@@ -47,8 +47,8 @@ class FinderTest < Minitest::Test
       NullGroupMembership
     )
 
-    #assert_suggestion 'GroupMembership',          collection(group_classes).similar_to('GroupMemberhip')
-    assert_suggestion 'GroupMembershipDecorator', collection(group_classes).similar_to('GroupMemberhipDecorator')
+    assert_correction 'GroupMembership',          collection(group_classes).similar_to('GroupMemberhip')
+    assert_correction 'GroupMembershipDecorator', collection(group_classes).similar_to('GroupMemberhipDecorator')
 
     names = %w(first_name_change first_name_changed? first_name_will_change!)
     assert_equal names, collection(names).similar_to('first_name_change!')
@@ -58,9 +58,9 @@ class FinderTest < Minitest::Test
   end
 
   def test_similar_to_corrects_misspells
-    assert_suggestion 'descendants',      collection('descendants')     .similar_to('dependents')
-    assert_suggestion 'drag_to',          collection('drag_to')         .similar_to('drag')
-    assert_suggestion 'set_result_count', collection('set_result_count').similar_to('set_result')
+    assert_correction 'descendants',      collection('descendants')     .similar_to('dependents')
+    assert_correction 'drag_to',          collection('drag_to')         .similar_to('drag')
+    assert_correction 'set_result_count', collection('set_result_count').similar_to('set_result')
   end
 
   def test_similar_to_sorts_results_by_simiarity

data/test/test_helper.rb

@@ -1,14 +1,11 @@
-NAME_ERROR = (___ rescue $!).class
-
 require 'minitest/autorun'
 require 'minitest/unit'
 require 'did_you_mean'
 
-begin
-  MiniTest::Test
-rescue NameError
-  MiniTest::Test = MiniTest::Unit::TestCase
+module DidYouMean::TestHelper
+  def assert_correction(expected, array)
+    assert_equal [expected], array, "Expected #{array.inspect} to only include #{expected.inspect}"
+  end
 end
 
-require 'did_you_mean/test_helper'
-MiniTest::Test.send :include, DidYouMean::TestHelper
+MiniTest::Test.include(DidYouMean::TestHelper)

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: did_you_mean
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Yuki Nishijima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: interception
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -85,8 +57,7 @@ description: '"did you mean?" experience in Ruby: the error message will tell yo
 email:
 - mail@yukinishijima.net
 executables: []
-extensions:
-- ext/did_you_mean/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -108,31 +79,26 @@ files:
 - evaluation/calculator.rb
 - evaluation/dictionary_generator.rb
 - evaluation/incorrect_words.yaml
-- ext/did_you_mean/extconf.rb
-- ext/did_you_mean/method_receiver.c
 - 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/core_ext/rubinius.rb
-- lib/did_you_mean/finders.rb
-- lib/did_you_mean/finders/method_finder.rb
-- lib/did_you_mean/finders/name_error_finders.rb
-- lib/did_you_mean/finders/name_error_finders/class_finder.rb
-- lib/did_you_mean/finders/name_error_finders/name_finder.rb
 - lib/did_you_mean/formatter.rb
 - lib/did_you_mean/jaro_winkler.rb
 - lib/did_you_mean/levenshtein.rb
-- lib/did_you_mean/test_helper.rb
+- lib/did_you_mean/spell_checkable.rb
+- lib/did_you_mean/spell_checkers/method_name_checker.rb
+- lib/did_you_mean/spell_checkers/name_error_checkers.rb
+- lib/did_you_mean/spell_checkers/name_error_checkers/class_name_checker.rb
+- lib/did_you_mean/spell_checkers/name_error_checkers/variable_name_checker.rb
+- lib/did_you_mean/spell_checkers/null_checker.rb
 - lib/did_you_mean/version.rb
 - test/core_ext/name_error_extension_test.rb
-- test/core_ext/no_method_error_extension_test.rb
 - test/correctable/class_name_test.rb
 - test/correctable/method_name_test.rb
 - test/correctable/uncorrectable_name_test.rb
 - test/correctable/variable_name_test.rb
 - test/edit_distance/jaro_winkler_test.rb
+- test/spell_checker_test.rb
 - test/test_helper.rb
-- test/word_collection_test.rb
 homepage: https://github.com/yuki24/did_you_mean
 licenses:
 - MIT
@@ -145,25 +111,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.3.0dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: '"Did you mean?" experience in Ruby'
 test_files:
 - test/core_ext/name_error_extension_test.rb
-- test/core_ext/no_method_error_extension_test.rb
 - test/correctable/class_name_test.rb
 - test/correctable/method_name_test.rb
 - test/correctable/uncorrectable_name_test.rb
 - test/correctable/variable_name_test.rb
 - test/edit_distance/jaro_winkler_test.rb
+- test/spell_checker_test.rb
 - test/test_helper.rb
-- test/word_collection_test.rb

data/ext/did_you_mean/extconf.rb

@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile 'did_you_mean/method_receiver'

data/ext/did_you_mean/method_receiver.c

@@ -1,20 +0,0 @@
-#include <ruby.h>
-
-static const rb_data_type_t *type;
-
-static VALUE
-name_err_receiver(VALUE self)
-{
-  VALUE *ptr, mesg = rb_attr_get(self, rb_intern("mesg"));
-  TypedData_Get_Struct(mesg, VALUE, type, ptr);
-  return ptr[1];
-}
-
-void
-Init_method_receiver()
-{
-  VALUE err_mesg = rb_funcall(rb_cNameErrorMesg, '!', 3, Qnil, Qnil, Qnil);
-  type = RTYPEDDATA(err_mesg)->type;
-
-  rb_define_method(rb_eNameError, "receiver", name_err_receiver, 0);
-}

data/lib/did_you_mean/core_ext/no_method_error.rb

@@ -1,46 +0,0 @@
-case RUBY_ENGINE
-when 'ruby'
-  name_error = begin
-    raise_name_error
-  rescue NameError => e
-    e
-  end
-
-  unless name_error.respond_to?(:receiver)
-    require 'did_you_mean/method_receiver'
-  end
-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
-        nil
-      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
-
-when 'rbx'
-  require 'did_you_mean/core_ext/rubinius'
-  NoMethodError.class_eval { attr_reader :receiver }
-end

data/lib/did_you_mean/core_ext/rubinius.rb

@@ -1,16 +0,0 @@
-if defined?(Rubinius)
-  class << Rubinius
-    alias raise_with_no_receiver_capturer raise_exception
-
-    def raise_exception(exc)
-      if exc.is_a?(NoMethodError)
-        bt = Rubinius::VM.backtrace(0, true).detect do |x|
-          x.method.name == :method_missing
-        end
-        exc.instance_variable_set(:@receiver, bt.variables.self) if bt
-      end
-
-      raise_with_no_receiver_capturer(exc)
-    end
-  end
-end

data/lib/did_you_mean/finders/method_finder.rb

@@ -1,62 +0,0 @@
-module DidYouMean
-  class MethodFinder
-    include BaseFinder
-    attr_reader :method_name, :receiver
-
-    def initialize(exception)
-      @method_name = exception.name
-      @receiver    = exception.receiver
-      @binding     = exception.frame_binding
-      @location    = exception.backtrace.first
-      @ivar_names  = NameFinder.new(exception).ivar_names
-    end
-
-    def searches
-      {
-        method_name        => method_names,
-        receiver_name.to_s => @ivar_names
-      }
-    end
-
-    def method_names
-      method_names = receiver.methods + receiver.singleton_methods
-      method_names += receiver.private_methods if receiver.equal?(@binding.eval("self"))
-      method_names.delete(method_name)
-      method_names.uniq!
-      method_names
-    end
-
-    def receiver_name
-      return unless @receiver.nil?
-
-      abs_path, lineno, label =
-        /(.*):(.*):in `(.*)'/ =~ @location && [$1, $2.to_i, $3]
-
-      line =
-        case abs_path
-        when "(irb)"
-          Readline::HISTORY.to_a.last
-        when "(pry)"
-          ::Pry.history.to_a.last
-        else
-          File.open(abs_path) do |file|
-            file.detect { file.lineno == lineno }
-          end if File.exist?(abs_path)
-        end
-
-      /@(\w+)*\.#{@method_name}/ =~ line.to_s && $1
-    end
-  end
-
-  if RUBY_ENGINE == 'rbx'
-    module MethodFinder::RubiniusSupport
-      def self.new(exception)
-        if exception.receiver === exception.frame_binding.eval("self")
-          NameErrorFinders.new(exception)
-        else
-          MethodFinder.new(exception)
-        end
-      end
-    end
-  end
-end

data/lib/did_you_mean/finders/name_error_finders/name_finder.rb

@@ -1,18 +0,0 @@
-module DidYouMean
-  class NameFinder
-    include BaseFinder
-    attr_reader :name, :method_names, :lvar_names, :ivar_names, :cvar_names
-
-    def initialize(exception)
-      @name         = exception.name.to_s.tr(AT, EMPTY)
-      @lvar_names   = exception.frame_binding.eval("local_variables")
-      @method_names = exception.frame_binding.eval("methods + private_methods")
-      @cvar_names   = exception.frame_binding.eval("self.class.class_variables")
-      @ivar_names   = exception.frame_binding.eval("instance_variables")
-    end
-
-    def searches
-      {name => (lvar_names + method_names + ivar_names + cvar_names)}
-    end
-  end
-end

data/lib/did_you_mean/test_helper.rb

@@ -1,7 +0,0 @@
-module DidYouMean
-  module TestHelper
-    def assert_suggestion(expected, array)
-      assert_equal [expected], array, "Expected #{array.inspect} to only include #{expected.inspect}"
-    end
-  end
-end

data/test/core_ext/no_method_error_extension_test.rb

@@ -1,38 +0,0 @@
-require 'test_helper'
-
-class NoMethodErrorExtensionTest < Minitest::Test
-  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_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