guessmethod 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,8 @@
+== 0.1.2 2007-11-12
+
+* GuessMethod and GuessConstant now both try the original method_ or const_missing, capturing the error, before trying.  On failure, raises the original error.
+* Cleaned up error messages now that guessing is a last resort, not a first.
+
 == 0.1.1 2007-11-08
 
 * Changed old_const_missing and old_method_missing to the less likely to blow up unguessed_const_missing and unguessed_method_missing

data/lib/guessmethod.rb

@@ -32,18 +32,22 @@ module GuessMethod
   
   def guess_method_missing(meth, *args, &block)
     if GuessMethodOptions[:active]
-      possible_methods = GuessMethodGuesser.find_closest(self.methods, meth)
-      case possible_methods.size
-      when 1
-        call_method = possible_methods.first
-        $stderr.puts GuessMethodOutputter.replacing_method(meth, call_method, self)
-        self.send(call_method, *args, &block)
-      when 0
-        $stderr.puts GuessMethodOutputter.no_method_in_threshold(meth, self)
-        unguessed_method_missing(meth, *args, &block)
-      else
-        $stderr.puts GuessMethodOutputter.ambiguous_method(meth, possible_methods, self)
+      begin
         unguessed_method_missing(meth, *args, &block)
+      rescue NoMethodError, NameError => e
+        possible_methods = GuessMethodGuesser.find_closest(self.methods, meth)
+        case possible_methods.size
+        when 1
+          call_method = possible_methods.first
+          $stderr.puts GuessMethodOutputter.replacing_method(meth, call_method, self)
+          self.send(call_method, *args, &block)
+        when 0
+          $stderr.puts GuessMethodOutputter.no_method_in_threshold(meth, self)
+          raise e
+        else
+          $stderr.puts GuessMethodOutputter.ambiguous_method(meth, possible_methods, self)
+          raise e
+        end
       end
     else
       unguessed_method_missing(meth, *args, &block)
@@ -74,20 +78,20 @@ module GuessMethod
       if GuessMethodOptions[:active]
         begin
           return unguessed_const_missing(sym)
-        rescue NameError
-        end
-        possible_consts = GuessMethodGuesser.find_closest(self.constants, sym)
-        case possible_consts.size
-        when 1
-          call_const = possible_consts.first
-          $stderr.puts GuessMethodOutputter.replacing_const(sym, call_const, self)
-          self.const_get(call_const)
-        when 0
-          $stderr.puts GuessMethodOutputter.no_const_in_threshold(sym, self)
-          unguessed_const_missing(sym)
-        else
-          $stderr.puts GuessMethodOutputter.ambigious_const(sym, possible_consts, self)
-          unguessed_const_missing(sym)
+        rescue NameError => e
+          possible_consts = GuessMethodGuesser.find_closest(self.constants, sym)
+          case possible_consts.size
+          when 1
+            call_const = possible_consts.first
+            $stderr.puts GuessMethodOutputter.replacing_const(sym, call_const, self)
+            self.const_get(call_const)
+          when 0
+            $stderr.puts GuessMethodOutputter.no_const_in_threshold(sym, self)
+            raise e
+          else
+            $stderr.puts GuessMethodOutputter.ambigious_const(sym, possible_consts, self)
+            raise e
+          end
         end
       else
         unguessed_const_missing(sym)
@@ -101,7 +105,7 @@ module GuessMethod
     def self.find_closest(haystack, needle)
       closest_distance = haystack.map {|x| x.to_s.downcase.levenshtein(needle.to_s.downcase,
           GuessMethodOptions[:insert_weight], GuessMethodOptions[:delete_weight],
-          GuessMethodOptions[:substitution_weight])}.min
+          GuessMethodOptions[:substitution_weight])}.min || 0
       if closest_distance <= GuessMethodOptions[:threshold]
         haystack.find_all {|x| x.to_s.downcase.levenshtein(needle.to_s.downcase,
             GuessMethodOptions[:insert_weight], GuessMethodOptions[:delete_weight],
@@ -150,12 +154,10 @@ module GuessMethod
     end
     
     def self.no_method_in_threshold(meth, obj)  #:nodoc:
-      Formatter.color('no method in threshold:', :red) <<
-      ' for ' <<
+      Formatter.color('no method in threshold: ', :red) <<
       Formatter.color(meth, :green) <<
-      ', sending to ' <<
-      GuessMethodOutputter.object(obj) <<
-      "'s method_missing"
+      ' for ' <<
+      GuessMethodOutputter.object(obj)
     end
     
     def self.replacing_method(meth, call_method, obj) #:nodoc:
@@ -175,16 +177,14 @@ module GuessMethod
       ' possible matches ' <<
       possibilities.map {|m| Formatter.color(m, :cyan)}.join(', ') <<
       ' for ' <<
-      GuessMethodOutputter.object(obj)
+      Formatter.color(obj, :green, :bold)
     end
     
     def self.no_const_in_threshold(sym, obj) #:nodoc:
-      Formatter.color('no constant in threshold:', :red) <<
-      ' for ' <<
+      Formatter.color('no constant in threshold: ', :red) <<
       Formatter.color(sym, :green) <<
-      ', sending to ' <<
-      Formatter.color(obj, :green, :bold) <<
-      "'s const_missing"
+      ' for ' <<
+      Formatter.color(obj, :green, :bold)
     end
     
     def self.replacing_const(sym, call_const, obj) #:nodoc:

data/lib/guessmethod/version.rb

@@ -2,7 +2,7 @@ module GuessMethod #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Guess Method</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/guessmethod"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/guessmethod" class="numbers">0.1.1</a>
+      <a href="http://rubyforge.org/projects/guessmethod" class="numbers">0.1.2</a>
     </div>
     <h1>&#x2192; &#8216;guessmethod&#8217;</h1>
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: guessmethod
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-11-08 00:00:00 -07:00
+  version: 0.1.2
+date: 2007-11-12 00:00:00 -07:00
 summary: an aggressive spell checker for irb
 require_paths: 
 - lib