did_you_mean 1.5.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3befc8f677ec57e2975d04b2095fcecf7314ff207150aa994b197894dba883af
-  data.tar.gz: dc5a44ad2f6058ef68913f4080a23141f39b23f3b30129fe753d5d88cca85cc0
+  metadata.gz: c8872d94ffdf1a826aa542768069af9a51087bc5156e54c277ccad671088724f
+  data.tar.gz: cd6c5001ef84b6618b488995b7c707dd88e9586df229067b25c6e4fb77c43882
 SHA512:
-  metadata.gz: 4d60d78614d4a6650b2be87599d3c3d867ab74f4cdf7f6083594229e3c51588af57a5c9574ca35ced229558f4280cd3677cbd7944cc5cef55e34a4f7ff7addf3
-  data.tar.gz: df5f07a5893afee4e03af416230ee828c7c2c2dfb8e5e35b5c525bebdff03710645b4af192563dc546abd4c210f8f2e8ce15e90124503488b74db19bd700f71c
+  metadata.gz: 5c18bc93c847891f6061325c0a2f1f6b067af698adbd49a6b96172c1a7cda5f4fd96fbf7e9d5b1aeb1d0851caf702c28351239edc4c62f76b2ba919e6e686f2d
+  data.tar.gz: 9c6f42e8c30a6a803c42409192757ecf13f03398771e682d2cf98976a391e7a5976af38a8d5eea972fcc3560ff16e8dffbfa5e3cc2eef96228c2a2fbd8bea030

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

data/.github/workflows/ruby.yml

@@ -13,9 +13,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.5.8', '2.6.6', '2.7.1', 'ruby-head', 'jruby-9.2.11.1', 'jruby-head' ]
+        ruby: [ '2.5', '2.6', '2.7', '3.0', 'ruby-head', 'jruby-9.2', 'jruby-head' ]
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
@@ -27,7 +27,7 @@ jobs:
   benchmark:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.7.1

data/CHANGELOG.md

@@ -1,6 +1,41 @@
-## v1.5.0
+## v1.6.1
 
- - Suggest require paths on LoadError ([#143](https://github.com/ruby/did_you_mean/pull/143))
+_<sup>released at 2020-12-22 13:22:35 UTC</sup>_
+
+#### Deprecations
+
+- Deprecate custom formatters to reduce complexity for Ractor support.
+- Deprecate access to the `DidYouMean::SPELL_CHECKERS` constant for Ractor support.
+
+#### Features
+
+- The `did_you_mean` gem is now Ractor-compatible (`8faba54b`)
+- Suggest keys on NoMatchingPatternKeyError (#159, @k-tsj)
+- Make the same name check case-sensitive (#164, @pocke)
+
+  Before:
+  ```ruby
+  DidYouMean::SpellChecker.new(dictionary: ['Method', 'MEthod']).correct("MEthod")
+  # => ['Method', 'method']
+  ```
+
+  After:
+  ```ruby
+  DidYouMean::SpellChecker.new(dictionary: ['Method', 'MEthod']).correct("MEthod")
+  # => ['Method']
+  ```
+
+## v1.6.0 (yanked)
+
+_This version has been yanked due to significant and unexpected breaking changes._
+
+## [v1.5.0](https://github.com/ruby/did_you_mean/tree/v1.5.0)
+
+_<sup>released at 2020-12-22 05:47:21 UTC</sup>_
+
+#### Features
+
+- Suggest require paths on LoadError ([#143](https://github.com/ruby/did_you_mean/pull/143))
 
 ## [v1.4.0](https://github.com/ruby/did_you_mean/tree/v1.4.0)
 

data/README.md

@@ -1,4 +1,4 @@
-# did_you_mean [![Gem Version](https://badge.fury.io/rb/did_you_mean.svg)](https://rubygems.org/gems/did_you_mean) [![Build Status](https://travis-ci.org/ruby/did_you_mean.svg?branch=master)](https://travis-ci.org/ruby/did_you_mean)
+# did_you_mean [![Gem Version](https://badge.fury.io/rb/did_you_mean.svg)](https://rubygems.org/gems/did_you_mean) [![Build status](https://github.com/ruby/did_you_mean/actions/workflows/ruby.yml/badge.svg)](https://github.com/ruby/did_you_mean/actions/workflows/ruby.yml)
 
 ## Installation
 
@@ -69,21 +69,13 @@ require 'net-http'
 #    Did you mean?  net/http
 ```
 
-## Verbose Formatter
-
-This verbose formatter changes the error message format to take more lines/spaces so it'll be slightly easier to read the suggestions. This formatter can totally be used in any environment including production.
+### NoMatchingPatternKeyError
 
 ```ruby
-OBject
-# => NameError: uninitialized constant OBject
-#    Did you mean?  Object
-
-require 'did_you_mean/verbose'
-OBject
-# => NameError: uninitialized constant OBject
-#
-#        Did you mean? Object
-#
+hash = {foo: 1, bar: 2, baz: 3}
+hash => {fooo:}
+# => NoMatchingPatternKeyError: key not found: :fooo
+#    Did you mean?  :foo
 ```
 
 ## Using the `DidYouMean::SpellChecker`
@@ -107,7 +99,7 @@ $ ruby --disable-did_you_mean -e "1.zeor?"
 -e:1:in `<main>': undefined method `zeor?' for 1:Integer (NameError)
 ```
 
-When you do not have direct access to the `ruby` command (e.g. `rails console`, `irb`), you could applyoptions using the
+When you do not have direct access to the `ruby` command (e.g. `rails console`, `irb`), you could apply options using the
 `RUBYOPT` environment variable:
 
 ```bash

data/Rakefile

@@ -2,12 +2,12 @@ require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new do |task|
-  task.libs << "test"
+  task.libs << "test/lib" << "test"
 
   task.test_files = Dir['test/**/test_*.rb'].reject {|path| path.end_with?("test_explore.rb") }
   task.verbose    = true
   task.warning    = true
-  task.ruby_opts  = %w[ --disable-did_you_mean ]
+  task.ruby_opts  = %w[ --disable-did_you_mean -rhelper ]
 end
 
 Rake::TestTask.new("test:explore") do |task|
@@ -21,6 +21,13 @@ end
 
 task default: %i(test)
 
+task :sync_tool do
+  require 'fileutils'
+  FileUtils.cp "../ruby/tool/lib/core_assertions.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/envutil.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/find_executable.rb", "./test/lib"
+end
+
 namespace :test do
   namespace :accuracy do
     desc "Download Wiktionary's Simple English data and save it as a dictionary"

data/documentation/tree_spell_checker_api.md

@@ -11,7 +11,7 @@ where
     * that are used to correct a misspelling
     * The dictionary must be tree structured with a single character separator
     * e.g 'spec/models/goals_spec_rb'.
-####separator: A single charactor.  Cannot be cannot be alphabetical, '@' or '.'.
+####separator: A single character.  Cannot be cannot be alphabetical, '@' or '.'.
 ####augment: When set to true, the checker will used the standard ```SpellChecker``` to find possible suggestions.
 ## Methods
 ```

data/lib/did_you_mean/core_ext/name_error.rb

@@ -1,17 +1,49 @@
 module DidYouMean
   module Correctable
-    def original_message
-      method(:to_s).super_method.call
-    end
+    if Exception.method_defined?(:detailed_message)
+      # just for compatibility
+      def original_message
+        # we cannot use alias here because
+        to_s
+      end
+
+      def detailed_message(highlight: true, did_you_mean: true, **)
+        msg = super.dup
+
+        return msg unless did_you_mean
+
+        suggestion = DidYouMean.formatter.message_for(corrections)
+
+        if highlight
+          suggestion = suggestion.gsub(/.+/) { "\e[1m" + $& + "\e[m" }
+        end
+
+        msg << suggestion
+        msg
+      rescue
+        super
+      end
+    else
+      SKIP_TO_S_FOR_SUPER_LOOKUP = true
+      private_constant :SKIP_TO_S_FOR_SUPER_LOOKUP
+
+      def original_message
+        meth = method(:to_s)
+        while meth.owner.const_defined?(:SKIP_TO_S_FOR_SUPER_LOOKUP)
+          meth = meth.super_method
+        end
+        meth.call
+      end
 
-    def to_s
-      msg = super.dup
-      suggestion = DidYouMean.formatter.message_for(corrections)
+      def to_s
+        msg = super.dup
+        suggestion = DidYouMean.formatter.message_for(corrections)
 
-      msg << suggestion if !msg.end_with?(suggestion)
-      msg
-    rescue
-      super
+        msg << suggestion if !msg.include?(suggestion)
+        msg
+      rescue
+        super
+      end
     end
 
     def corrections
@@ -19,7 +51,7 @@ module DidYouMean
     end
 
     def spell_checker
-      SPELL_CHECKERS[self.class.to_s].new(self)
+      DidYouMean.spell_checkers[self.class.to_s].new(self)
     end
   end
 end

data/lib/did_you_mean/formatter.rb

@@ -0,0 +1,44 @@
+# frozen-string-literal: true
+
+module DidYouMean
+  # The +DidYouMean::Formatter+ is the basic, default formatter for the
+  # gem. The formatter responds to the +message_for+ method and it returns a
+  # human readable string.
+  class Formatter
+
+    # Returns a human readable string that contains +corrections+. This
+    # formatter is designed to be less verbose to not take too much screen
+    # space while being helpful enough to the user.
+    #
+    # @example
+    #
+    #   formatter = DidYouMean::Formatter.new
+    #
+    #   # displays suggestions in two lines with the leading empty line
+    #   puts formatter.message_for(["methods", "method"])
+    #
+    #   Did you mean?  methods
+    #                   method
+    #   # => nil
+    #
+    #   # displays an empty line
+    #   puts formatter.message_for([])
+    #
+    #   # => nil
+    #
+    def self.message_for(corrections)
+      corrections.empty? ? "" : "\nDid you mean?  #{corrections.join("\n               ")}"
+    end
+
+    def message_for(corrections)
+      warn "The instance method #message_for has been deprecated. Please use the class method " \
+           "DidYouMean::Formatter.message_for(...) instead."
+
+      self.class.message_for(corrections)
+    end
+  end
+
+  PlainFormatter = Formatter
+
+  deprecate_constant :PlainFormatter
+end

data/lib/did_you_mean/formatters/plain_formatter.rb

@@ -1,33 +1,4 @@
-# frozen-string-literal: true
+require_relative '../formatter'
 
-module DidYouMean
-  # The +DidYouMean::PlainFormatter+ is the basic, default formatter for the
-  # gem. The formatter responds to the +message_for+ method and it returns a
-  # human readable string.
-  class PlainFormatter
-
-    # Returns a human readable string that contains +corrections+. This
-    # formatter is designed to be less verbose to not take too much screen
-    # space while being helpful enough to the user.
-    #
-    # @example
-    #
-    #   formatter = DidYouMean::PlainFormatter.new
-    #
-    #   # displays suggestions in two lines with the leading empty line
-    #   puts formatter.message_for(["methods", "method"])
-    #
-    #   Did you mean?  methods
-    #                   method
-    #   # => nil
-    #
-    #   # displays an empty line
-    #   puts formatter.message_for([])
-    #
-    #   # => nil
-    #
-    def message_for(corrections)
-      corrections.empty? ? "" : "\nDid you mean?  #{corrections.join("\n               ")}"
-    end
-  end
-end
+warn "`require 'did_you_mean/formatters/plain_formatter'` is deprecated. Please `require 'did_you_mean/formatter'` " \
+     "instead."

data/lib/did_you_mean/formatters/verbose_formatter.rb

@@ -1,49 +1,10 @@
 # frozen-string-literal: true
 
-module DidYouMean
-  # The +DidYouMean::VerboseFormatter+ uses extra empty lines to make the
-  # suggestion stand out more in the error message.
-  #
-  # In order to activate the verbose formatter,
-  #
-  # @example
-  #
-  #   OBject
-  #   # => NameError: uninitialized constant OBject
-  #   #    Did you mean?  Object
-  #
-  #   require 'did_you_mean/verbose'
-  #
-  #   OBject
-  #   # => NameError: uninitialized constant OBject
-  #   #
-  #   #        Did you mean? Object
-  #   #
-  #
-  class VerboseFormatter
+warn "`require 'did_you_mean/formatters/verbose_formatter'` is deprecated and falls back to the default formatter. "
 
-    # Returns a human readable string that contains +corrections+. This
-    # formatter is designed to be less verbose to not take too much screen
-    # space while being helpful enough to the user.
-    #
-    # @example
-    #
-    #   formatter = DidYouMean::PlainFormatter.new
-    #
-    #   puts formatter.message_for(["methods", "method"])
-    #
-    #
-    #       Did you mean? methods
-    #                     method
-    #
-    #   # => nil
-    #
-    def message_for(corrections)
-      return "" if corrections.empty?
+require_relative '../formatter'
 
-      output = "\n\n    Did you mean? ".dup
-      output << corrections.join("\n                  ")
-      output << "\n "
-    end
-  end
+module DidYouMean
+  # For compatibility:
+  VerboseFormatter = Formatter
 end

data/lib/did_you_mean/spell_checker.rb

@@ -10,25 +10,25 @@ module DidYouMean
     end
 
     def correct(input)
-      input     = normalize(input)
-      threshold = input.length > 3 ? 0.834 : 0.77
+      normalized_input = normalize(input)
+      threshold = normalized_input.length > 3 ? 0.834 : 0.77
 
-      words = @dictionary.select { |word| JaroWinkler.distance(normalize(word), input) >= threshold }
-      words.reject! { |word| input == word.to_s }
-      words.sort_by! { |word| JaroWinkler.distance(word.to_s, input) }
+      words = @dictionary.select { |word| JaroWinkler.distance(normalize(word), normalized_input) >= threshold }
+      words.reject! { |word| input.to_s == word.to_s }
+      words.sort_by! { |word| JaroWinkler.distance(word.to_s, normalized_input) }
       words.reverse!
 
       # Correct mistypes
-      threshold   = (input.length * 0.25).ceil
-      corrections = words.select { |c| Levenshtein.distance(normalize(c), input) <= threshold }
+      threshold   = (normalized_input.length * 0.25).ceil
+      corrections = words.select { |c| Levenshtein.distance(normalize(c), normalized_input) <= threshold }
 
       # Correct misspells
       if corrections.empty?
         corrections = words.select do |word|
           word   = normalize(word)
-          length = input.length < word.length ? input.length : word.length
+          length = normalized_input.length < word.length ? normalized_input.length : word.length
 
-          Levenshtein.distance(word, input) < length
+          Levenshtein.distance(word, normalized_input) < length
         end.first(1)
       end
 

data/lib/did_you_mean/spell_checkers/method_name_checker.rb

@@ -6,6 +6,7 @@ module DidYouMean
 
     NAMES_TO_EXCLUDE = { NilClass => nil.methods }
     NAMES_TO_EXCLUDE.default = []
+    Ractor.make_shareable(NAMES_TO_EXCLUDE) if defined?(Ractor)
 
     # +MethodNameChecker::RB_RESERVED_WORDS+ is the list of reserved words in
     # Ruby that take an argument. Unlike
@@ -36,6 +37,8 @@ module DidYouMean
       yield
     )
 
+    Ractor.make_shareable(RB_RESERVED_WORDS) if defined?(Ractor)
+
     def initialize(exception)
       @method_name  = exception.name
       @receiver     = exception.receiver

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

@@ -8,6 +8,7 @@ module DidYouMean
 
     NAMES_TO_EXCLUDE = { 'foo' => [:fork, :for] }
     NAMES_TO_EXCLUDE.default = []
+    Ractor.make_shareable(NAMES_TO_EXCLUDE) if defined?(Ractor)
 
     # +VariableNameChecker::RB_RESERVED_WORDS+ is the list of all reserved
     # words in Ruby. They could be declared like methods are, and a typo would
@@ -62,6 +63,8 @@ module DidYouMean
       __ENCODING__
     )
 
+    Ractor.make_shareable(RB_RESERVED_WORDS) if defined?(Ractor)
+
     def initialize(exception)
       @name       = exception.name.to_s.tr("@", "")
       @lvar_names = exception.respond_to?(:local_variables) ? exception.local_variables : []
@@ -76,7 +79,7 @@ module DidYouMean
     def corrections
       @corrections ||= SpellChecker
                      .new(dictionary: (RB_RESERVED_WORDS + lvar_names + method_names + ivar_names + cvar_names))
-                     .correct(name) - NAMES_TO_EXCLUDE[@name]
+                     .correct(name).uniq - NAMES_TO_EXCLUDE[@name]
     end
   end
 end

data/lib/did_you_mean/spell_checkers/pattern_key_name_checker.rb

@@ -0,0 +1,20 @@
+require_relative "../spell_checker"
+
+module DidYouMean
+  class PatternKeyNameChecker
+    def initialize(no_matching_pattern_key_error)
+      @key = no_matching_pattern_key_error.key
+      @keys = no_matching_pattern_key_error.matchee.keys
+    end
+
+    def corrections
+      @corrections ||= exact_matches.empty? ? SpellChecker.new(dictionary: @keys).correct(@key).map(&:inspect) : exact_matches
+    end
+
+    private
+
+    def exact_matches
+      @exact_matches ||= @keys.select { |word| @key == word.to_s }.map(&:inspect)
+    end
+  end
+end

data/lib/did_you_mean/spell_checkers/require_path_checker.rb

@@ -2,13 +2,17 @@
 
 require_relative "../spell_checker"
 require_relative "../tree_spell_checker"
+require "rbconfig"
 
 module DidYouMean
   class RequirePathChecker
     attr_reader :path
 
     INITIAL_LOAD_PATH = $LOAD_PATH.dup.freeze
-    ENV_SPECIFIC_EXT  = ".#{RbConfig::CONFIG["DLEXT"]}"
+    Ractor.make_shareable(INITIAL_LOAD_PATH) if defined?(Ractor)
+
+    ENV_SPECIFIC_EXT = ".#{RbConfig::CONFIG["DLEXT"]}"
+    Ractor.make_shareable(ENV_SPECIFIC_EXT) if defined?(Ractor)
 
     private_constant :INITIAL_LOAD_PATH, :ENV_SPECIFIC_EXT
 

data/lib/did_you_mean/verbose.rb

@@ -1,4 +1,2 @@
-require_relative '../did_you_mean'
-require_relative 'formatters/verbose_formatter'
-
-DidYouMean.formatter = DidYouMean::VerboseFormatter.new
+warn "The verbose formatter has been removed and now `require 'did_you_mean/verbose'` has no effect. Please " \
+     "remove this call."

data/lib/did_you_mean/version.rb

@@ -1,3 +1,3 @@
 module DidYouMean
-  VERSION = "1.5.0"
+  VERSION = "1.6.2".freeze
 end

data/lib/did_you_mean.rb

@@ -7,7 +7,8 @@ require_relative 'did_you_mean/spell_checkers/method_name_checker'
 require_relative 'did_you_mean/spell_checkers/key_error_checker'
 require_relative 'did_you_mean/spell_checkers/null_checker'
 require_relative 'did_you_mean/spell_checkers/require_path_checker'
-require_relative 'did_you_mean/formatters/plain_formatter'
+require_relative 'did_you_mean/spell_checkers/pattern_key_name_checker'
+require_relative 'did_you_mean/formatter'
 require_relative 'did_you_mean/tree_spell_checker'
 
 # The +DidYouMean+ gem adds functionality to suggest possible method/class
@@ -85,28 +86,70 @@ require_relative 'did_you_mean/tree_spell_checker'
 #
 module DidYouMean
   # Map of error types and spell checker objects.
-  SPELL_CHECKERS = Hash.new(NullChecker)
+  @spell_checkers = Hash.new(NullChecker)
+
+  # Returns a sharable hash map of error types and spell checker objects.
+  def self.spell_checkers
+    @spell_checkers
+  end
 
   # Adds +DidYouMean+ functionality to an error using a given spell checker
   def self.correct_error(error_class, spell_checker)
-    SPELL_CHECKERS[error_class.name] = spell_checker
-    error_class.prepend(Correctable) unless error_class < Correctable
+    if defined?(Ractor)
+      new_mapping = { **@spell_checkers, error_class.to_s => spell_checker }
+      new_mapping.default = NullChecker
+
+      @spell_checkers = Ractor.make_shareable(new_mapping)
+    else
+      spell_checkers[error_class.to_s] = spell_checker
+    end
+
+    error_class.prepend(Correctable) if error_class.is_a?(Class) && !(error_class < Correctable)
   end
 
   correct_error NameError, NameErrorCheckers
   correct_error KeyError, KeyErrorChecker
   correct_error NoMethodError, MethodNameChecker
   correct_error LoadError, RequirePathChecker if RUBY_VERSION >= '2.8.0'
+  correct_error NoMatchingPatternKeyError, PatternKeyNameChecker if defined?(::NoMatchingPatternKeyError)
+
+  # TODO: Remove on 3.3:
+  class DeprecatedMapping # :nodoc:
+    def []=(key, value)
+      warn "Calling `DidYouMean::SPELL_CHECKERS[#{key.to_s}] = #{value.to_s}' has been deprecated. " \
+           "Please call `DidYouMean.correct_error(#{key.to_s}, #{value.to_s})' instead."
+
+      DidYouMean.correct_error(key, value)
+    end
+
+    def merge!(hash)
+      warn "Calling `DidYouMean::SPELL_CHECKERS.merge!(error_name => spell_checker)' has been deprecated. " \
+           "Please call `DidYouMean.correct_error(error_name, spell_checker)' instead."
+
+      hash.each do |error_class, spell_checker|
+        DidYouMean.correct_error(error_class, spell_checker)
+      end
+    end
+  end
+
+  # TODO: Remove on 3.3:
+  SPELL_CHECKERS = DeprecatedMapping.new
+  deprecate_constant :SPELL_CHECKERS
+  private_constant :DeprecatedMapping
 
   # Returns the currently set formatter. By default, it is set to +DidYouMean::Formatter+.
   def self.formatter
-    @@formatter
+    if defined?(Ractor)
+      Ractor.current[:__did_you_mean_formatter__] || Formatter
+    else
+      Formatter
+    end
   end
 
   # Updates the primary formatter used to format the suggestions.
   def self.formatter=(formatter)
-    @@formatter = formatter
+    if defined?(Ractor)
+      Ractor.current[:__did_you_mean_formatter__] = formatter
+    end
   end
-
-  self.formatter = PlainFormatter.new
 end

data/test/core_ext/test_name_error_extension.rb

@@ -1,7 +1,9 @@
 require_relative '../helper'
 
 class NameErrorExtensionTest < Test::Unit::TestCase
-  SPELL_CHECKERS = DidYouMean::SPELL_CHECKERS
+  include DidYouMean::TestHelper
+
+  SPELL_CHECKERS = DidYouMean.spell_checkers
 
   class TestSpellChecker
     def initialize(*); end
@@ -9,18 +11,23 @@ class NameErrorExtensionTest < Test::Unit::TestCase
   end
 
   def setup
-    @org, SPELL_CHECKERS['NameError'] = SPELL_CHECKERS['NameError'], TestSpellChecker
+    @original_spell_checker = DidYouMean.spell_checkers['NameError']
+    DidYouMean.correct_error(NameError, TestSpellChecker)
 
     @error = assert_raise(NameError){ doesnt_exist }
   end
 
   def teardown
-    SPELL_CHECKERS['NameError'] = @org
+    DidYouMean.correct_error(NameError, @original_spell_checker)
   end
 
   def test_message
-    assert_match(/Did you mean\?  does_exist/, @error.to_s)
-    assert_match(/Did you mean\?  does_exist/, @error.message)
+    if Exception.method_defined?(:detailed_message)
+      assert_match(/Did you mean\?  does_exist/, @error.detailed_message)
+    else
+      assert_match(/Did you mean\?  does_exist/, @error.to_s)
+      assert_match(/Did you mean\?  does_exist/, @error.message)
+    end
   end
 
   def test_to_s_does_not_make_disruptive_changes_to_error_message
@@ -28,8 +35,8 @@ class NameErrorExtensionTest < Test::Unit::TestCase
       raise NameError, "uninitialized constant Object"
     end
 
-    error.to_s
-    assert_equal 1, error.to_s.scan("Did you mean?").count
+    get_message(error)
+    assert_equal 1, get_message(error).scan("Did you mean?").count
   end
 
   def test_correctable_error_objects_are_dumpable
@@ -40,7 +47,7 @@ class NameErrorExtensionTest < Test::Unit::TestCase
         e
       end
 
-    error.to_s
+    get_message(error)
 
     assert_equal "undefined method `sizee' for #<File:test_name_error_extension.rb (closed)>",
                  Marshal.load(Marshal.dump(error)).original_message