better_errors 0.9.0 → 1.0.0.rc1

data/spec/better_errors/stack_frame_spec.rb

@@ -3,21 +3,21 @@ require "spec_helper"
 module BetterErrors
   describe StackFrame do
     context "#application?" do
-      it "should be true for application filenames" do
-        BetterErrors.stub!(:application_root).and_return("/abc/xyz")
+      it "is true for application filenames" do
+        BetterErrors.stub(:application_root).and_return("/abc/xyz")
         frame = StackFrame.new("/abc/xyz/app/controllers/crap_controller.rb", 123, "index")
         
         frame.application?.should be_true
       end
       
-      it "should be false for everything else" do
-        BetterErrors.stub!(:application_root).and_return("/abc/xyz")
+      it "is false for everything else" do
+        BetterErrors.stub(:application_root).and_return("/abc/xyz")
         frame = StackFrame.new("/abc/nope", 123, "foo")
         
         frame.application?.should be_false
       end
       
-      it "should not care if no application_root is set" do
+      it "doesn't care if no application_root is set" do
         frame = StackFrame.new("/abc/xyz/app/controllers/crap_controller.rb", 123, "index")
         
         frame.application?.should be_false
@@ -25,15 +25,15 @@ module BetterErrors
     end
     
     context "#gem?" do
-      it "should be true for gem filenames" do
-        Gem.stub!(:path).and_return(["/abc/xyz"])
+      it "is true for gem filenames" do
+        Gem.stub(:path).and_return(["/abc/xyz"])
         frame = StackFrame.new("/abc/xyz/gems/whatever-1.2.3/lib/whatever.rb", 123, "foo")
         
         frame.gem?.should be_true
       end
       
-      it "should be false for everything else" do
-        Gem.stub!(:path).and_return(["/abc/xyz"])
+      it "is false for everything else" do
+        Gem.stub(:path).and_return(["/abc/xyz"])
         frame = StackFrame.new("/abc/nope", 123, "foo")
         
         frame.gem?.should be_false
@@ -41,8 +41,8 @@ module BetterErrors
     end
     
     context "#application_path" do
-      it "should chop off the application root" do
-        BetterErrors.stub!(:application_root).and_return("/abc/xyz")
+      it "chops off the application root" do
+        BetterErrors.stub(:application_root).and_return("/abc/xyz")
         frame = StackFrame.new("/abc/xyz/app/controllers/crap_controller.rb", 123, "index")
         
         frame.application_path.should == "app/controllers/crap_controller.rb"
@@ -50,16 +50,16 @@ module BetterErrors
     end
     
     context "#gem_path" do
-      it "should chop of the gem path and stick (gem) there" do
-        Gem.stub!(:path).and_return(["/abc/xyz"])
+      it "chops of the gem path and stick (gem) there" do
+        Gem.stub(:path).and_return(["/abc/xyz"])
         frame = StackFrame.new("/abc/xyz/gems/whatever-1.2.3/lib/whatever.rb", 123, "foo")
         
         frame.gem_path.should == "whatever (1.2.3) lib/whatever.rb"
       end
       
-      it "should prioritize gem path over application path" do
-        BetterErrors.stub!(:application_root).and_return("/abc/xyz")
-        Gem.stub!(:path).and_return(["/abc/xyz/vendor"])
+      it "prioritizes gem path over application path" do
+        BetterErrors.stub(:application_root).and_return("/abc/xyz")
+        Gem.stub(:path).and_return(["/abc/xyz/vendor"])
         frame = StackFrame.new("/abc/xyz/vendor/gems/whatever-1.2.3/lib/whatever.rb", 123, "foo")
         
         frame.gem_path.should == "whatever (1.2.3) lib/whatever.rb"
@@ -67,54 +67,95 @@ module BetterErrors
     end
     
     context "#pretty_path" do
-      it "should return #application_path for application paths" do
-        BetterErrors.stub!(:application_root).and_return("/abc/xyz")
+      it "returns #application_path for application paths" do
+        BetterErrors.stub(:application_root).and_return("/abc/xyz")
         frame = StackFrame.new("/abc/xyz/app/controllers/crap_controller.rb", 123, "index")
         frame.pretty_path.should == frame.application_path
       end
       
-      it "should return #gem_path for gem paths" do
-        Gem.stub!(:path).and_return(["/abc/xyz"])
+      it "returns #gem_path for gem paths" do
+        Gem.stub(:path).and_return(["/abc/xyz"])
         frame = StackFrame.new("/abc/xyz/gems/whatever-1.2.3/lib/whatever.rb", 123, "foo")
         
         frame.pretty_path.should == frame.gem_path
       end
     end
 
-    it "should special case SyntaxErrors" do
-      syntax_error = SyntaxError.allocate
-      Exception.instance_method(:initialize).bind(syntax_error).call("my_file.rb:123: you wrote bad ruby!")
+    it "special cases SyntaxErrors" do
+      begin
+        eval(%{ raise SyntaxError, "you wrote bad ruby!" }, nil, "my_file.rb", 123)
+      rescue SyntaxError => syntax_error
+      end
       frames = StackFrame.from_exception(syntax_error)
       frames.first.filename.should == "my_file.rb"
       frames.first.line.should == 123
     end
     
-    it "should not blow up if no method name is given" do
+    it "doesn't blow up if no method name is given" do
       error = StandardError.allocate
       
-      error.stub!(:backtrace).and_return(["foo.rb:123"])
+      error.stub(:backtrace).and_return(["foo.rb:123"])
       frames = StackFrame.from_exception(error)
       frames.first.filename.should == "foo.rb"
       frames.first.line.should == 123
       
-      error.stub!(:backtrace).and_return(["foo.rb:123: this is an error message"])
+      error.stub(:backtrace).and_return(["foo.rb:123: this is an error message"])
       frames = StackFrame.from_exception(error)
       frames.first.filename.should == "foo.rb"
       frames.first.line.should == 123
     end
     
-    it "should ignore a backtrace line if its format doesn't make any sense at all" do
+    it "ignores a backtrace line if its format doesn't make any sense at all" do
       error = StandardError.allocate
-      error.stub!(:backtrace).and_return(["foo.rb:123:in `foo'", "C:in `find'", "bar.rb:123:in `bar'"])
+      error.stub(:backtrace).and_return(["foo.rb:123:in `foo'", "C:in `find'", "bar.rb:123:in `bar'"])
       frames = StackFrame.from_exception(error)
       frames.count.should == 2
     end
     
-    it "should not blow up if a filename contains a colon" do
+    it "doesn't blow up if a filename contains a colon" do
       error = StandardError.allocate
-      error.stub!(:backtrace).and_return(["crap:filename.rb:123"])
+      error.stub(:backtrace).and_return(["crap:filename.rb:123"])
       frames = StackFrame.from_exception(error)
       frames.first.filename.should == "crap:filename.rb"
     end
+
+    it "doesn't blow up with a BasicObject as frame binding" do
+      obj = BasicObject.new
+      def obj.my_binding
+        ::Kernel.binding
+      end
+      frame = StackFrame.new("/abc/xyz/app/controllers/crap_controller.rb", 123, "index", obj.my_binding)
+      if RUBY_VERSION >= "2.0.0"
+        frame.class_name.should == 'BasicObject'
+      else
+        frame.class_name.should be_nil
+      end
+    end
+
+    it "sets method names properly" do
+      obj = "string"
+      def obj.my_method
+        begin
+          raise "foo"
+        rescue => err
+          err
+        end
+      end
+
+      frame = StackFrame.from_exception(obj.my_method).first
+      if RUBY_VERSION >= "2.0.0"
+        frame.method_name.should == "#my_method"
+        frame.class_name.should == "String"
+      else
+        frame.method_name.should == "my_method"
+        frame.class_name.should be_nil
+      end
+    end
+
+    if RUBY_ENGINE == "java"
+      it "doesn't blow up on a native Java exception" do
+        expect { StackFrame.from_exception(java.lang.Exception.new) }.to_not raise_error
+      end
+    end
   end
 end

data/spec/better_errors_spec.rb

@@ -2,12 +2,72 @@ require "spec_helper"
 
 describe BetterErrors do
   context ".editor" do
-    it "should default to textmate" do
+    it "defaults to textmate" do
       subject.editor["foo.rb", 123].should == "txmt://open?url=file://foo.rb&line=123"
     end
-    
-    it "should url escape the filename" do
+
+    it "url escapes the filename" do
       subject.editor["&.rb", 0].should == "txmt://open?url=file://%26.rb&line=0"
     end
+
+    [:emacs, :emacsclient].each do |editor|
+      it "uses emacs:// scheme when set to #{editor.inspect}" do
+        subject.editor = editor
+        subject.editor[].should start_with "emacs://"
+      end
+    end
+
+    [:macvim, :mvim].each do |editor|
+      it "uses mvim:// scheme when set to #{editor.inspect}" do
+        subject.editor = editor
+        subject.editor[].should start_with "mvim://"
+      end
+    end
+
+    [:sublime, :subl, :st].each do |editor|
+      it "uses subl:// scheme when set to #{editor.inspect}" do
+        subject.editor = editor
+        subject.editor[].should start_with "subl://"
+      end
+    end
+
+    [:textmate, :txmt, :tm].each do |editor|
+      it "uses txmt:// scheme when set to #{editor.inspect}" do
+        subject.editor = editor
+        subject.editor[].should start_with "txmt://"
+      end
+    end
+
+    ["emacsclient", "/usr/local/bin/emacsclient"].each do |editor|
+      it "uses emacs:// scheme when EDITOR=#{editor}" do
+        ENV["EDITOR"] = editor
+        subject.editor = subject.default_editor
+        subject.editor[].should start_with "emacs://"
+      end
+    end
+
+    ["mvim -f", "/usr/local/bin/mvim -f"].each do |editor|
+      it "uses mvim:// scheme when EDITOR=#{editor}" do
+        ENV["EDITOR"] = editor
+        subject.editor = subject.default_editor
+        subject.editor[].should start_with "mvim://"
+      end
+    end
+
+    ["subl -w", "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"].each do |editor|
+      it "uses mvim:// scheme when EDITOR=#{editor}" do
+        ENV["EDITOR"] = editor
+        subject.editor = subject.default_editor
+        subject.editor[].should start_with "subl://"
+      end
+    end
+
+    ["mate -w", "/usr/bin/mate -w"].each do |editor|
+      it "uses txmt:// scheme when EDITOR=#{editor}" do
+        ENV["EDITOR"] = editor
+        subject.editor = subject.default_editor
+        subject.editor[].should start_with "txmt://"
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -2,5 +2,6 @@ require "simplecov"
 SimpleCov.start
 
 $: << File.expand_path("../../lib", __FILE__)
+ENV["EDITOR"] = nil
 require "better_errors"
 require "ostruct"

metadata

@@ -1,139 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: better_errors
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Charlie Somerville
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.0
-- !ruby/object:Gem::Dependency
-  name: binding_of_caller
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.6.6
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: Provides a better error page for Rails and other Rack apps. Includes
@@ -148,12 +50,10 @@ files:
 - .gitignore
 - .travis.yml
 - .yardopts
-- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- TIPS_AND_TRICKS.md
 - better_errors.gemspec
 - lib/better_errors.rb
 - lib/better_errors/code_formatter.rb
@@ -191,17 +91,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Better error page for Rails and other Rack apps