better_errors 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29ae99a691ade2e90114703be9bc09dfccf220b4
-  data.tar.gz: 07dc30996fea81069a374862faf29989c843a06e
+  metadata.gz: bc36d3113c7041816a7697fbd1e50333f5976003
+  data.tar.gz: 834f3f4a4903a45f150d83adde3f25452d2fd86b
 SHA512:
-  metadata.gz: 9aa2006d43787d6931c28baddd137fbeebeae07efac5aab3b9ed052e8c3ab3d610b15c196f7a69c109606c423f6b9e25b84b7975aeb2baec5fb0c484208f2723
-  data.tar.gz: f17296d9da8e87080839aabd3a1e113b6768885c3e2a4ed48dd3d73734d33c9c31b242fbfe0bfd475b350d1f99cccc2cd0efea08d9ee621db64b5f557c8645ea
+  metadata.gz: 130d61a4ce2e5509eb1585dfa0e3c620bf54387ac6a0931d1a534296460a0e06601a6d71ce41b3d3ffbd15951626ddfd7e753bb1bc911c35cf76cfa52cfcd771
+  data.tar.gz: 5906697a352187036b92cdefe124fea459405d7e3cc80f3bcc6f07c7a2952f328367f452e88272947edef464a4cc75fbe3d276c24580b9b633b6f9e60c99a60d

data/.gitignore

@@ -1,6 +1,8 @@
 *.gem
-tmp
-Gemfile.lock
-coverage
-.yardoc
-doc
+/tmp
+/Gemfile.lock
+/coverage
+/.yardoc
+/doc
+/.bundle
+/vendor/gems

data/.travis.yml

@@ -1,6 +1,4 @@
 language: ruby
 rvm:
+  - 2.1.0
   - 2.0.0
-  - 1.9.3
-  - 1.9.2
-  - jruby-1.7.4

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+# Changelog
+
+See https://github.com/charliesome/better_errors/releases

data/Gemfile

@@ -3,9 +3,9 @@ source 'https://rubygems.org'
 gemspec
 
 gem "rake"
+gem "rack"
 gem "rspec", "2.14.1"
 gem "binding_of_caller", platforms: :ruby
 gem "pry", "0.9.12"
-gem "simplecov"
 gem "yard"
 gem "kramdown"

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Charlie Somerville
+Copyright (c) 2014 Charlie Somerville
 
 MIT License
 

data/README.md

@@ -1,4 +1,4 @@
-# Better Errors [![Build Status](https://travis-ci.org/charliesome/better_errors.png)](https://travis-ci.org/charliesome/better_errors) [![Code Climate](https://codeclimate.com/github/charliesome/better_errors.png)](https://codeclimate.com/github/charliesome/better_errors)
+# Better Errors [![Gem Version](http://img.shields.io/gem/v/better_errors.svg)](https://rubygems.org/gems/better_errors) [![Build Status](https://travis-ci.org/charliesome/better_errors.svg)](https://travis-ci.org/charliesome/better_errors) [![Code Climate](http://img.shields.io/codeclimate/github/charliesome/better_errors.svg)](https://codeclimate.com/github/charliesome/better_errors)
 
 Better Errors replaces the standard Rails error page with a much better and more useful error page. It is also usable outside of Rails in any Rack app as Rack middleware.
 
@@ -29,6 +29,8 @@ gem "binding_of_caller"
 
 This is an optional dependency however, and Better Errors will work without it.
 
+_Note: If you discover that Better Errors isn't working - particularly after upgrading from version 0.5.0 or less - be sure to set `config.consider_all_requests_local = true` in `config/environments/development.rb`._
+
 ## Security
 
 **NOTE:** It is *critical* you put better\_errors in the **development** section. **Do NOT run better_errors in production, or on Internet facing hosts.**

data/Rakefile

@@ -1,4 +1,13 @@
 require "bundler/gem_tasks"
-task :default => :spec
-task :test => :spec
-task :spec do sh 'bundle exec rspec' end
+require "rspec/core/rake_task"
+
+namespace :test do
+  RSpec::Core::RakeTask.new(:with_binding_of_caller)
+
+  without_task = RSpec::Core::RakeTask.new(:without_binding_of_caller)
+  without_task.ruby_opts = "-I spec -r without_binding_of_caller"
+
+  task :all => [:with_binding_of_caller, :without_binding_of_caller]
+end
+
+task :default => "test:all"

data/better_errors.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'better_errors/version'
@@ -17,10 +16,11 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = ">= 1.9.2"
-  
+  s.required_ruby_version = ">= 2.0.0"
+
   s.add_dependency "erubis", ">= 2.6.6"
   s.add_dependency "coderay", ">= 1.0.0"
+  s.add_dependency "rack", ">= 0.9.0"
 
   # optional dependencies:
   # s.add_dependency "binding_of_caller"

data/lib/better_errors/error_page.rb

@@ -1,5 +1,6 @@
 require "cgi"
 require "json"
+require "securerandom"
 
 module BetterErrors
   # @private
@@ -7,42 +8,46 @@ module BetterErrors
     def self.template_path(template_name)
       File.expand_path("../templates/#{template_name}.erb", __FILE__)
     end
-    
+
     def self.template(template_name)
       Erubis::EscapedEruby.new(File.read(template_path(template_name)))
     end
-    
+
     attr_reader :exception, :env, :repls
-    
+
     def initialize(exception, env)
-      @exception = real_exception(exception)
+      @exception = RaisedException.new(exception)
       @env = env
       @start_time = Time.now.to_f
       @repls = []
     end
-    
+
+    def id
+      @id ||= SecureRandom.hex(8)
+    end
+
     def render(template_name = "main")
       self.class.template(template_name).result binding
     end
-    
+
     def do_variables(opts)
       index = opts["index"].to_i
       @frame = backtrace_frames[index]
       @var_start_time = Time.now.to_f
       { html: render("variable_info") }
     end
-    
+
     def do_eval(opts)
       index = opts["index"].to_i
       code = opts["source"]
-      
+
       unless binding = backtrace_frames[index].frame_binding
         return { error: "REPL unavailable in this stack frame" }
       end
-      
+
       result, prompt, prefilled_input =
         (@repls[index] ||= REPL.provider.new(binding)).send_input(code)
-      
+
       { result: result,
         prompt: prompt,
         prefilled_input: prefilled_input,
@@ -50,22 +55,22 @@ module BetterErrors
     end
 
     def backtrace_frames
-      @backtrace_frames ||= StackFrame.from_exception(exception)
+      exception.backtrace
     end
 
     def application_frames
-      backtrace_frames.select { |frame| frame.context == :application }
+      backtrace_frames.select(&:application?)
     end
 
     def first_frame
-      backtrace_frames.detect { |frame| frame.context == :application } || backtrace_frames.first
+      application_frames.first || backtrace_frames.first
     end
-    
+
   private
     def editor_url(frame)
       BetterErrors.editor[frame.filename, frame.line]
     end
-    
+
     def rack_session
       env['rack.session']
     end
@@ -77,31 +82,15 @@ module BetterErrors
     def uri_prefix
       env["SCRIPT_NAME"] || ""
     end
-  
-    def exception_message
-      if exception.is_a?(SyntaxError) && exception.message =~ /\A.*:\d*: (.*)$/
-        $1
-      else
-        exception.message
-      end
-    end
 
-    def real_exception(exception)
-      if exception.respond_to? :original_exception
-        exception.original_exception
-      else
-        exception
-      end
-    end
-  
     def request_path
       env["PATH_INFO"]
     end
-    
+
     def html_formatted_code_block(frame)
       CodeFormatter::HTML.new(frame.filename, frame.line).output
     end
-    
+
     def text_formatted_code_block(frame)
       CodeFormatter::Text.new(frame.filename, frame.line).output
     end

data/lib/better_errors/exception_extension.rb

@@ -0,0 +1,17 @@
+module BetterErrors
+  module ExceptionExtension
+    prepend_features Exception
+
+    def set_backtrace(*)
+      if caller_locations.none? { |loc| loc.path == __FILE__ }
+        @__better_errors_bindings_stack = ::Kernel.binding.callers.drop(1)
+      end
+
+      super
+    end
+
+    def __better_errors_bindings_stack
+      @__better_errors_bindings_stack || []
+    end
+  end
+end

data/lib/better_errors/middleware.rb

@@ -1,6 +1,7 @@
 require "json"
 require "ipaddr"
 require "set"
+require "rack"
 
 module BetterErrors
   # Better Errors' error handling middleware. Including this in your middleware
@@ -62,16 +63,15 @@ module BetterErrors
   private
 
     def allow_ip?(env)
-      # REMOTE_ADDR is not in the rack spec, so some application servers do
-      # not provide it.
-      return true unless env["REMOTE_ADDR"] and !env["REMOTE_ADDR"].strip.empty?
-      ip = IPAddr.new env["REMOTE_ADDR"].split("%").first
+      request = Rack::Request.new(env)
+      return true unless request.ip and !request.ip.strip.empty?
+      ip = IPAddr.new request.ip.split("%").first
       ALLOWED_IPS.any? { |subnet| subnet.include? ip }
     end
 
     def better_errors_call(env)
       case env["PATH_INFO"]
-      when %r{/__better_errors/(?<oid>-?\d+)/(?<method>\w+)\z}
+      when %r{/__better_errors/(?<id>.+?)/(?<method>\w+)\z}
         internal_call env, $~
       when %r{/__better_errors/?\z}
         show_error_page env
@@ -115,7 +115,7 @@ module BetterErrors
     def log_exception
       return unless BetterErrors.logger
 
-      message = "\n#{@error_page.exception.class} - #{@error_page.exception.message}:\n"
+      message = "\n#{@error_page.exception.type} - #{@error_page.exception.message}:\n"
       @error_page.backtrace_frames.each do |frame|
         message << "  #{frame}\n"
       end
@@ -124,7 +124,7 @@ module BetterErrors
     end
 
     def internal_call(env, opts)
-      if opts[:oid].to_i != @error_page.object_id
+      if opts[:id] != @error_page.id
         return [200, { "Content-Type" => "text/plain; charset=utf-8" }, [JSON.dump(error: "Session expired")]]
       end
 

data/lib/better_errors/raised_exception.rb

@@ -0,0 +1,66 @@
+# @private
+module BetterErrors
+  class RaisedException
+    attr_reader :exception, :message, :backtrace
+
+    def initialize(exception)
+      if exception.respond_to?(:original_exception) && exception.original_exception
+        exception = exception.original_exception
+      end
+
+      @exception = exception
+      @message = exception.message
+
+      setup_backtrace
+      massage_syntax_error
+    end
+
+    def type
+      exception.class
+    end
+
+  private
+    def has_bindings?
+      exception.respond_to?(:__better_errors_bindings_stack) && exception.__better_errors_bindings_stack.any?
+    end
+
+    def setup_backtrace
+      if has_bindings?
+        setup_backtrace_from_bindings
+      else
+        setup_backtrace_from_backtrace
+      end
+    end
+
+    def setup_backtrace_from_bindings
+      @backtrace = exception.__better_errors_bindings_stack.map { |binding|
+        file = binding.eval "__FILE__"
+        line = binding.eval "__LINE__"
+        name = binding.frame_description
+        StackFrame.new(file, line, name, binding)
+      }
+    end
+
+    def setup_backtrace_from_backtrace
+      @backtrace = (exception.backtrace || []).map { |frame|
+        if /\A(?<file>.*?):(?<line>\d+)(:in `(?<name>.*)')?/ =~ frame
+          StackFrame.new(file, line.to_i, name)
+        end
+      }.compact
+    end
+
+    def massage_syntax_error
+      case exception.class.to_s
+      when "Haml::SyntaxError"
+        if /\A(.+?):(\d+)/ =~ exception.backtrace.first
+          backtrace.unshift(StackFrame.new($1, $2.to_i, ""))
+        end
+      when "SyntaxError"
+        if /\A(.+?):(\d+): (.*)/m =~ exception.message
+          backtrace.unshift(StackFrame.new($1, $2.to_i, ""))
+          @message = $3
+        end
+      end
+    end
+  end
+end

data/lib/better_errors/repl/pry.rb

@@ -36,8 +36,8 @@ module BetterErrors
         @fiber = Fiber.new do
           @pry.repl binding
         end
-        @input = Input.new
-        @output = Output.new
+        @input = BetterErrors::REPL::Pry::Input.new
+        @output = BetterErrors::REPL::Pry::Output.new
         @pry = ::Pry.new input: @input, output: @output
         @pry.hooks.clear_all if defined?(@pry.hooks.clear_all)
         @fiber.resume

data/lib/better_errors/stack_frame.rb

@@ -4,67 +4,26 @@ module BetterErrors
   # @private
   class StackFrame
     def self.from_exception(exception)
-      if has_binding_stack?(exception)
-        list = exception.__better_errors_bindings_stack.map { |binding|
-          file = binding.eval "__FILE__"
-          line = binding.eval "__LINE__"
-          name = binding.frame_description
-          StackFrame.new(file, line, name, binding)
-        }
-      else
-        list = (exception.backtrace || []).map { |frame|
-          next unless md = /\A(?<file>.*?):(?<line>\d+)(:in `(?<name>.*)')?/.match(frame)
-          StackFrame.new(md[:file], md[:line].to_i, md[:name])
-        }.compact
-      end
-
-      if syntax_error?(exception)
-        if trace = exception.backtrace and trace.first =~ /\A(.*):(\d+)/
-          list.unshift StackFrame.new($1, $2.to_i, "")
-        end
-      end
-
-      list
+      RaisedException.new(exception).backtrace
     end
 
-    def self.syntax_error_classes
-      # Better Errors may be loaded before some of the gems that provide these
-      # classes, so we lazily set up the set of syntax error classes at runtime
-      # after everything has hopefully had a chance to load.
-      #
-      @syntax_error_classes ||= begin
-        class_names = %w[
-          Haml::SyntaxError
-        ]
-
-        Set.new(class_names.map { |klass| eval(klass) rescue nil }.compact)
-      end
-    end
-
-    def self.syntax_error?(exception)
-      exception.is_a?(SyntaxError) || syntax_error_classes.include?(exception.class)
-    end
-
-    def self.has_binding_stack?(exception)
-      exception.respond_to?(:__better_errors_bindings_stack) && exception.__better_errors_bindings_stack.any?
-    end
-    
     attr_reader :filename, :line, :name, :frame_binding
-    
+
     def initialize(filename, line, name, frame_binding = nil)
       @filename       = filename
       @line           = line
       @name           = name
       @frame_binding  = frame_binding
-      
+
       set_pretty_method_name if frame_binding
     end
-    
+
     def application?
-      root = BetterErrors.application_root
-      filename.index(root) == 0 if root
+      if root = BetterErrors.application_root
+        filename.index(root) == 0 && filename.index("#{root}/vendor") != 0
+      end
     end
-    
+
     def application_path
       filename[(BetterErrors.application_root.length+1)..-1]
     end
@@ -72,7 +31,7 @@ module BetterErrors
     def gem?
       Gem.path.any? { |path| filename.index(path) == 0 }
     end
-    
+
     def gem_path
       if path = Gem.path.detect { |path| filename.index(path) == 0 }
         gem_name_and_version, path = filename.sub("#{path}/gems/", "").split("/", 2)
@@ -88,7 +47,7 @@ module BetterErrors
     def method_name
       @method_name || @name
     end
-    
+
     def context
       if gem?
         :gem
@@ -98,7 +57,7 @@ module BetterErrors
         :dunno
       end
     end
-    
+
     def pretty_path
       case context
       when :application;  application_path
@@ -106,23 +65,18 @@ module BetterErrors
       else                filename
       end
     end
-    
+
     def local_variables
       return {} unless frame_binding
       frame_binding.eval("local_variables").each_with_object({}) do |name, hash|
-        begin
-          if defined?(frame_binding.local_variable_get)
-            hash[name] = frame_binding.local_variable_get(name)
-          else
-            hash[name] = frame_binding.eval(name.to_s)
-          end
-        rescue NameError => e
-          # local_variables sometimes returns broken variables.
-          # https://bugs.ruby-lang.org/issues/7536
+        if defined?(frame_binding.local_variable_get)
+          hash[name] = frame_binding.local_variable_get(name)
+        else
+          hash[name] = frame_binding.eval(name.to_s)
         end
       end
     end
-    
+
     def instance_variables
       return {} unless frame_binding
       Hash[visible_instance_variables.map { |x|
@@ -137,17 +91,15 @@ module BetterErrors
     def to_s
       "#{pretty_path}:#{line}:in `#{name}'"
     end
-    
+
   private
     def set_pretty_method_name
-      return if RUBY_VERSION < "2.0.0"
-
       name =~ /\A(block (\([^)]+\) )?in )?/
       recv = frame_binding.eval("self")
 
       return unless method_name = frame_binding.eval("::Kernel.__method__")
 
-      if Kernel.instance_method(:is_a?).bind(recv).call Module
+      if Module === recv
         @class_name = "#{$1}#{recv}"
         @method_name = ".#{method_name}"
       else

data/lib/better_errors/templates/main.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title><%= exception.class %> at <%= request_path %></title>
+    <title><%= exception.type %> at <%= request_path %></title>
 </head>
 <body>
     <%# Stylesheets are placed in the <body> for Turbolinks compatibility. %>
@@ -180,6 +180,7 @@
         padding-right: 20px;
         overflow-y: auto;
         word-wrap: break-word;
+        white-space: pre-wrap;
         height: auto;
         max-height: 7em;
     }
@@ -443,13 +444,13 @@
         font-weight: bold;
         font-size: 10pt;
     }
-    
+
     .trace_info .title .location a {
         color:inherit;
         text-decoration:none;
         border-bottom:1px solid #aaaaaa;
     }
-    
+
     .trace_info .title .location a:hover {
         border-color:#666666;
     }
@@ -472,7 +473,7 @@
         padding-bottom:9px;
         float:left;
     }
-    
+
     .code_linenums span{
         display:block;
         padding:0 12px;
@@ -730,8 +731,8 @@
 
     <div class='top'>
         <header class="exception">
-            <h2><strong><%= exception.class %></strong> <span>at <%= request_path %></span></h2>
-            <p><%= exception_message %></p>
+            <h2><strong><%= exception.type %></strong> <span>at <%= request_path %></span></h2>
+            <p><%= exception.message %></p>
         </header>
     </div>
 
@@ -767,8 +768,8 @@
 <script>
 (function() {
 
-    var OID = <%== object_id.to_s.inspect %>;
-    
+    var OID = "<%= id %>";
+
     var previousFrame = null;
     var previousFrameInfo = null;
     var allFrames = document.querySelectorAll("ul.frames li");
@@ -786,68 +787,73 @@
             }
         };
     }
-    
+
     function escapeHTML(html) {
         return html.replace(/&/, "&amp;").replace(/</g, "&lt;");
     }
-    
+
     function REPL(index) {
         this.index = index;
-        
-        this.previousCommands = [];
-        this.previousCommandOffset = 0;
+
+        var previousCommands = JSON.parse(localStorage.getItem("better_errors_previous_commands"));
+        if(previousCommands === null) {
+          localStorage.setItem("better_errors_previous_commands", JSON.stringify([]));
+          previousCommands = [];
+        }
+
+        this.previousCommandOffset = previousCommands.length;
     }
-    
+
     REPL.all = [];
-    
+
     REPL.prototype.install = function(containerElement) {
         this.container = containerElement;
-    
+
         this.promptElement  = this.container.querySelector(".prompt span");
         this.inputElement   = this.container.querySelector("input");
         this.outputElement  = this.container.querySelector("pre");
-    
+
         var self = this;
         this.inputElement.onkeydown = function(ev) {
             self.onKeyDown(ev);
         };
-    
+
         this.setPrompt(">>");
-        
+
         REPL.all[this.index] = this;
     }
-    
+
     REPL.prototype.focus = function() {
         this.inputElement.focus();
     };
-    
+
     REPL.prototype.setPrompt = function(prompt) {
         this._prompt = prompt;
         this.promptElement.innerHTML = escapeHTML(prompt);
     };
-    
+
     REPL.prototype.getInput = function() {
         return this.inputElement.value;
     };
-    
+
     REPL.prototype.setInput = function(text) {
         this.inputElement.value = text;
-        
+
         if(this.inputElement.setSelectionRange) {
             // set cursor to end of input
             this.inputElement.setSelectionRange(text.length, text.length);
         }
     };
-    
+
     REPL.prototype.writeRawOutput = function(output) {
         this.outputElement.innerHTML += output;
         this.outputElement.scrollTop = this.outputElement.scrollHeight;
     };
-    
+
     REPL.prototype.writeOutput = function(output) {
         this.writeRawOutput(escapeHTML(output));
     };
-    
+
     REPL.prototype.sendInput = function(line) {
         var self = this;
         apiCall("eval", { "index": this.index, source: line }, function(response) {
@@ -861,48 +867,56 @@
             self.setInput(response.prefilled_input);
         });
     };
-    
+
     REPL.prototype.onEnterKey = function() {
         var text = this.getInput();
         if(text != "" && text !== undefined) {
-            this.previousCommandOffset = this.previousCommands.push(text);
+            var previousCommands = JSON.parse(localStorage.getItem("better_errors_previous_commands"));
+            this.previousCommandOffset = previousCommands.push(text);
+            if(previousCommands.length > 100) {
+              previousCommands.splice(0, 1);
+            }
+            localStorage.setItem("better_errors_previous_commands", JSON.stringify(previousCommands));
         }
         this.setInput("");
         this.sendInput(text);
     };
-    
+
     REPL.prototype.onNavigateHistory = function(direction) {
         this.previousCommandOffset += direction;
-        
+        var previousCommands = JSON.parse(localStorage.getItem("better_errors_previous_commands"));
+
         if(this.previousCommandOffset < 0) {
             this.previousCommandOffset = -1;
             this.setInput("");
             return;
         }
-        
-        if(this.previousCommandOffset >= this.previousCommands.length) {
-            this.previousCommandOffset = this.previousCommands.length;
+
+        if(this.previousCommandOffset >= previousCommands.length) {
+            this.previousCommandOffset = previousCommands.length;
             this.setInput("");
             return;
         }
-        
-        this.setInput(this.previousCommands[this.previousCommandOffset]);
+
+        this.setInput(previousCommands[this.previousCommandOffset]);
     };
-    
+
     REPL.prototype.onKeyDown = function(ev) {
         if(ev.keyCode == 13) {
             this.onEnterKey();
-        } else if(ev.keyCode == 38) {
-            // the user pressed the up arrow.
+        } else if(ev.keyCode == 38 || (ev.ctrlKey && ev.keyCode == 80)) {
+            // the user pressed the up arrow or Ctrl-P
             this.onNavigateHistory(-1);
+            ev.preventDefault();
             return false;
-        } else if(ev.keyCode == 40) {
-            // the user pressed the down arrow.
+        } else if(ev.keyCode == 40 || (ev.ctrlKey && ev.keyCode == 78)) {
+            // the user pressed the down arrow or Ctrl-N
             this.onNavigateHistory(1);
+            ev.preventDefault();
             return false;
         }
     };
-    
+
     function switchTo(el) {
         if(previousFrameInfo) previousFrameInfo.style.display = "none";
         previousFrameInfo = el;
@@ -937,7 +951,7 @@
             });
         }
     }
-    
+
     for(var i = 0; i < allFrames.length; i++) {
         (function(i, el) {
             var el = allFrames[i];
@@ -947,12 +961,12 @@
                 }
                 el.className = "selected";
                 previousFrame = el;
-                
+
                 selectFrameInfo(el.attributes["data-index"].value);
             };
         })(i);
     }
-    
+
     // Click the first application frame
     (
       document.querySelector(".frames li.application") ||
@@ -968,7 +982,7 @@
     var applicationFramesButtonIsInstalled = false;
     var applicationFramesButton = document.getElementById("application_frames");
     var allFramesButton = document.getElementById("all_frames");
-    
+
     // The application frames button only needs to be bound if
     // there are actually any application frames to look at.
     var installApplicationFramesButton = function() {
@@ -984,10 +998,10 @@
             }
             return false;
         };
-        
+
         applicationFramesButtonIsInstalled = true;
     }
-    
+
     allFramesButton.onclick = function() {
         if(applicationFramesButtonIsInstalled) {
             applicationFramesButton.className = "";
@@ -999,7 +1013,7 @@
         }
         return false;
     };
-    
+
     // If there are no application frames, select the 'All Frames'
     // tab by default.
     if(applicationFramesCount > 0) {

data/lib/better_errors/templates/text.erb

@@ -1,6 +1,6 @@
-<%== text_heading("=", "%s at %s" % [exception.class, request_path]) %>
+<%== text_heading("=", "%s at %s" % [exception.type, request_path]) %>
 
-> <%== exception_message %>
+> <%== exception.message %>
 <% if backtrace_frames.any? %>
 
 <%== text_heading("-", "%s, line %i" % [first_frame.pretty_path, first_frame.line]) %>

data/lib/better_errors/version.rb

@@ -1,3 +1,3 @@
 module BetterErrors
-  VERSION = "1.0.1"
+  VERSION = "2.0.0"
 end

data/lib/better_errors.rb

@@ -3,12 +3,13 @@ require "erubis"
 require "coderay"
 require "uri"
 
-require "better_errors/version"
+require "better_errors/code_formatter"
 require "better_errors/error_page"
-require "better_errors/stack_frame"
 require "better_errors/middleware"
-require "better_errors/code_formatter"
+require "better_errors/raised_exception"
 require "better_errors/repl"
+require "better_errors/stack_frame"
+require "better_errors/version"
 
 module BetterErrors
   POSSIBLE_EDITOR_PRESETS = [
@@ -136,11 +137,10 @@ end
 
 begin
   require "binding_of_caller"
+  require "better_errors/exception_extension"
   BetterErrors.binding_of_caller_available = true
 rescue LoadError => e
   BetterErrors.binding_of_caller_available = false
 end
 
-require "better_errors/core_ext/exception"
-
 require "better_errors/rails" if defined? Rails::Railtie

data/spec/better_errors/middleware_spec.rb

@@ -40,6 +40,14 @@ module BetterErrors
       app.call("REMOTE_ADDR" => "77.55.33.11")
     end
 
+    it "respects the X-Forwarded-For header" do
+      app.should_not_receive :better_errors_call
+      app.call(
+        "REMOTE_ADDR"          => "127.0.0.1",
+        "HTTP_X_FORWARDED_FOR" => "1.2.3.4",
+      )
+    end
+
     it "doesn't blow up when given a blank REMOTE_ADDR" do
       expect { app.call("REMOTE_ADDR" => " ") }.to_not raise_error
     end
@@ -71,6 +79,40 @@ module BetterErrors
         status.should == 500
       end
 
+      context "original_exception" do
+        class OriginalExceptionException < Exception
+          attr_reader :original_exception
+
+          def initialize(message, original_exception = nil)
+            super(message)
+            @original_exception = original_exception
+          end
+        end
+
+        it "shows Original Exception if it responds_to and has an original_exception" do
+          app = Middleware.new(->env {
+            raise OriginalExceptionException.new("Other Exception", Exception.new("Original Exception"))
+          })
+
+          status, _, body = app.call({})
+
+          status.should == 500
+          body.join.should_not match(/Other Exception/)
+          body.join.should match(/Original Exception/)
+        end
+
+        it "won't crash if the exception responds_to but doesn't have an original_exception" do
+          app = Middleware.new(->env {
+            raise OriginalExceptionException.new("Other Exception")
+          })
+
+          status, _, body = app.call({})
+
+          status.should == 500
+          body.join.should match(/Other Exception/)
+        end
+      end
+
       it "returns ExceptionWrapper's status_code" do
         ad_ew = double("ActionDispatch::ExceptionWrapper")
         ad_ew.stub('new').with({}, exception ){ double("ExceptionWrapper", status_code: 404) }

data/spec/better_errors/raised_exception_spec.rb

@@ -0,0 +1,52 @@
+require "spec_helper"
+
+module BetterErrors
+  describe RaisedException do
+    let(:exception) { RuntimeError.new("whoops") }
+    subject { RaisedException.new(exception) }
+
+    its(:exception) { should == exception }
+    its(:message)   { should == "whoops" }
+    its(:type)      { should == RuntimeError }
+
+    context "when the exception wraps another exception" do
+      let(:original_exception) { RuntimeError.new("something went wrong!") }
+      let(:exception) { double(:original_exception => original_exception) }
+
+      its(:exception) { should == original_exception }
+      its(:message)   { should == "something went wrong!" }
+    end
+
+    context "when the exception is a syntax error" do
+      let(:exception) { SyntaxError.new("foo.rb:123: you made a typo!") }
+
+      its(:message) { should == "you made a typo!" }
+      its(:type)    { should == SyntaxError }
+
+      it "has the right filename and line number in the backtrace" do
+        subject.backtrace.first.filename.should == "foo.rb"
+        subject.backtrace.first.line.should == 123
+      end
+    end
+
+    context "when the exception is a HAML syntax error" do
+      before do
+        stub_const("Haml::SyntaxError", Class.new(SyntaxError))
+      end
+
+      let(:exception) {
+        Haml::SyntaxError.new("you made a typo!").tap do |ex|
+          ex.set_backtrace(["foo.rb:123", "haml/internals/blah.rb:123456"])
+        end
+      }
+
+      its(:message) { should == "you made a typo!" }
+      its(:type)    { should == Haml::SyntaxError }
+
+      it "has the right filename and line number in the backtrace" do
+        subject.backtrace.first.filename.should == "foo.rb"
+        subject.backtrace.first.line.should == 123
+      end
+    end
+  end
+end

data/spec/better_errors/repl/pry_spec.rb

@@ -25,7 +25,11 @@ module BetterErrors
         filled.should == "  "
 
         output, prompt, filled = repl.send_input "end"
-        output.should == "=> nil\n"
+        if RUBY_VERSION >= "2.1.0"
+          output.should == "=> :f\n"
+        else
+          output.should == "=> nil\n"
+        end
         prompt.should == ">>"
         filled.should == ""
       end

data/spec/better_errors/stack_frame_spec.rb

@@ -6,77 +6,77 @@ module BetterErrors
       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 "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 "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
       end
     end
-    
+
     context "#gem?" do
       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 "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
       end
     end
-    
+
     context "#application_path" do
       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"
       end
     end
-    
+
     context "#gem_path" do
       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 "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"
       end
     end
-    
+
     context "#pretty_path" do
       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 "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
@@ -90,28 +90,28 @@ module BetterErrors
       frames.first.filename.should == "my_file.rb"
       frames.first.line.should == 123
     end
-    
+
     it "doesn't blow up if no method name is given" do
       error = StandardError.allocate
-      
+
       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"])
       frames = StackFrame.from_exception(error)
       frames.first.filename.should == "foo.rb"
       frames.first.line.should == 123
     end
-    
+
     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'"])
       frames = StackFrame.from_exception(error)
       frames.count.should == 2
     end
-    
+
     it "doesn't blow up if a filename contains a colon" do
       error = StandardError.allocate
       error.stub(:backtrace).and_return(["crap:filename.rb:123"])
@@ -125,11 +125,7 @@ module BetterErrors
         ::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
+      frame.class_name.should == 'BasicObject'
     end
 
     it "sets method names properly" do
@@ -143,12 +139,12 @@ module BetterErrors
       end
 
       frame = StackFrame.from_exception(obj.my_method).first
-      if RUBY_VERSION >= "2.0.0"
+      if BetterErrors.binding_of_caller_available?
         frame.method_name.should == "#my_method"
         frame.class_name.should == "String"
       else
         frame.method_name.should == "my_method"
-        frame.class_name.should be_nil
+        frame.class_name.should == nil
       end
     end
 

data/spec/spec_helper.rb

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

data/spec/without_binding_of_caller.rb

@@ -0,0 +1,9 @@
+module Kernel
+  alias_method :require_with_binding_of_caller, :require
+
+  def require(feature)
+    raise LoadError if feature == "binding_of_caller"
+
+    require_with_binding_of_caller(feature)
+  end
+end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: better_errors
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Charlie Somerville
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !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
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 description: Provides a better error page for Rails and other Rack apps. Includes
   source code inspection, a live REPL and local/instance variable inspection for all
   stack frames.
@@ -47,9 +61,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -59,10 +74,11 @@ files:
 - lib/better_errors/code_formatter.rb
 - lib/better_errors/code_formatter/html.rb
 - lib/better_errors/code_formatter/text.rb
-- lib/better_errors/core_ext/exception.rb
 - lib/better_errors/error_page.rb
+- lib/better_errors/exception_extension.rb
 - lib/better_errors/middleware.rb
 - lib/better_errors/rails.rb
+- lib/better_errors/raised_exception.rb
 - lib/better_errors/repl.rb
 - lib/better_errors/repl/basic.rb
 - lib/better_errors/repl/pry.rb
@@ -74,6 +90,7 @@ files:
 - spec/better_errors/code_formatter_spec.rb
 - spec/better_errors/error_page_spec.rb
 - spec/better_errors/middleware_spec.rb
+- spec/better_errors/raised_exception_spec.rb
 - spec/better_errors/repl/basic_spec.rb
 - spec/better_errors/repl/pry_spec.rb
 - spec/better_errors/repl/shared_examples.rb
@@ -81,6 +98,7 @@ files:
 - spec/better_errors/support/my_source.rb
 - spec/better_errors_spec.rb
 - spec/spec_helper.rb
+- spec/without_binding_of_caller.rb
 homepage: https://github.com/charliesome/better_errors
 licenses:
 - MIT
@@ -91,17 +109,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Better error page for Rails and other Rack apps
@@ -109,6 +127,7 @@ test_files:
 - spec/better_errors/code_formatter_spec.rb
 - spec/better_errors/error_page_spec.rb
 - spec/better_errors/middleware_spec.rb
+- spec/better_errors/raised_exception_spec.rb
 - spec/better_errors/repl/basic_spec.rb
 - spec/better_errors/repl/pry_spec.rb
 - spec/better_errors/repl/shared_examples.rb
@@ -116,4 +135,4 @@ test_files:
 - spec/better_errors/support/my_source.rb
 - spec/better_errors_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 
+- spec/without_binding_of_caller.rb

data/lib/better_errors/core_ext/exception.rb

@@ -1,21 +0,0 @@
-class Exception
-  original_set_backtrace = instance_method(:set_backtrace)
-  
-  if BetterErrors.binding_of_caller_available?
-    define_method :set_backtrace do |*args|
-      unless Thread.current[:__better_errors_exception_lock]
-        Thread.current[:__better_errors_exception_lock] = true
-        begin
-          @__better_errors_bindings_stack = binding.callers.drop(1)
-        ensure
-          Thread.current[:__better_errors_exception_lock] = false
-        end
-      end
-      original_set_backtrace.bind(self).call(*args)
-    end
-  end
-  
-  def __better_errors_bindings_stack
-    @__better_errors_bindings_stack || []
-  end
-end