did_you_mean 0.5.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d961ee3cd423185852392b303ed54736ca80bebb
-  data.tar.gz: e23a7b7aba833e604c58a63ddfc75f1bbbf7aee3
+  metadata.gz: cd9d59c048043e845d5b06679a4fdbe62acfd85d
+  data.tar.gz: 6fe293723080c17dd050e4ea0acb2febbd72a225
 SHA512:
-  metadata.gz: cecbf896dc1ae321a3abe9c1accb93b9ba9aedc99f5cdaa5e62cd41ee3aecbbd1d45a5372265c4ebb0ade15ab01de34176453e085b0e9e4b9bfd90108d28ad86
-  data.tar.gz: e213f5af08467359cefef1b6bc06416b770824251d17385990494cabe2068ec4326368aa21ed61a0dbe3d0481d36891ebba6b0abbf5370087ba98e91ca0a497b
+  metadata.gz: 0e70e7a9193f3b3961c35cc49fe5ec8a57e319277fbfd5a6947c0f4a25da79b51e673e0ad20b6e48be1a30800e94032e9e725a96a2f2c1885b2fc484fbd1b749
+  data.tar.gz: f080b95967a4180e0e8ce0ff31a546931de10ca0ee6b4dfba5627573641138c52818987d71b11888faf3676e841de40c9d86c5358499f0c7061f3dbd2b3f6c3e

data/.travis.yml

@@ -1,12 +1,13 @@
-script: "bundle install && bundle exec rake test"
+script: bundle exec rake test
 
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.1.2
+  - 2.1
+  - 2.2.0-preview1
   - ruby-head
+  - jruby
+  - rbx
 
 gemfile:
   - gemfiles/activerecord_30.gemfile
@@ -14,7 +15,14 @@ gemfile:
   - gemfiles/activerecord_32.gemfile
   - gemfiles/activerecord_40.gemfile
   - gemfiles/activerecord_41.gemfile
+  - gemfiles/activerecord_42.gemfile
   - gemfiles/activerecord_edge.gemfile
 
 matrix:
+  allow_failures:
+    - rvm: jruby
+      gemfile: gemfiles/activerecord_42.gemfile
+    - rvm: jruby
+      gemfile: gemfiles/activerecord_edge.gemfile
+    - rvm: rbx
   fast_finish: true

data/Appraisals

@@ -18,8 +18,14 @@ appraise "activerecord_41" do
   gem "activerecord", "~> 4.1.0"
 end
 
+appraise "activerecord_42" do
+  gem "activerecord", "~> 4.2.0.beta4"
+end
+
 appraise "activerecord_edge" do
   git 'git://github.com/rails/rails.git' do
     gem 'activerecord', require: 'activerecord'
   end
+
+  gem 'arel', :github => 'rails/arel'
 end

data/Gemfile

@@ -2,3 +2,17 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in did_you_mean.gemspec
 gemspec
+
+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

data/README.md

@@ -1,32 +1,88 @@
-# Did You Mean!?? [![Build Status](https://travis-ci.org/yuki24/did_you_mean.png?branch=master)](https://travis-ci.org/yuki24/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://travis-ci.org/yuki24/did_you_mean.svg?branch=master)](https://travis-ci.org/yuki24/did_you_mean)
 
-Google tells you the right keyword if you made a typo. This gem gives similar experience when you get `NoMethodError` or `NameError` in Ruby.
+'Did you mean?' experience in Ruby. No, Really.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'did_you_mean', group: [:development, :test]
+```
 
 ## Examples
 
-On irb:
+### NameError
 
-![Did you mean? on BetterErrors](https://raw2.github.com/yuki24/did_you_mean/86fbb784a6783a20774a34b9d02553cfb5ab54b0/docs/irb_example.png)
+#### Correcting a Misspelled Method Name
 
-On rspec:
+```ruby
+class User
+  attr_accessor :first_name, :last_name
 
-![Did you mean? on BetterErrors](https://raw2.github.com/yuki24/did_you_mean/1c6cdc7c425325671752d261dcadd1e048e1dcad/docs/rspec_example.png)
+  def to_s
+    "#{f1rst_name} #{last_name}" # f1rst_name ???
+  end
+end
 
-On BetterErrors:
+user.to_s
+# => NameError: undefined local variable or method `f1rst_name' for #<User:0x0000000928fad8>
+#
+#     Did you mean? #first_name
+#
+```
 
-![Did you mean? on BetterErrors](https://raw2.github.com/yuki24/did_you_mean/4e6d4b405777f44ecb2a0e28c4abb1e438aa33ff/docs/better_errors_example.png)
+#### Correcting a Misspelled Class Name
 
-## Installation
+```ruby
+class Book
+  class TableOfContents
+    # ...
+  end
+end
 
-Add this line to your application's Gemfile:
+Book::TableofContents # TableofContents ???
+# => NameError: uninitialized constant Book::TableofContents
+#
+#     Did you mean? Book::TableOfContents
+#
+```
+
+### NoMethodError
 
+```ruby
+# In a Rails controller:
+params.with_inddiferent_access
+# => NoMethodError: undefined method `with_inddiferent_access' for {}:Hash
+#
+#     Did you mean? #with_indifferent_access
+#
 ```
-gem 'did_you_mean', :group => :development
+
+### ActiveRecord::UnknownAttributeError
+
+```ruby
+User.new(nmee: "wrong flrst name")
+# => ActiveRecord::UnknownAttributeError: unknown attribute: nmee
+#
+#     Did you mean? name: string
+#
 ```
 
-### Support
+## 'Did You Mean' Experience is Everywhere
+
+_did\_you\_mean_ gem automagically puts method suggestions into the error message. This means you'll have the "Did you mean?" experience almost everywhere:
+
+![Did you mean? on BetterErrors](https://raw.githubusercontent.com/yuki24/did_you_mean/master/docs/did_you_mean_example.png)
+
+## Support
+
+_did\_you\_mean_ gem supports the following implementations:
+
+ * MRI 1.9.3, 2.0.0, 2.1.x, 2.2.0-preview1 and ruby-head
+ * JRuby (tested against 1.7.16)
 
-This gem only supports Ruby 1.9.3, 2.0.0, 2.1.0, 2.1.1, 2.1.2 and ruby-head. All other ruby implementations are **NOT** supported.
+Any other implementations are **NOT** supported (Rubinius support is work in progress).
 
 ## Contributing
 

data/Rakefile

@@ -1,34 +1,59 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
-begin
-  require 'rake/extensiontask'
+def mri?
+  defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby"
+end
 
-  Rake::ExtensionTask.new('did_you_mean') do |ext|
-    ext.name    = "method_missing"
-    ext.lib_dir = "lib/did_you_mean"
-  end
-rescue LoadError
-  abort "This Rakefile requires rake-compiler (gem install rake-compiler)"
+def jruby?
+  defined?(JRuby)
 end
 
 desc "run tests"
-task :default => [:test]
+task default: [:test]
 
-desc "Run tests"
-task :test do
-  Rake::Task['compile'].reenable
-  Rake::Task['compile'].invoke
+if mri? || jruby?
+  if mri?
+    require 'rake/extensiontask'
 
-  $stdout.puts("\033[33m")
-  sh "bundle exec ruby test/all_test.rb"
-  $stdout.puts("\033[0m")
+    Rake::ExtensionTask.new('did_you_mean') do |ext|
+      ext.name    = "method_missing"
+      ext.lib_dir = "lib/did_you_mean"
+    end
+  elsif jruby?
+    require 'rake/javaextensiontask'
 
-  Rake::Task['clobber'].execute
-end
+    Rake::JavaExtensionTask.new('did_you_mean') do |ext|
+      ext.name    = "receiver_capturer"
+      ext.lib_dir = "lib/did_you_mean"
+    end
+  end
+
+  desc "Run tests"
+  task :test do
+    Rake::Task['compile'].reenable
+    Rake::Task['compile'].invoke
 
-namespace :test do
-  desc "Run tests without re-compiling extensions"
-  task :without_compile do
+    begin
+      $stdout.puts("\033[33m")
+      sh "bundle exec ruby test/all_test.rb"
+    ensure
+      $stdout.puts("\033[0m")
+    end
+
+    Rake::Task['clobber'].execute
+  end
+
+  namespace :test do
+    desc "Run tests without re-compiling extensions"
+    task :without_compile do
+      $stdout.puts("\033[33m")
+      sh "bundle exec ruby test/all_test.rb"
+      $stdout.puts("\033[0m")
+    end
+  end
+else # for Rubinius
+  desc "Run tests"
+  task :test do
     $stdout.puts("\033[33m")
     sh "bundle exec ruby test/all_test.rb"
     $stdout.puts("\033[0m")

data/did_you_mean.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Yuki Nishijima"]
   spec.email         = ["mail@yukinishijima.net"]
   spec.summary       = '"Did you mean?" experience in Ruby'
-  spec.description   = 'It adds "did you mean?" experience on NoMethodError and NameError because of a typo.'
+  spec.description   = '"did you mean?" experience in Ruby: the error message will tell you the right one when you misspelled something.'
   spec.homepage      = "https://github.com/yuki24/did_you_mean"
   spec.license       = "MIT"
 
@@ -19,13 +19,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "text"
-  spec.add_dependency "binding_of_caller"
+  spec.add_dependency "interception"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-compiler"
-  spec.add_development_dependency "appraisal"
-  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "mail"
 end

data/ext/did_you_mean/extconf.rb

@@ -1,18 +1,23 @@
 require 'mkmf'
 
-case RUBY_VERSION
-when /1.9.3/, /2.0.0/, /^2.1.\d/, /2.2.0/
-  abs_ruby_header_path = File.join(File.dirname(File.realpath(__FILE__)), "ruby_headers")
+LATEST_RUBY_VERSION = "2.1.4"
+RUBY_TRUNK_VERSION  = "2.2.0"
 
-  version_suffix = if /^2.1.\d/ =~ RUBY_VERSION
-    "210"
+version =
+  case RUBY_VERSION
+  when /1.9.3/, /2.0.0/
+    RUBY_VERSION
+  when /^2.1.\d/, /^2.2.\d/
+    if LATEST_RUBY_VERSION < RUBY_VERSION && RUBY_VERSION < RUBY_TRUNK_VERSION
+      LATEST_RUBY_VERSION
+    else
+      RUBY_VERSION
+    end
   else
-    RUBY_VERSION.tr(".", "")
-  end
+    raise "Sorry, but did_you_mean #{DidYouMean::VERSION} doesn't work with Ruby #{RUBY_VERSION}."
+  end.tr(".", "")
 
-  $CFLAGS += " -I#{abs_ruby_header_path}/#{version_suffix}"
-else
-  raise "Sorry, but did_you_mean #{DidYouMean::VERSION} doesn't work with Ruby #{RUBY_VERSION}."
-end
+ruby_header_path = File.join(File.dirname(File.realpath(__FILE__)), "ruby_headers")
+$CFLAGS         += " -I#{ruby_header_path}/#{version}"
 
 create_makefile 'did_you_mean/method_missing'

data/ext/did_you_mean/org/yukinishijima/ReceiverCapturer.java

@@ -0,0 +1,58 @@
+package org.yukinishijima;
+
+import org.jruby.anno.JRubyMethod;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.Block;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.Visibility;
+import org.jruby.Ruby;
+import org.jruby.RubyArray;
+import org.jruby.RubyException;
+import org.jruby.RubyModule;
+import org.jruby.RubyNoMethodError;
+import org.jruby.internal.runtime.methods.CallConfiguration;
+import org.jruby.internal.runtime.methods.DynamicMethod;
+import org.jruby.internal.runtime.methods.JavaMethod.JavaMethodNBlock;
+
+public class ReceiverCapturer extends JavaMethodNBlock {
+    private DynamicMethod methodMissingMethod;
+
+    public ReceiverCapturer(RubyModule implementationClass, DynamicMethod methodMissingMethod) {
+        super(implementationClass, Visibility.PRIVATE, CallConfiguration.FrameFullScopeNone);
+        this.methodMissingMethod = methodMissingMethod;
+    }
+
+    @Override
+    public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
+        try {
+            return this.methodMissingMethod.call(context, self, clazz, name, args, block);
+        } catch (RaiseException exception) {
+            appendReceiverToException(exception, self);
+            throw exception;
+        }
+    }
+
+    @JRubyMethod
+    public static void setup(Ruby runtime) {
+        RubyModule module = runtime.defineModule("Kernel");
+
+        DynamicMethod privateMethodMissing = runtime.getPrivateMethodMissing();
+        DynamicMethod protectedMethodMissing = runtime.getProtectedMethodMissing();
+        DynamicMethod superMethodMissing = runtime.getSuperMethodMissing();
+        DynamicMethod normalMethodMissing = runtime.getNormalMethodMissing();
+
+        runtime.setPrivateMethodMissing(new ReceiverCapturer(module, privateMethodMissing));
+        runtime.setProtectedMethodMissing(new ReceiverCapturer(module, protectedMethodMissing));
+        runtime.setSuperMethodMissing(new ReceiverCapturer(module, superMethodMissing));
+        runtime.setNormalMethodMissing(new ReceiverCapturer(module, normalMethodMissing));
+    }
+
+    private void appendReceiverToException(RaiseException exception, IRubyObject self) {
+        if (exception.getException() instanceof RubyNoMethodError) {
+            RubyNoMethodError noMethodError = (RubyNoMethodError) exception.getException();
+            RubyArray array = (RubyArray) noMethodError.args();
+            array.append(self);
+        }
+    }
+}

data/ext/did_you_mean/ruby_headers/210/id.h

@@ -14,18 +14,20 @@
 #define RUBY_ID_H
 
 enum ruby_id_types {
+    RUBY_ID_STATIC_SYM  = 0x01,
     RUBY_ID_LOCAL       = 0x00,
-    RUBY_ID_INSTANCE    = 0x01,
-    RUBY_ID_GLOBAL      = 0x03,
-    RUBY_ID_ATTRSET     = 0x04,
-    RUBY_ID_CONST       = 0x05,
-    RUBY_ID_CLASS       = 0x06,
-    RUBY_ID_JUNK        = 0x07,
+    RUBY_ID_INSTANCE    = (0x01<<1),
+    RUBY_ID_GLOBAL      = (0x03<<1),
+    RUBY_ID_ATTRSET     = (0x04<<1),
+    RUBY_ID_CONST       = (0x05<<1),
+    RUBY_ID_CLASS       = (0x06<<1),
+    RUBY_ID_JUNK        = (0x07<<1),
     RUBY_ID_INTERNAL    = RUBY_ID_JUNK,
-    RUBY_ID_SCOPE_SHIFT = 3,
-    RUBY_ID_SCOPE_MASK  = ~(~0U<<RUBY_ID_SCOPE_SHIFT)
+    RUBY_ID_SCOPE_SHIFT = 4,
+    RUBY_ID_SCOPE_MASK  = (~(~0U<<(RUBY_ID_SCOPE_SHIFT-1))<<1)
 };
 
+#define ID_STATIC_SYM  RUBY_ID_STATIC_SYM
 #define ID_SCOPE_SHIFT RUBY_ID_SCOPE_SHIFT
 #define ID_SCOPE_MASK  RUBY_ID_SCOPE_MASK
 #define ID_LOCAL       RUBY_ID_LOCAL
@@ -136,7 +138,7 @@ enum ruby_method_ids {
     tInitialize_clone,
     tInitialize_dup,
     tUScore,
-#define TOKEN2LOCALID(n) id##n = ((t##n<<ID_SCOPE_SHIFT)|ID_LOCAL)
+#define TOKEN2LOCALID(n) id##n = ((t##n<<ID_SCOPE_SHIFT)|ID_LOCAL|ID_STATIC_SYM)
     TOKEN2LOCALID(Freeze),
     TOKEN2LOCALID(Inspect),
     TOKEN2LOCALID(Intern),

data/ext/did_you_mean/ruby_headers/210/version.h

@@ -1,10 +1,10 @@
-#define RUBY_VERSION "2.1.1"
-#define RUBY_RELEASE_DATE "2014-02-07"
-#define RUBY_PATCHLEVEL 28
+#define RUBY_VERSION "2.1.0"
+#define RUBY_RELEASE_DATE "2013-12-25"
+#define RUBY_PATCHLEVEL 0
 
-#define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 7
+#define RUBY_RELEASE_YEAR 2013
+#define RUBY_RELEASE_MONTH 12
+#define RUBY_RELEASE_DAY 25
 
 #include "ruby/version.h"
 

data/ext/did_you_mean/ruby_headers/211/addr2line.h

@@ -0,0 +1,21 @@
+/**********************************************************************
+
+  addr2line.h -
+
+  $Author$
+
+  Copyright (C) 2010 Shinichiro Hamaji
+
+**********************************************************************/
+
+#ifndef RUBY_ADDR2LINE_H
+#define RUBY_ADDR2LINE_H
+
+#ifdef USE_ELF
+
+void
+rb_dump_backtrace_with_lines(int num_traces, void **traces, char **syms);
+
+#endif /* USE_ELF */
+
+#endif /* RUBY_ADDR2LINE_H */