better_errors 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29ae99a691ade2e90114703be9bc09dfccf220b4
-  data.tar.gz: 07dc30996fea81069a374862faf29989c843a06e
+  metadata.gz: fe0694430a61558b1ad22a156922e9a162b02352
+  data.tar.gz: 6804d151297037d1eb778143d3eb807fe7573e9d
 SHA512:
-  metadata.gz: 9aa2006d43787d6931c28baddd137fbeebeae07efac5aab3b9ed052e8c3ab3d610b15c196f7a69c109606c423f6b9e25b84b7975aeb2baec5fb0c484208f2723
-  data.tar.gz: f17296d9da8e87080839aabd3a1e113b6768885c3e2a4ed48dd3d73734d33c9c31b242fbfe0bfd475b350d1f99cccc2cd0efea08d9ee621db64b5f557c8645ea
+  metadata.gz: 3d0c58b00e4b6965e8dfd3ae3ded8a9efbfde40f8878854cf3ed86b46a5b344e647a73e24f541de858ea1f9f1b6b6c5b29145896b73870ac3eb34219edafb9db
+  data.tar.gz: 5fc01d0bd170e712c28d0efde81fa177eff86b6b36862bef1217749e1b39778c6e97e1899bed429f66dfaecfee45de843328935fe746402508892657232cf7aa

data/CHANGELOG.md

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

data/lib/better_errors/error_page.rb

@@ -87,7 +87,7 @@ module BetterErrors
     end
 
     def real_exception(exception)
-      if exception.respond_to? :original_exception
+      if exception.respond_to?(:original_exception) && exception.original_exception.is_a?(Exception)
         exception.original_exception
       else
         exception

data/lib/better_errors/stack_frame.rb

@@ -48,23 +48,24 @@ module BetterErrors
     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 +73,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 +89,7 @@ module BetterErrors
     def method_name
       @method_name || @name
     end
-    
+
     def context
       if gem?
         :gem
@@ -98,7 +99,7 @@ module BetterErrors
         :dunno
       end
     end
-    
+
     def pretty_path
       case context
       when :application;  application_path
@@ -106,7 +107,7 @@ module BetterErrors
       else                filename
       end
     end
-    
+
     def local_variables
       return {} unless frame_binding
       frame_binding.eval("local_variables").each_with_object({}) do |name, hash|
@@ -122,7 +123,7 @@ module BetterErrors
         end
       end
     end
-    
+
     def instance_variables
       return {} unless frame_binding
       Hash[visible_instance_variables.map { |x|
@@ -137,7 +138,7 @@ module BetterErrors
     def to_s
       "#{pretty_path}:#{line}:in `#{name}'"
     end
-    
+
   private
     def set_pretty_method_name
       return if RUBY_VERSION < "2.0.0"

data/lib/better_errors/templates/main.erb

@@ -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;
@@ -768,7 +769,7 @@
 (function() {
 
     var OID = <%== object_id.to_s.inspect %>;
-    
+
     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/version.rb

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

data/spec/better_errors/middleware_spec.rb

@@ -71,6 +71,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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_errors
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Charlie Somerville
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -50,6 +50,7 @@ files:
 - .gitignore
 - .travis.yml
 - .yardopts
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md