did_you_mean 0.5.0 → 0.9.0

data/ext/did_you_mean/ruby_headers/220/vm_insnhelper.h

@@ -34,34 +34,6 @@
 #define VMDEBUG 3
 #endif
 
-enum {
-  BOP_PLUS,
-  BOP_MINUS,
-  BOP_MULT,
-  BOP_DIV,
-  BOP_MOD,
-  BOP_EQ,
-  BOP_EQQ,
-  BOP_LT,
-  BOP_LE,
-  BOP_LTLT,
-  BOP_AREF,
-  BOP_ASET,
-  BOP_LENGTH,
-  BOP_SIZE,
-  BOP_EMPTY_P,
-  BOP_SUCC,
-  BOP_GT,
-  BOP_GE,
-  BOP_NOT,
-  BOP_NEQ,
-  BOP_MATCH,
-  BOP_FREEZE,
-
-  BOP_LAST_
-};
-
-extern short ruby_vm_redefined_flag[BOP_LAST_];
 extern VALUE ruby_vm_const_missing_count;
 
 #if VM_COLLECT_USAGE_DETAILS
@@ -231,18 +203,6 @@ enum vm_regan_acttype {
 /**********************************************************/
 
 /* optimize insn */
-#define FIXNUM_REDEFINED_OP_FLAG (1 << 0)
-#define FLOAT_REDEFINED_OP_FLAG  (1 << 1)
-#define STRING_REDEFINED_OP_FLAG (1 << 2)
-#define ARRAY_REDEFINED_OP_FLAG  (1 << 3)
-#define HASH_REDEFINED_OP_FLAG   (1 << 4)
-#define BIGNUM_REDEFINED_OP_FLAG (1 << 5)
-#define SYMBOL_REDEFINED_OP_FLAG (1 << 6)
-#define TIME_REDEFINED_OP_FLAG   (1 << 7)
-#define REGEXP_REDEFINED_OP_FLAG (1 << 8)
-
-#define BASIC_OP_UNREDEFINED_P(op, klass) (LIKELY((ruby_vm_redefined_flag[(op)]&(klass)) == 0))
-
 #define FIXNUM_2_P(a, b) ((a) & (b) & 1)
 #if USE_FLONUM
 #define FLONUM_2_P(a, b) (((((a)^2) | ((b)^2)) & 3) == 0) /* (FLONUM_P(a) && FLONUM_P(b)) */

data/gemfiles/activerecord_30.gemfile

@@ -4,4 +4,18 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 3.0.0"
 
+platforms :ruby do
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
+platforms :rbx do
+  gem "rubysl", "~> 2.0"
+  gem "racc"
+  gem "rubinius-developer_tools"
+end
+
 gemspec :path => "../"

data/gemfiles/activerecord_31.gemfile

@@ -4,4 +4,18 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 3.1.0"
 
+platforms :ruby do
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
+platforms :rbx do
+  gem "rubysl", "~> 2.0"
+  gem "racc"
+  gem "rubinius-developer_tools"
+end
+
 gemspec :path => "../"

data/gemfiles/activerecord_32.gemfile

@@ -4,4 +4,18 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 3.2.0"
 
+platforms :ruby do
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
+platforms :rbx do
+  gem "rubysl", "~> 2.0"
+  gem "racc"
+  gem "rubinius-developer_tools"
+end
+
 gemspec :path => "../"

data/gemfiles/activerecord_40.gemfile

@@ -4,4 +4,18 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.0.0"
 
+platforms :ruby do
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
+platforms :rbx do
+  gem "rubysl", "~> 2.0"
+  gem "racc"
+  gem "rubinius-developer_tools"
+end
+
 gemspec :path => "../"

data/gemfiles/activerecord_41.gemfile

@@ -4,4 +4,18 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.1.0"
 
+platforms :ruby do
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
+platforms :rbx do
+  gem "rubysl", "~> 2.0"
+  gem "racc"
+  gem "rubinius-developer_tools"
+end
+
 gemspec :path => "../"

data/gemfiles/activerecord_42.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.2.0.beta4"
+
+platforms :ruby do
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
+platforms :rbx do
+  gem "rubysl", "~> 2.0"
+  gem "racc"
+  gem "rubinius-developer_tools"
+end
+
+gemspec :path => "../"

data/gemfiles/activerecord_edge.gemfile

@@ -6,4 +6,20 @@ git "git://github.com/rails/rails.git" do
   gem "activerecord", :require => "activerecord"
 end
 
+gem "arel", :github => "rails/arel"
+
+platforms :ruby do
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
+platforms :rbx do
+  gem "rubysl", "~> 2.0"
+  gem "racc"
+  gem "rubinius-developer_tools"
+end
+
 gemspec :path => "../"

data/lib/did_you_mean.rb

@@ -1,6 +1,16 @@
-require "did_you_mean/version"
-require "did_you_mean/method_missing"
-require "did_you_mean/method_finder"
-require "did_you_mean/strategies"
+require "interception"
 
+require "did_you_mean/version"
 require "did_you_mean/core_ext/name_error"
+require "did_you_mean/finders"
+
+module DidYouMean
+  Interception.listen(->(exception, binding) {
+    # On IRB/pry console, this event is called twice. In the second event,
+    # we get IRB/pry binding. So it shouldn't override @frame_binding if
+    # it's already defined.
+    if exception.is_a?(NameError) && !exception.instance_variable_defined?(:@frame_binding)
+      exception.instance_variable_set(:@frame_binding, binding)
+    end
+  })
+end

data/lib/did_you_mean/core_ext/name_error.rb

@@ -1,61 +1,28 @@
-begin
-  require "binding_of_caller"
-rescue LoadError => e
-  puts "could not load binding_of_caller. please make sure it is included in the Gemfile."
-  raise e
-end
-
 class NameError
+  attr_reader :frame_binding
+
   begin
     require "active_support/core_ext/name_error"
 
-    if method_defined?(:missing_name)
-      def missing_name_without_did_you_mean
-        if /undefined local variable or method/ !~ original_message
-          $1 if /((::)?([A-Z]\w*)(::[A-Z]\w*)*)$/ =~ original_message
-        end
-      end
-
-      alias missing_name_with_did_you_mean missing_name
-      alias missing_name missing_name_without_did_you_mean
-    end
-  rescue LoadError
-  end
-
-  original_set_backtrace = instance_method(:set_backtrace)
-
-  define_method :set_backtrace do |*args|
-    unless Thread.current[:__did_you_mean_exception_lock]
-      Thread.current[:__did_you_mean_exception_lock] = true
-      begin
-        @__did_you_mean_bindings_stack = binding.callers.drop(1)
-      ensure
-        Thread.current[:__did_you_mean_exception_lock] = false
+    def missing_name
+      if /undefined local variable or method/ !~ original_message
+        $1 if /((::)?([A-Z]\w*)(::[A-Z]\w*)*)$/ =~ original_message
       end
-    end
-    original_set_backtrace.bind(self).call(*args)
-  end
-  
-  def __did_you_mean_bindings_stack
-    @__did_you_mean_bindings_stack || []
-  end
-
-  def frame_binding
-    @frame_binding ||= __did_you_mean_bindings_stack.first
-  end
+    end if method_defined?(:missing_name)
+  rescue LoadError; end
 
   def to_s_with_did_you_mean
-    original_message + did_you_mean?.to_s
+    original_message + did_you_mean?.to_s rescue original_message
   end
 
   alias original_message to_s
   alias             to_s to_s_with_did_you_mean
 
   def did_you_mean?
-    method_finder.did_you_mean? if not method_finder.empty?
+    finder.did_you_mean?
   end
 
-  def method_finder
-    @method_finder ||= DidYouMean.strategies[self.class.to_s].build(self)
+  def finder
+    @finder ||= DidYouMean.finders[self.class.to_s].new(self)
   end
 end

data/lib/did_you_mean/finders.rb

@@ -0,0 +1,31 @@
+require "did_you_mean/word_collection"
+
+module DidYouMean
+  module BaseFinder
+    def did_you_mean?
+      return if similar_words.empty?
+
+      output = "\n\n"
+      output << "    Did you mean? #{format(similar_words.first)}\n"
+      output << similar_words[1..-1].map{|word| "#{' ' * 18}#{format(word)}\n" }.join
+      output << " " # for pry
+    end
+
+    def similar_words
+      @similar_words ||= WordCollection.new(words).similar_to(target_word)
+    end
+  end
+
+  class NullFinder
+    def initialize(*); end
+    def did_you_mean?; end
+  end
+
+  def self.finders
+    @@finders ||= Hash.new(NullFinder)
+  end
+end
+
+require 'did_you_mean/finders/name_error_finders'
+require 'did_you_mean/finders/similar_attribute_finder'
+require 'did_you_mean/finders/similar_method_finder'

data/lib/did_you_mean/finders/name_error_finders.rb

@@ -0,0 +1,24 @@
+module DidYouMean
+  module NameErrorFinders
+    def self.included(*)
+      raise "Do not include this module since it overrides Class.new method."
+    end
+
+    def self.new(exception)
+      klass = if /uninitialized constant/ =~ exception.original_message
+        SimilarClassFinder
+      elsif /undefined local variable or method/ =~ exception.original_message
+        SimilarNameFinder
+      else
+        NullFinder
+      end
+
+      klass.new(exception)
+    end
+  end
+
+  finders["NameError"] = NameErrorFinders
+end
+
+require 'did_you_mean/finders/name_error_finders/similar_name_finder'
+require 'did_you_mean/finders/name_error_finders/similar_class_finder'

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

@@ -0,0 +1,50 @@
+module DidYouMean
+  class SimilarClassFinder
+    include BaseFinder
+    attr_reader :class_name, :original_message
+
+    def initialize(exception)
+      @class_name, @original_message = exception.name, exception.original_message
+    end
+
+    def words
+      scopes.flat_map do |scope|
+        scope.constants.map {|name| ConstantName.new(name, scope) }
+      end
+    end
+
+    def name_from_message
+      class_name || /([A-Z]\w*$)/.match(original_message)[0]
+    end
+    alias target_word name_from_message
+
+    def similar_words
+      super.map(&:full_name)
+    end
+
+    def scopes
+      @scopes ||= scope_base.size.times.map do |count|
+        eval(scope_base[0..(- count)].join("::"))
+      end.reverse << Object
+    end
+
+    private
+
+    def scope_base
+      @scope_base ||= (/(([A-Z]\w*::)*)([A-Z]\w*)$/ =~ original_message ? $1 : "").split("::")
+    end
+
+    class ConstantName < String
+      attr_reader :scope
+
+      def initialize(str, scope)
+        super(str.to_s)
+        @scope = scope.to_s
+      end
+
+      def full_name
+        scope == "Object" ? to_s : "#{scope}::#{to_s}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+module DidYouMean
+  class SimilarNameFinder
+    include BaseFinder
+    attr_reader :name, :_methods, :_local_variables, :_instance_variables
+
+    def initialize(exception)
+      @name             = exception.name
+      @_methods         = exception.frame_binding.eval("methods")
+      @_local_variables = exception.frame_binding.eval("local_variables")
+      @_instance_variables = exception.frame_binding.eval("instance_variables").map do |name|
+        name.to_s.tr("@", "")
+      end
+    end
+
+    def words
+      local_variable_names + method_names + instance_variable_names
+    end
+
+    alias target_word name
+
+    def local_variable_names
+      _local_variables.map {|word| LocalVariableName.new(word.to_s) }
+    end
+
+    def similar_local_variables
+      similar_words.select{|word| word.is_a?(LocalVariableName) }
+    end
+
+    def method_names
+      _methods.map {|word| MethodName.new(word.to_s) }
+    end
+
+    def similar_methods
+      similar_words.select{|word| word.is_a?(MethodName) }
+    end
+
+    def instance_variable_names
+      _instance_variables.map {|word| InstanceVariableName.new(word.to_s) }
+    end
+
+    def similar_instance_variables
+      similar_words.select {|word| word.is_a?(InstanceVariableName) }
+    end
+
+    def format(word)
+      "#{word.prefix}#{word}"
+    end
+
+    class MethodName < String
+      def prefix; "#"; end
+    end
+
+    class LocalVariableName < String
+      def prefix; ""; end
+    end
+
+    class InstanceVariableName < String
+      def prefix; "@"; end
+    end
+  end
+end