did_you_mean 1.0.0.beta2 → 1.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b34cbc0ccdd5f3ad3b8edce86667a3cc74b5378
-  data.tar.gz: 876c524186e3e5874bd5e481e18aaa94287dad63
+  metadata.gz: ad488ff1d9e183f4789342bedca9e195be934b6a
+  data.tar.gz: 755225707c5e7ef906bba989dad41d4130c8b410
 SHA512:
-  metadata.gz: 76ad432f1fe5a9d346d415a5c09b47f7563c4e176a8b522272a426b7baabbf38b149cfad7c7bf846a991f7599e535a9c6781d8661a7c65f09a638f84edb298e0
-  data.tar.gz: 8b52260010d946d8e341a11cf0969570e3c590da11f65d3c7f920a418714b382e6da7acb30e398ddc55727cee848135c42b338caafd0aced87766357f22b1061
+  metadata.gz: ecb0285487ed45ff04f470581b621a0d50681b62d6b4c099e04139b1082ca9ed92373bc3d2a6f1b4207172dfa62b90b112bd7df0d782ab43ffb4b0741608250a
+  data.tar.gz: 43ef649c7a45e82492938bf3ed90dad0c02337eb40f1873986cdd8bca8dc0c4b170495f277eed7b6b018f82f36f1ca954b46ecd8e5fc7cb6f16845665f7251c8

data/benchmark/memory_usage.rb

@@ -1,3 +1,5 @@
+# -*- frozen-string-literal: true -*-
+
 require 'memory_profiler'
 require 'did_you_mean'
 
@@ -12,7 +14,7 @@ class DidYouMean::WordCollection
     @words = words
   end
 
-  def similar_to(input, filter = EMPTY)
+  def similar_to(input, filter = '')
     @corrections, @input = nil, input
     corrections
   end

data/evaluation/calculator.rb

@@ -1,3 +1,5 @@
+# -*- frozen-string-literal: true -*-
+
 require 'benchmark'
 
 def report(message, &block)
@@ -44,7 +46,7 @@ report "loading program" do
       @words = words
     end
 
-    def similar_to(input, filter = EMPTY)
+    def similar_to(input, filter = '')
       @corrections, @input = nil, input
       corrections
     end
@@ -60,7 +62,7 @@ end
 
 report "loading dictionary" do
   yaml = open("evaluation/dictionary.yml").read
-  yaml = YAML.load(yaml).map{|word| word.downcase.tr(" ".freeze, "_".freeze) }
+  yaml = YAML.load(yaml).map{|word| word.downcase.tr(" ", "_") }
 
   DICTIONARY = Set.new(yaml)
 end
@@ -92,8 +94,8 @@ report "calculating accuracy" do
         correct_count += 1
       else
         words_not_corrected << {
-          correct         => incorrect,
-          'result'.freeze => corrections
+          correct  => incorrect,
+          'result' => corrections
         }
       end
     end

data/lib/did_you_mean.rb

@@ -10,10 +10,10 @@ require "did_you_mean/formatter"
 
 module DidYouMean
   @@trace = TracePoint.new(:raise) do |tp|
-    e, b = tp.raised_exception, tp.binding
+    e = tp.raised_exception
 
     if SPELL_CHECKERS.include?(e.class.to_s) && !e.instance_variable_defined?(:@frame_binding)
-      e.instance_variable_set(:@frame_binding, b)
+      e.instance_variable_set(:@frame_binding, tp.binding)
     end
   end
   @@trace.enable

data/lib/did_you_mean/formatter.rb

@@ -1,3 +1,5 @@
+# -*- frozen-string-literal: true -*-
+
 module DidYouMean
   class Formatter
     def initialize(corrections = [])
@@ -5,10 +7,10 @@ module DidYouMean
     end
 
     def to_s
-      return "".freeze if @corrections.empty?
+      return "" if @corrections.empty?
 
-      output = "\nDid you mean?  "
-      output << @corrections.join("\n" << ' '.freeze * 15)
+      output = "\nDid you mean?  ".dup
+      output << @corrections.join("\n               ")
     end
   end
 end

data/lib/did_you_mean/spell_checkable.rb

@@ -1,11 +1,10 @@
+# -*- frozen-string-literal: true -*-
+
 require "did_you_mean/levenshtein"
 require "did_you_mean/jaro_winkler"
 
 module DidYouMean
   module SpellCheckable
-    AT    = "@".freeze
-    EMPTY = "".freeze
-
     def corrections
       @corrections ||= candidates.flat_map do |input, candidates|
         input     = normalize(input)
@@ -47,7 +46,7 @@ module DidYouMean
             end
 
       str.downcase!
-      str.tr!(AT, EMPTY)
+      str.tr!("@", "")
       str
     end
   end

data/lib/did_you_mean/spell_checkers/method_name_checker.rb

@@ -12,7 +12,7 @@ module DidYouMean
       @receiver    = exception.receiver
       @binding     = exception.frame_binding
       @location    = exception.backtrace_locations.first
-      @ivar_names  = VariableNameChecker.new(exception).ivar_names
+      @ivar_names  = @binding.receiver.instance_variables
     end
 
     def candidates

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

@@ -1,50 +1,41 @@
+# -*- frozen-string-literal: true -*-
 require 'delegate'
 
 module DidYouMean
   class ClassNameChecker
     include SpellCheckable
-    attr_reader :class_name, :original_message
+    attr_reader :class_name
 
     def initialize(exception)
-      @class_name, @original_message = exception.name, exception.original_message
+      @class_name, @receiver = exception.name, exception.receiver
     end
 
     def candidates
-      {name_from_message => class_names}
+      {class_name => class_names}
     end
 
     def class_names
       scopes.flat_map do |scope|
         scope.constants.map do |c|
-          ClassName.new(c, scope == Object ? EMPTY : "#{scope}::")
+          ClassName.new(c, scope == Object ? "" : "#{scope}::")
         end
       end
     end
 
-    def name_from_message
-      class_name || /([A-Z]\w*$)/.match(original_message)[0]
-    end
-
     def corrections
       super.map(&:full_name)
     end
 
     def scopes
-      @scopes ||= scope_base.inject([Object]) do |_scopes, scope|
+      @scopes ||= @receiver.to_s.split("::").inject([Object]) do |_scopes, scope|
         _scopes << _scopes.last.const_get(scope)
-      end
-    end
-
-    private
-
-    def scope_base
-      @scope_base ||= (/(([A-Z]\w*::)*)([A-Z]\w*)$/ =~ original_message ? $1 : EMPTY).split("::")
+      end.uniq
     end
 
     class ClassName < SimpleDelegator
       attr :namespace
 
-      def initialize(name, namespace = ''.freeze)
+      def initialize(name, namespace = '')
         super(name)
         @namespace = namespace
       end

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

@@ -1,10 +1,12 @@
+# -*- frozen-string-literal: true -*-
+
 module DidYouMean
   class VariableNameChecker
     include SpellCheckable
     attr_reader :name, :method_names, :lvar_names, :ivar_names, :cvar_names
 
     def initialize(exception)
-      @name       = exception.name.to_s.tr(AT, EMPTY)
+      @name       = exception.name.to_s.tr("@", "")
       @lvar_names = exception.frame_binding.local_variables
       receiver    = exception.frame_binding.receiver
 

data/lib/did_you_mean/version.rb

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

data/test/core_ext/name_error_extension_test.rb

@@ -29,7 +29,7 @@ class NameErrorExtensionTest < Minitest::Test
 
   def test_to_s_does_not_make_disruptive_changes_to_error_message
     error = assert_raises(NameError) do
-      raise NameError, "uninitialized constant Object".freeze
+      raise NameError, "uninitialized constant Object"
     end
 
     assert_equal 1, error.to_s.scan("Did you mean?").count

data/test/spell_checker_test.rb

@@ -1,40 +1,29 @@
 require 'test_helper'
 
 class SpellCheckerTest < Minitest::Test
-  class WordCollection
+  SpellChecker = Struct.new(:input, :words) do
     include DidYouMean::SpellCheckable
 
-    def initialize(words)
-      @words = words
-    end
-
-    def similar_to(input)
-      @corrections, @input = nil, input
-
-      corrections
-    end
-
     def candidates
-      { @input => @words }
+      { input => words }
     end
   end
 
   def test_similar_to_corrects_mistypes
-
-    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!')
+    assert_spell 'foo',   input: 'doo',   dictionary: ['foo', 'fork']
+    assert_spell 'email', input: 'meail', dictionary: ['email', 'fail', 'eval']
+    assert_spell 'fail',  input: 'fial',  dictionary: ['email', 'fail', 'eval']
+    assert_spell 'fail',  input: 'afil',  dictionary: ['email', 'fail', 'eval']
+    assert_spell 'eval',  input: 'eavl',  dictionary: ['email', 'fail', 'eval']
+    assert_spell 'eval',  input: 'veal',  dictionary: ['email', 'fail', 'eval']
+    assert_spell 'sub!',  input: 'suv!',  dictionary: ['sub', 'gsub', 'sub!']
+    assert_spell 'sub',   input: 'suv',   dictionary: ['sub', 'gsub', 'sub!']
+
+    assert_equal %w(gsub! gsub),     SpellChecker.new('gsuv!', %w(sub gsub gsub!)).corrections
+    assert_equal %w(sub! sub gsub!), SpellChecker.new('ssub!', %w(sub sub! gsub gsub!)).corrections
 
     group_methods = %w(groups group_url groups_url group_path)
-    assert_correction 'groups', collection(group_methods).similar_to('group')
+    assert_spell 'groups', input: 'group',  dictionary: group_methods
 
     group_classes = %w(
       GroupMembership
@@ -47,20 +36,20 @@ class SpellCheckerTest < Minitest::Test
       NullGroupMembership
     )
 
-    assert_correction 'GroupMembership',          collection(group_classes).similar_to('GroupMemberhip')
-    assert_correction 'GroupMembershipDecorator', collection(group_classes).similar_to('GroupMemberhipDecorator')
+    assert_spell 'GroupMembership',          dictionary: group_classes, input: 'GroupMemberhip'
+    assert_spell 'GroupMembershipDecorator', dictionary: group_classes, input: 'GroupMemberhipDecorator'
 
     names = %w(first_name_change first_name_changed? first_name_will_change!)
-    assert_equal names, collection(names).similar_to('first_name_change!')
+    assert_equal names, SpellChecker.new('first_name_change!', names).corrections
 
-    assert_empty collection('proc').similar_to 'product_path'
-    assert_empty collection('fork').similar_to 'fooo'
+    assert_empty SpellChecker.new('product_path', ['proc']).corrections
+    assert_empty SpellChecker.new('fooo',         ['fork']).corrections
   end
 
   def test_similar_to_corrects_misspells
-    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')
+    assert_spell 'descendants',      input: 'dependents', dictionary: ['descendants']
+    assert_spell 'drag_to',          input: 'drag',       dictionary: ['drag_to']
+    assert_spell 'set_result_count', input: 'set_result', dictionary: ['set_result_count']
   end
 
   def test_similar_to_sorts_results_by_simiarity
@@ -71,20 +60,21 @@ class SpellCheckerTest < Minitest::Test
       name123
     )
 
-    actual = WordCollection.new(%w(
+    actual = SpellChecker.new("name123456", %w(
       name12
       name123
       name1234
       name12345
       name123456
-    )).similar_to("name123456")
+    )).corrections
 
     assert_equal expected, actual
   end
 
   private
 
-  def collection(*args)
-    WordCollection.new(args.flatten)
+  def assert_spell(expected, input: , dictionary: )
+    corrections = SpellChecker.new(input, dictionary).corrections
+    assert_equal [expected], corrections, "Expected to suggest #{expected}, but got #{corrections.inspect}"
   end
 end

metadata

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