better_errors 0.9.0 → 1.0.0.rc1

data/lib/better_errors/templates/main.erb

@@ -41,6 +41,14 @@
         background: #f0f0f5;
     }
 
+    .clearfix::after{
+        clear: both;
+        content: ".";
+        display: block;
+        height: 0;
+        visibility: hidden;
+    }
+
     /* ---------------------------------------------------------------------
      * Basic layout
      * --------------------------------------------------------------------- */
@@ -379,7 +387,7 @@
      * Monospace
      * --------------------------------------------------------------------- */
 
-    pre, code, .repl input, .repl .prompt span, textarea {
+    pre, code, .repl input, .repl .prompt span, textarea, .code_linenums {
         font-family: menlo, lucida console, monospace;
         font-size: 8pt;
     }
@@ -396,6 +404,11 @@
         box-shadow: 0 0 10px rgba(0, 0, 0, 0.03), 1px 1px 0 rgba(0, 0, 0, 0.05), -1px 1px 0 rgba(0, 0, 0, 0.05), 0 0 0 4px rgba(0, 0, 0, 0.04);
     }
 
+    .code_block{
+        background: #f1f1f1;
+        border-left: 1px solid #ccc;
+    }
+
     /* Titlebar */
     .trace_info .title {
         background: #f1f1f1;
@@ -447,15 +460,30 @@
         box-shadow: inset 3px 3px 3px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(0, 0, 0, 0.1);
     }
 
-    .code {
-        margin-bottom: -1px;
+    .code_linenums{
+        background:#f1f1f1;
+        padding-top:10px;
+        padding-bottom:9px;
+        float:left;
+    }
+    
+    .code_linenums span{
+        display:block;
+        padding:0 12px;
     }
 
     .code {
+        margin-bottom: -1px;
+        border-top-left-radius:2px;
         padding: 10px 0;
         overflow: auto;
     }
 
+    .code pre{
+        padding-left:12px;
+        min-height:16px;
+    }
+
     /* Source unavailable */
     p.unavailable {
         padding: 20px 0 40px 0;
@@ -489,7 +517,7 @@
         100% { background: rgba(220, 30, 30, 0.1); }
     }
 
-    .code .highlight {
+    .code .highlight, .code_linenums .highlight {
         background: rgba(220, 30, 30, 0.1);
         -webkit-animation: highlight 400ms linear 1;
         -moz-animation: highlight 400ms linear 1;
@@ -773,7 +801,10 @@
         this.inputElement   = this.container.querySelector("input");
         this.outputElement  = this.container.querySelector("pre");
     
-        this.inputElement.onkeydown = this.onKeyDown.bind(this);
+        var self = this;
+        this.inputElement.onkeydown = function(ev) {
+            self.onKeyDown(ev);
+        };
     
         this.setPrompt(">>");
         
@@ -821,6 +852,7 @@
             self.writeRawOutput(response.highlighted_input + "\n");
             self.writeOutput(response.result);
             self.setPrompt(response.prompt);
+            self.setInput(response.prefilled_input);
         });
     };
     

data/lib/better_errors/templates/variable_info.erb

@@ -1,10 +1,11 @@
-<header class="trace_info">
+<header class="trace_info clearfix">
     <div class="title">
         <h2 class="name"><%= @frame.name %></h2>
         <div class="location"><span class="filename"><a href="<%= editor_url(@frame) %>"><%= @frame.pretty_path %></a></span></div>
     </div>
-    
-    <%== html_formatted_code_block @frame %>
+    <div class="code_block clearfix">
+        <%== html_formatted_code_block @frame %>
+    </div>
 
     <% if BetterErrors.binding_of_caller_available? && @frame.frame_binding %>
         <div class="repl">

data/lib/better_errors/version.rb

@@ -1,3 +1,3 @@
 module BetterErrors
-  VERSION = "0.9.0"
+  VERSION = "1.0.0.rc1"
 end

data/spec/better_errors/code_formatter_spec.rb

@@ -6,11 +6,11 @@ module BetterErrors
     
     let(:formatter) { CodeFormatter.new(filename, 8) }
     
-    it "should pick an appropriate scanner" do
+    it "picks an appropriate scanner" do
       formatter.coderay_scanner.should == :ruby
     end
     
-    it "should show 5 lines of context" do
+    it "shows 5 lines of context" do
       formatter.line_range.should == (3..13)
       
       formatter.context_lines.should == [
@@ -28,35 +28,35 @@ module BetterErrors
         ]
     end
 
-    it "should work when the line is right on the edge" do
+    it "works when the line is right on the edge" do
       formatter = CodeFormatter.new(filename, 20)
       formatter.line_range.should == (15..20)
     end
 
     describe CodeFormatter::HTML do
-      it "should highlight the erroring line" do
+      it "highlights the erroring line" do
         formatter = CodeFormatter::HTML.new(filename, 8)
         formatter.output.should =~ /highlight.*eight/
       end
 
-      it "should work when the line is right on the edge" do
+      it "works when the line is right on the edge" do
         formatter = CodeFormatter::HTML.new(filename, 20)
         formatter.output.should_not == formatter.source_unavailable
       end
       
-      it "should not barf when the lines don't make any sense" do
+      it "doesn't barf when the lines don't make any sense" do
         formatter = CodeFormatter::HTML.new(filename, 999)
         formatter.output.should == formatter.source_unavailable
       end
       
-      it "should not barf when the file doesn't exist" do
+      it "doesn't barf when the file doesn't exist" do
         formatter = CodeFormatter::HTML.new("fkdguhskd7e l", 1)
         formatter.output.should == formatter.source_unavailable
       end
     end
 
     describe CodeFormatter::Text do
-      it "should highlight the erroring line" do
+      it "highlights the erroring line" do
         formatter = CodeFormatter::Text.new(filename, 8)
         formatter.output.should == <<-TEXT.gsub(/^        /, "")
             3   three
@@ -73,17 +73,17 @@ module BetterErrors
         TEXT
       end
 
-      it "should work when the line is right on the edge" do
+      it "works when the line is right on the edge" do
         formatter = CodeFormatter::Text.new(filename, 20)
         formatter.output.should_not == formatter.source_unavailable
       end
 
-      it "should not barf when the lines don't make any sense" do
+      it "doesn't barf when the lines don't make any sense" do
         formatter = CodeFormatter::Text.new(filename, 999)
         formatter.output.should == formatter.source_unavailable
       end
       
-      it "should not barf when the file doesn't exist" do
+      it "doesn't barf when the file doesn't exist" do
         formatter = CodeFormatter::Text.new("fkdguhskd7e l", 1)
         formatter.output.should == formatter.source_unavailable
       end

data/spec/better_errors/error_page_spec.rb

@@ -18,30 +18,37 @@ module BetterErrors
       binding
     }
   
-    it "should include the error message" do
+    it "includes the error message" do
       response.should include("you divided by zero you silly goose!")
     end
   
-    it "should include the request path" do
+    it "includes the request path" do
       response.should include("/some/path")
     end
   
-    it "should include the exception class" do
+    it "includes the exception class" do
       response.should include("ZeroDivisionError")
     end
     
     context "variable inspection" do
       let(:exception) { empty_binding.eval("raise") rescue $! }
       
-      it "should show local variables" do
-        html = error_page.do_variables("index" => 0)[:html]
-        html.should include("local_a")
-        html.should include(":value_for_local_a")
-        html.should include("local_b")
-        html.should include(":value_for_local_b")
+      if BetterErrors.binding_of_caller_available?
+        it "shows local variables" do
+          html = error_page.do_variables("index" => 0)[:html]
+          html.should include("local_a")
+          html.should include(":value_for_local_a")
+          html.should include("local_b")
+          html.should include(":value_for_local_b")
+        end
+      else
+        it "tells the user to add binding_of_caller to their gemfile to get fancy features" do
+          html = error_page.do_variables("index" => 0)[:html]
+          html.should include(%{gem "binding_of_caller"})
+        end
       end
       
-      it "should show instance variables" do
+      it "shows instance variables" do
         html = error_page.do_variables("index" => 0)[:html]
         html.should include("inst_c")
         html.should include(":value_for_inst_c")
@@ -49,7 +56,7 @@ module BetterErrors
         html.should include(":value_for_inst_d")
       end
 
-      it "should show filter instance variables" do
+      it "shows filter instance variables" do
         BetterErrors.stub(:ignored_instance_variables).and_return([ :@inst_d ])
         html = error_page.do_variables("index" => 0)[:html]
         html.should include("inst_c")
@@ -59,8 +66,8 @@ module BetterErrors
       end
     end
     
-    it "should not die if the source file is not a real filename" do
-      exception.stub!(:backtrace).and_return([
+    it "doesn't die if the source file is not a real filename" do
+      exception.stub(:backtrace).and_return([
         "<internal:prelude>:10:in `spawn_rack_application'"
       ])
       response.should include("Source unavailable")

data/spec/better_errors/middleware_spec.rb

@@ -3,88 +3,107 @@ require "spec_helper"
 module BetterErrors
   describe Middleware do
     let(:app) { Middleware.new(->env { ":)" }) }
+    let(:exception) { RuntimeError.new("oh no :(") }
 
-    it "should pass non-error responses through" do
+    it "passes non-error responses through" do
       app.call({}).should == ":)"
     end
 
-    it "should call the internal methods" do
+    it "calls the internal methods" do
       app.should_receive :internal_call
       app.call("PATH_INFO" => "/__better_errors/1/preform_awesomness")
     end
 
-    it "should call the internal methods on any subfolder path" do
+    it "calls the internal methods on any subfolder path" do
       app.should_receive :internal_call
       app.call("PATH_INFO" => "/any_sub/folder/path/__better_errors/1/preform_awesomness")
     end
 
-    it "should show the error page" do
+    it "shows the error page" do
       app.should_receive :show_error_page
       app.call("PATH_INFO" => "/__better_errors/")
     end
 
-    it "should show the error page on any subfolder path" do
+    it "shows the error page on any subfolder path" do
       app.should_receive :show_error_page
       app.call("PATH_INFO" => "/any_sub/folder/path/__better_errors/")
     end
 
-    it "should not show the error page to a non-local address" do
+    it "doesn't show the error page to a non-local address" do
       app.should_not_receive :better_errors_call
       app.call("REMOTE_ADDR" => "1.2.3.4")
     end
 
-    it "should show to a whitelisted IP" do
+    it "shows to a whitelisted IP" do
       BetterErrors::Middleware.allow_ip! '77.55.33.11'
       app.should_receive :better_errors_call
       app.call("REMOTE_ADDR" => "77.55.33.11")
     end
 
+    it "doesn't blow up when given a blank REMOTE_ADDR" do
+      expect { app.call("REMOTE_ADDR" => " ") }.to_not raise_error
+    end
+
+    it "doesn't blow up when given an IP address with a zone index" do
+      expect { app.call("REMOTE_ADDR" => "0:0:0:0:0:0:0:1%0" ) }.to_not raise_error
+    end
+
     context "when requesting the /__better_errors manually" do
       let(:app) { Middleware.new(->env { ":)" }) }
 
-      it "should show that no errors have been recorded" do
+      it "shows that no errors have been recorded" do
         status, headers, body = app.call("PATH_INFO" => "/__better_errors")
         body.join.should match /No errors have been recorded yet./
       end
 
-      it "should show that no errors have been recorded on any subfolder path" do
+      it "shows that no errors have been recorded on any subfolder path" do
         status, headers, body = app.call("PATH_INFO" => "/any_sub/folder/path/__better_errors")
         body.join.should match /No errors have been recorded yet./
       end
     end
 
     context "when handling an error" do
-      let(:app) { Middleware.new(->env { raise "oh no :(" }) }
+      let(:app) { Middleware.new(->env { raise exception }) }
 
-      it "should return status 500" do
+      it "returns status 500" do
         status, headers, body = app.call({})
 
         status.should == 500
       end
 
-      it "should return UTF-8 error pages" do
+      it "returns ExceptionWrapper's status_code" do
+        ad_ew = double("ActionDispatch::ExceptionWrapper")
+        ad_ew.stub('new').with({}, exception ){ double("ExceptionWrapper", status_code: 404) }
+        stub_const('ActionDispatch::ExceptionWrapper', ad_ew)
+
+        status, headers, body = app.call({})
+
+        status.should == 404
+      end
+
+      it "returns UTF-8 error pages" do
         status, headers, body = app.call({})
 
         headers["Content-Type"].should match /charset=utf-8/
       end
 
-      it "should return text pages by default" do
+      it "returns text pages by default" do
         status, headers, body = app.call({})
 
         headers["Content-Type"].should match /text\/plain/
       end
 
-      it "should return HTML pages by default" do
+      it "returns HTML pages by default" do
         # Chrome's 'Accept' header looks similar this.
         status, headers, body = app.call("HTTP_ACCEPT" => "text/html,application/xhtml+xml;q=0.9,*/*")
 
         headers["Content-Type"].should match /text\/html/
       end
 
-      it "should log the exception" do
+      it "logs the exception" do
         logger = Object.new
         logger.should_receive :fatal
-        BetterErrors.stub!(:logger).and_return(logger)
+        BetterErrors.stub(:logger).and_return(logger)
 
         app.call({})
       end

data/spec/better_errors/repl/basic_spec.rb

@@ -12,7 +12,7 @@ module BetterErrors
       
       let(:repl) { Basic.new fresh_binding }
 
-      it_behaves_like "a good repl should"
+      it_behaves_like "a REPL provider"
     end
   end
 end

data/spec/better_errors/repl/pry_spec.rb

@@ -13,21 +13,24 @@ module BetterErrors
 
       let(:repl) { Pry.new fresh_binding }
 
-      it_behaves_like "a good repl should"
-
-      it "should do line continuation" do
-        output, prompt = repl.send_input ""
+      it "does line continuation" do
+        output, prompt, filled = repl.send_input ""
         output.should == "=> nil\n"
         prompt.should == ">>"
+        filled.should == ""
 
-        output, prompt = repl.send_input "def f(x)"
+        output, prompt, filled = repl.send_input "def f(x)"
         output.should == ""
         prompt.should == ".."
+        filled.should == "  "
 
-        output, prompt = repl.send_input "end"
+        output, prompt, filled = repl.send_input "end"
         output.should == "=> nil\n"
         prompt.should == ">>"
+        filled.should == ""
       end
+
+      it_behaves_like "a REPL provider"
     end
   end
 end

data/spec/better_errors/repl/shared_examples.rb

@@ -1,22 +1,18 @@
-module BetterErrors
-  module REPL
-    shared_examples "a good repl should" do
-      it "should evaluate ruby code in a given context" do
-        repl.send_input("local_a = 456")
-        fresh_binding.eval("local_a").should == 456
-      end
-      
-      it "should return a tuple of output and the new prompt" do
-        output, prompt = repl.send_input("1 + 2")
-        output.should == "=> 3\n"
-        prompt.should == ">>"
-      end
-      
-      it "should not barf if the code throws an exception" do
-        output, prompt = repl.send_input("raise Exception")
-        output.should include "Exception: Exception"
-        prompt.should == ">>"
-      end
-    end
+shared_examples_for "a REPL provider" do
+  it "evaluates ruby code in a given context" do
+    repl.send_input("local_a = 456")
+    fresh_binding.eval("local_a").should == 456
+  end
+  
+  it "returns a tuple of output and the new prompt" do
+    output, prompt = repl.send_input("1 + 2")
+    output.should == "=> 3\n"
+    prompt.should == ">>"
+  end
+  
+  it "doesn't barf if the code throws an exception" do
+    output, prompt = repl.send_input("raise Exception")
+    output.should include "Exception: Exception"
+    prompt.should == ">>"
   end
 end