better_errors 0.0.3 → 0.0.5

data/README.md

@@ -2,28 +2,30 @@
 
 Better Errors replaces the standard Rails error page with a much better and more useful error page. It is also usable outside of Rails.
 
-![image](http://i.imgur.com/quHUZ.png)
+![image](http://i.imgur.com/urVDW.png)
 
 ## Features
 
 * Full stack trace
 * Source code inspection for all stack frames (with highlighting)
 * Local and instance variable inspection
-* Ruby console on every stack frame
+* Live REPL on every stack frame
 
 ## Installation
 
 Add this line to your application's Gemfile (under the **development** group):
 
-    gem 'better_errors'
-
-And then execute:
+```ruby
+gem "better_errors"
+```
 
-    $ bundle
+If you would like to use Better Errors' **advanced features**, you need to add the [`binding_of_caller`](https://github.com/banister/binding_of_caller) gem to your Gemfile:
 
-Or install it yourself as:
+```ruby
+gem "binding_of_caller"
+```
 
-    $ gem install better_errors
+This is an optional dependency however, and Better Errors will work without it.
 
 ## Usage
 

data/lib/better_errors/error_page.rb

@@ -30,8 +30,10 @@ module BetterErrors
     
     def do_eval(opts)
       index = opts["index"].to_i
+      binding = backtrace_frames[index].frame_binding
+      return { error: "binding_of_caller unavailable" } unless binding
       response =  begin
-                    result = backtrace_frames[index].frame_binding.eval(opts["source"])
+                    result = binding.eval(opts["source"])
                     { result: result.inspect }
                   rescue Exception => e
                     { error: (e.inspect rescue e.class.name rescue "Exception") }

data/lib/better_errors/templates/main.erb

@@ -14,7 +14,7 @@
     }
     header {
         padding:32px 32px;
-        border-bottom:1px solid #ea6756;
+        border-bottom:1px solid #e64c38;
         background-color: #ffe5e7;
         background-image: -webkit-gradient(linear, left top, left bottom, from(#ffe5e7), to(#ffb2b8)); /* Safari 4+, Chrome */
         background-image: -webkit-linear-gradient(top, #ffe5e7, #ffb2b8); /* Chrome 10+, Safari 5.1+, iOS 5+ */
@@ -41,6 +41,40 @@
     header table th, header table td {
         padding:4px 6px;
     }
+    nav {
+        display:block;
+        padding:12px 12px;
+        border-bottom:1px solid #000000;
+        background-color: #444444;
+        background-image: -webkit-gradient(linear, left top, left bottom, from(#444444), to(#222222)); /* Safari 4+, Chrome */
+        background-image: -webkit-linear-gradient(top, #444444, #222222); /* Chrome 10+, Safari 5.1+, iOS 5+ */
+        background-image:    -moz-linear-gradient(top, #444444, #222222); /* Firefox 3.6-15 */
+        background-image:      -o-linear-gradient(top, #444444, #222222); /* Opera 11.10-12.00 */
+        background-image:         linear-gradient(to bottom, #444444, #222222); /* Firefox 16+, IE10, Opera 12.50+ */
+    }
+    nav a {
+        color:#ffffff;
+        text-decoration:none;
+        padding:4px 16px;
+        border-radius:16px;
+    }
+    nav a:hover {
+        background-color: #666666;
+        background-image: -webkit-gradient(linear, left top, left bottom, from(#666666), to(#444444)); /* Safari 4+, Chrome */
+        background-image: -webkit-linear-gradient(top, #666666, #444444); /* Chrome 10+, Safari 5.1+, iOS 5+ */
+        background-image:    -moz-linear-gradient(top, #666666, #444444); /* Firefox 3.6-15 */
+        background-image:      -o-linear-gradient(top, #666666, #444444); /* Opera 11.10-12.00 */
+        background-image:         linear-gradient(to bottom, #666666, #444444); /* Firefox 16+, IE10, Opera 12.50+ */
+    }
+    nav a.selected {
+        color:#000000;
+        background-color: #efefef;
+        background-image: -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#cfcfcf)); /* Safari 4+, Chrome */
+        background-image: -webkit-linear-gradient(top, #efefef, #cfcfcf); /* Chrome 10+, Safari 5.1+, iOS 5+ */
+        background-image:    -moz-linear-gradient(top, #efefef, #cfcfcf); /* Firefox 3.6-15 */
+        background-image:      -o-linear-gradient(top, #efefef, #cfcfcf); /* Opera 11.10-12.00 */
+        background-image:         linear-gradient(to bottom, #efefef, #cfcfcf); /* Firefox 16+, IE10, Opera 12.50+ */
+    }
     .frames {
         width:50%;
         float:left;
@@ -183,6 +217,10 @@
             <% end %>
         </table>
     </header>
+    <nav>
+        <a href="#" id="application_frames">Application Frames</a>
+        <a href="#" id="all_frames">All Frames</a>
+    </nav>
     <section class="backtrace">
         <ul class="frames">
             <% backtrace_frames.each_with_index do |frame, index| %>
@@ -205,15 +243,22 @@
                 <div class="location"><span class="filename"><%= frame.pretty_path %></span>, line <span class="line"><%= frame.line %></span></div>
                 <%== highlighted_code_block frame %>
                 
-                <div class="repl">
-                    <h3>REPL</h3>
-                    <div class="console">
-                        <pre></pre>
-                        <div class="prompt">&gt;&gt; <input/></div>
+                <% if BetterErrors.binding_of_caller_available? %>
+                    <div class="repl">
+                        <h3>REPL</h3>
+                        <div class="console">
+                            <pre></pre>
+                            <div class="prompt">&gt;&gt; <input/></div>
+                        </div>
                     </div>
-                </div>
-                
-                <div class="variable_info"></div>
+
+                    <div class="variable_info"></div>
+                <% else %>
+                    <h3>Advanced features unavailable</h3>
+                    <p class="error">
+                        You must add <code>gem "binding_of_caller"</code> to your Gemfile to enable the REPL and local/instance variable inspection.
+                    </p>
+                <% end %>
             </div>
         <% end %>
         <div style="clear:both"></div>
@@ -252,7 +297,7 @@
         var el = document.getElementById("frame_info_" + index);
         
         var varInfo = el.querySelector(".variable_info");
-        if(varInfo.innerHTML == "") {
+        if(varInfo && varInfo.innerHTML == "") {
             apiCall("variables", { "index": index }, function(response) {
                 if(response.error) {
                     varInfo.innerHTML = "<span class='error'>" + escapeHTML(response.error) + "</span>";
@@ -268,7 +313,10 @@
         previousFrameInfo = el;
         previousFrameInfo.style.display = "block";
         
-        el.querySelector(".repl input").focus();
+        var replInput = el.querySelector(".repl input");
+        if(replInput) {
+            replInput.focus();
+        }
     }
     
     for(var i = 0; i < frames.length; i++) {
@@ -284,25 +332,54 @@
             };
             var replPre = frameInfo.querySelector(".repl pre");
             var replInput = frameInfo.querySelector(".repl input");
-            replInput.onkeydown = function(ev) {
-                if(ev.keyCode == 13) {
-                    var text = replInput.value;
-                    replInput.value = "";
-                    apiCall("eval", { "index": index, source: text }, function(response) {
-                        replPre.innerHTML += ">> " + response.highlighted_input + "\n";
-                        if(response.error) {
-                            replPre.innerHTML += "!! " + escapeHTML(response.error) + "\n";
-                        } else {
-                            replPre.innerHTML += "=> " + escapeHTML(response.result) + "\n";
-                        }
-                        replPre.scrollTop = replPre.offsetHeight;
-                    });
-                }
-            };
+            if(replInput) {
+                replInput.onkeydown = function(ev) {
+                    if(ev.keyCode == 13) {
+                        var text = replInput.value;
+                        replInput.value = "";
+                        apiCall("eval", { "index": index, source: text }, function(response) {
+                            replPre.innerHTML += ">> " + response.highlighted_input + "\n";
+                            if(response.error) {
+                                replPre.innerHTML += "!! " + escapeHTML(response.error) + "\n";
+                            } else {
+                                replPre.innerHTML += "=> " + escapeHTML(response.result) + "\n";
+                            }
+                            replPre.scrollTop = replPre.offsetHeight;
+                        });
+                    }
+                };
+            }
         })(i, frames[i], frameInfos[i]);
     }
     
     document.querySelector(".frames li:first-child").click();
+    
+    var applicationFrames = document.getElementById("application_frames");
+    var allFrames = document.getElementById("all_frames");
+    
+    applicationFrames.onclick = function() {
+        allFrames.className = "";
+        applicationFrames.className = "selected";
+        for(var i = 0; i < frames.length; i++) {
+            if(frames[i].attributes["data-context"].value == "application") {
+                frames[i].style.display = "block";
+            } else {
+                frames[i].style.display = "none";
+            }
+        }
+        return false;
+    };
+    
+    allFrames.onclick = function() {
+        applicationFrames.className = "";
+        allFrames.className = "selected";
+        for(var i = 0; i < frames.length; i++) {
+            frames[i].style.display = "block";
+        }
+        return false;
+    };
+    
+    applicationFrames.click();
 })();
 </script>
 </html>

data/lib/better_errors/version.rb

@@ -1,3 +1,3 @@
 module BetterErrors
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_errors
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: