better_errors 0.2.0 → 0.3.0

data/.gitignore

@@ -1,3 +1,6 @@
 *.gem
 tmp
 Gemfile.lock
+coverage
+.yardoc
+doc

data/.yardopts

@@ -0,0 +1 @@
+--markup markdown --no-private

data/CONTRIBUTING.md

@@ -0,0 +1,9 @@
+# Contributing to Better Errors
+
+Please make sure to follow these guidelines when contributing code to Better Errors. They will improve the chances of your pull request being merged and they will make my life easier.
+
+* If you are contributing a large-ish change, please split your changes up into small, logical commits. This is so I have the option of merging in some but not all of your commits. If you just give me one huge commit and there are things that I don't want to merge in, I won't.
+
+* Whitespace at the end of lines of code is not OK, but empty lines with indentation is fine. Please do not remove these when sending in changes.
+
+* Don't change things that are unrelated to your main changes unnecessarily. Send another pull request for these changes - don't try to sneak them in.

data/README.md

@@ -13,7 +13,7 @@ Better Errors replaces the standard Rails error page with a much better and more
 
 ## Installation
 
-Add this line to your application's Gemfile (under the **development** group):
+Add this to your Gemfile:
 
 ```ruby
 group :development do
@@ -21,7 +21,9 @@ group :development do
 end
 ```
 
-If you would like to use Better Errors' **advanced features** (REPL, local/instance variable inspection, pretty stack frame names), you need to add the [`binding_of_caller`](https://github.com/banister/binding_of_caller) gem to your Gemfile:
+**NOTE:** It is *critical* you put better\_errors in the **development** section. **Do NOT run better_errors in production, or on Internet facing hosts.**
+
+If you would like to use Better Errors' **advanced features** (REPL, local/instance variable inspection, pretty stack frame names), you need to add the [`binding_of_caller`](https://github.com/banister/binding_of_caller) gem by [@banisterfiend](http://twitter.com/banisterfiend) to your Gemfile:
 
 ```ruby
 gem "binding_of_caller"
@@ -62,6 +64,10 @@ end
 
 * Calling `yield` from the REPL segfaults MRI 1.9.x.
 
+## Get in touch!
+
+If you're using better_errors, I'd love to hear from you. Drop me a line and tell me what you think!
+
 ## Contributing
 
 1. Fork it

data/better_errors.gemspec

@@ -18,6 +18,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rake"
+  s.add_development_dependency "rspec", "~> 2.12.0"
+  s.add_development_dependency "binding_of_caller"
+  s.add_development_dependency "simplecov"
+  s.add_development_dependency "yard"
   
   s.add_dependency "erubis", ">= 2.7.0"
   s.add_dependency "coderay", ">= 1.0.0"

data/lib/better_errors.rb

@@ -1,33 +1,119 @@
 require "pp"
 require "erubis"
 require "coderay"
+require "uri"
 
 require "better_errors/version"
 require "better_errors/error_page"
 require "better_errors/stack_frame"
 require "better_errors/middleware"
+require "better_errors/disable_logging_middleware"
 require "better_errors/code_formatter"
 require "better_errors/repl"
 
-class << BetterErrors
-  attr_accessor :application_root, :binding_of_caller_available, :logger
+module BetterErrors
+  class << self
+    # The path to the root of the application. Better Errors uses this property
+    # to determine if a file in a backtrace should be considered an application
+    # frame. If you are using Better Errors with Rails, you do not need to set
+    # this attribute manually.
+    # 
+    # @return [String]
+    attr_accessor :application_root
+    
+    # The logger to use when logging exception details and backtraces. If you
+    # are using Better Errors with Rails, you do not need to set this attribute
+    # manually. If this attribute is `nil`, nothing will be logged.
+    # 
+    # @return [Logger, nil]
+    attr_accessor :logger
+
+    # @private
+    attr_accessor :binding_of_caller_available
+    
+    # @private
+    alias_method :binding_of_caller_available?, :binding_of_caller_available
+  end
+  
+  # Returns a proc, which when called with a filename and line number argument,
+  # returns a URL to open the filename and line in the selected editor.
+  # 
+  # Generates TextMate URLs by default.
+  # 
+  #   BetterErrors.editor["/some/file", 123]
+  #     # => txmt://open?url=file:///some/file&line=123
+  # 
+  # @return [Proc]
+  def self.editor
+    @editor
+  end
+  
+  # Configures how Better Errors generates open-in-editor URLs.
+  # 
+  # @overload BetterErrors.editor=(sym)
+  #   Uses one of the preset editor configurations. Valid symbols are:
+  #
+  #   * `:textmate`, `:txmt`, `:tm`
+  #   * `:sublime`, `:subl`, `:st`
+  #   * `:macvim`
+  # 
+  #   @param [Symbol] sym
+  # 
+  # @overload BetterErrors.editor=(str)
+  #   Uses `str` as the format string for generating open-in-editor URLs.
+  # 
+  #   Use `%{file}` and `%{line}` as placeholders for the actual values.
+  # 
+  #   @example
+  #     BetterErrors.editor = "my-editor://open?url=%{file}&line=%{line}"
+  # 
+  #   @param [String] str
+  # 
+  # @overload BetterErrors.editor=(proc)
+  #   Uses `proc` to generate open-in-editor URLs. The proc will be called
+  #   with `file` and `line` parameters when a URL needs to be generated.
+  # 
+  #   Your proc should take care to escape `file` appropriately with
+  #   `URI.encode_www_form_component` (please note that `URI.escape` is **not**
+  #   a suitable substitute.)
+  # 
+  #   @example
+  #     BetterErrors.editor = proc { |file, line|
+  #       "my-editor://open?url=#{URI.encode_www_form_component file}&line=#{line}"
+  #     }
+  #   
+  #   @param [Proc] proc
+  # 
+  def self.editor=(editor)
+    case editor
+    when :textmate, :txmt, :tm
+      self.editor = "txmt://open?url=file://%{file}&line=%{line}"
+    when :sublime, :subl, :st
+      self.editor = "subl://open?url=file://%{file}&line=%{line}"
+    when :macvim, :mvim
+      self.editor = "mvim://open?url=file://%{file}&line=%{line}"
+    when String
+      self.editor = proc { |file, line| editor % { file: URI.encode_www_form_component(file), line: line } }
+    else
+      if editor.respond_to? :call
+        @editor = editor
+      else
+        raise TypeError, "Expected editor to be a valid editor key, a format string or a callable."
+      end
+    end
+  end
   
-  alias_method :binding_of_caller_available?, :binding_of_caller_available
+  BetterErrors.editor = :textmate
 end
 
 begin
+  $:.unshift "/Users/charlie/code/binding_of_caller/lib"
   require "binding_of_caller"
   BetterErrors.binding_of_caller_available = true
 rescue LoadError => e
   BetterErrors.binding_of_caller_available = false
 end
 
-unless BetterErrors.binding_of_caller_available?
-  warn "BetterErrors: binding_of_caller gem unavailable, cannot display local variables on error pages."
-  warn "Add 'binding_of_caller' to your Gemfile to make this warning go away."
-  warn ""
-end
-
 require "better_errors/core_ext/exception"
 
 require "better_errors/rails" if defined? Rails::Railtie

data/lib/better_errors/code_formatter.rb

@@ -1,4 +1,5 @@
 module BetterErrors
+  # @private
   class CodeFormatter
     FILE_TYPES = {
       ".rb"   => :ruby,

data/lib/better_errors/disable_logging_middleware.rb

@@ -0,0 +1,16 @@
+module BetterErrors
+  # @private
+  class DisableLoggingMiddleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      original_level = BetterErrors.logger.level
+      BetterErrors.logger.level = Logger::ERROR if env['PATH_INFO'].index("/__better_errors") == 0
+      @app.call(env)
+    ensure
+      BetterErrors.logger.level = original_level
+    end
+  end
+end

data/lib/better_errors/error_page.rb

@@ -1,6 +1,8 @@
+require "cgi"
 require "json"
 
 module BetterErrors
+  # @private
   class ErrorPage
     def self.template_path(template_name)
       File.expand_path("../templates/#{template_name}.erb", __FILE__)
@@ -26,6 +28,7 @@ module BetterErrors
     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
     
@@ -50,6 +53,22 @@ module BetterErrors
     end
     
   private
+    def editor_url(frame)
+      BetterErrors.editor[frame.filename, frame.line]
+    end
+    
+    def rack_session
+      env['rack.session']
+    end
+
+    def rails_params
+      env['action_dispatch.request.parameters']
+    end
+
+    def uri_prefix
+      env["SCRIPT_NAME"] || ""
+    end
+  
     def exception_message
       if exception.is_a?(SyntaxError) && exception.message =~ /\A.*:\d*: (.*)$/
         $1
@@ -67,11 +86,19 @@ module BetterErrors
     end
   
     def request_path
-      env["REQUEST_PATH"]
+      env["PATH_INFO"]
     end
     
     def highlighted_code_block(frame)
       CodeFormatter.new(frame.filename, frame.line).html
     end
+
+    def inspect_value(obj)
+      CGI.escapeHTML(obj.inspect)
+    rescue NoMethodError
+      "<span class='unsupported'>(object doesn't support inspect)</span>"
+    rescue Exception => e
+      "<span class='unsupported'>(exception was raised in inspect)</span>"
+    end
   end
 end

data/lib/better_errors/middleware.rb

@@ -1,15 +1,43 @@
 require "json"
 
 module BetterErrors
+  # Better Errors' error handling middleware. Including this in your middleware
+  # stack will show a Better Errors error page for exceptions raised below this
+  # middleware.
+  # 
+  # If you are using Ruby on Rails, you do not need to manually insert this 
+  # middleware into your middleware stack.
+  # 
+  # @example Sinatra
+  #   require "better_errors"
+  # 
+  #   if development?
+  #     use BetterErrors::Middleware
+  #   end
+  #
+  # @example Rack
+  #   require "better_errors"
+  #   if ENV["RACK_ENV"] == "development"
+  #     use BetterErrors::Middleware
+  #   end
+  # 
   class Middleware
+    # A new instance of BetterErrors::Middleware
+    # 
+    # @param app      The Rack app/middleware to wrap with Better Errors
+    # @param handler  The error handler to use.
     def initialize(app, handler = ErrorPage)
       @app      = app
       @handler  = handler
     end
     
+    # Calls the Better Errors middleware
+    # 
+    # @param [Hash] env
+    # @return [Array]
     def call(env)
       case env["PATH_INFO"]
-      when %r{\A/__better_errors/(?<oid>\d+)/(?<method>\w+)\z}
+      when %r{\A/__better_errors/(?<oid>-?\d+)/(?<method>\w+)\z}
         internal_call env, $~
       when %r{\A/__better_errors/?\z}
         show_error_page env
@@ -28,8 +56,16 @@ module BetterErrors
     end
     
     def show_error_page(env)
-      [500, { "Content-Type" => "text/html; charset=utf-8" }, [@error_page.render]]
+      content = if @error_page
+        @error_page.render
+      else
+        "<h1>No errors</h1><p>No errors have been recorded yet.</p><hr>" +
+        "<code>Better Errors v#{BetterErrors::VERSION}</code>"
+      end
+
+      [500, { "Content-Type" => "text/html; charset=utf-8" }, [content]]
     end
+
     
     def log_exception
       return unless BetterErrors.logger

data/lib/better_errors/rails.rb

@@ -1,8 +1,10 @@
 module BetterErrors
+  # @private
   class Railtie < Rails::Railtie
     initializer "better_errors.configure_rails_initialization" do
       unless Rails.env.production?
         Rails.application.middleware.use BetterErrors::Middleware
+        Rails.application.middleware.insert_before Rails::Rack::Logger, BetterErrors::DisableLoggingMiddleware
         BetterErrors.logger = Rails.logger
         BetterErrors.application_root = Rails.root.to_s
       end

data/lib/better_errors/repl.rb

@@ -1,4 +1,5 @@
 module BetterErrors
+  # @private
   module REPL
     PROVIDERS = [
         { impl:   "better_errors/repl/basic",

data/lib/better_errors/repl/pry.rb

@@ -52,15 +52,25 @@ module BetterErrors
       end
     
       def send_input(str)
-        old_pry_config_color = ::Pry.config.color
-        ::Pry.config.color = false
-        @continued_expression = true
-        @fiber.resume "#{str}\n"
-        # TODO - indent with `pry_indent.current_prefix`
-        # TODO - use proper pry prompt
-        [@output.read_buffer, @continued_expression ? ".." : ">>"]
+        local ::Pry.config, color: false, pager: false do
+          @continued_expression = true
+          @fiber.resume "#{str}\n"
+          [@output.read_buffer, @continued_expression ? ".." : ">>"]
+        end
+      end
+      
+    private
+      def local(obj, attrs)
+        old_attrs = {}
+        attrs.each do |k, v|
+          old_attrs[k] = obj.send k
+          obj.send "#{k}=", v
+        end
+        yield
       ensure
-        ::Pry.config.color = old_pry_config_color
+        old_attrs.each do |k, v|
+          obj.send "#{k}=", v
+        end
       end
     end
   end

data/lib/better_errors/stack_frame.rb

@@ -1,10 +1,11 @@
 module BetterErrors
+  # @private
   class StackFrame
     def self.from_exception(exception)
       idx_offset = 0
       list = exception.backtrace.each_with_index.map do |frame, idx|
         frame_binding = exception.__better_errors_bindings_stack[idx - idx_offset]
-        md = /\A(?<file>.*):(?<line>\d*)(:in `(?<name>.*)')?\z/.match(frame)
+        next unless md = /\A(?<file>.*?):(?<line>\d+)(:in `(?<name>.*)')?/.match(frame)
 
         # prevent mismatching frames in the backtrace with the binding stack
         if frame_binding and frame_binding.eval("__FILE__") != md[:file]
@@ -13,7 +14,7 @@ module BetterErrors
         end
 
         StackFrame.new(md[:file], md[:line].to_i, md[:name], frame_binding)
-      end
+      end.compact
 
       if exception.is_a?(SyntaxError) && exception.to_s =~ /\A(.*):(\d*):/
         list.unshift StackFrame.new($1, $2.to_i, "")
@@ -35,7 +36,7 @@ module BetterErrors
     
     def application?
       root = BetterErrors.application_root
-      starts_with? filename, root if root
+      filename.index(root) == 0 if root
     end
     
     def application_path
@@ -43,12 +44,12 @@ module BetterErrors
     end
 
     def gem?
-      Gem.path.any? { |path| starts_with? filename, path }
+      Gem.path.any? { |path| filename.index(path) == 0 }
     end
     
     def gem_path
       Gem.path.each do |path|
-        if starts_with? filename, path
+        if filename.index(path) == 0
           return filename.gsub("#{path}/gems/", "(gem) ")
         end
       end
@@ -63,10 +64,10 @@ module BetterErrors
     end
     
     def context
-      if application?
-        :application
-      elsif gem?
+      if gem?
         :gem
+      elsif application?
+        :application
       else
         :dunno
       end
@@ -116,9 +117,5 @@ module BetterErrors
         @method_name = "##{method_name}"
       end
     end
-  
-    def starts_with?(haystack, needle)
-      haystack[0, needle.length] == needle
-    end
   end
 end

data/lib/better_errors/templates/main.erb

@@ -422,6 +422,16 @@
         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;
+    }
 
     .trace_info .title .name {
         float: right;
@@ -493,7 +503,7 @@
 
     .console pre {
         padding: 10px 10px 0 10px;
-        max-height: 200px;
+        max-height: 400px;
         overflow-x: none;
         overflow-y: auto;
         margin-bottom: -3px;
@@ -594,6 +604,8 @@
         font-weight: bold;
         font-size: 0.8em;
         padding-right: 20px;
+
+        word-wrap: break-word;
     }
 
     .sub table td pre {
@@ -608,6 +620,12 @@
         white-space: normal;
     }
 
+    /* "(object doesn't support inspect)" */
+    .sub .unsupported {
+      font-family: sans-serif;
+      color: #777;
+    }
+
     /* ---------------------------------------------------------------------
      * Scrollbar
      * --------------------------------------------------------------------- */
@@ -662,16 +680,7 @@
             </nav>
             <ul class="frames">
                 <% backtrace_frames.each_with_index do |frame, index| %>
-                    <li
-                        class="<%= frame.context %>"
-                        style="display: none"
-                        data-context="<%= frame.context %>"
-                        data-full-filename="<%= frame.filename %>"
-                        data-filename="<%= frame.pretty_path %>"
-                        data-line="<%= frame.line %>"
-                        data-name="<%= frame.name %>"
-                        data-index="<%= index %>"
-                    >
+                    <li class="<%= frame.context %>" style="display: none" data-context="<%= frame.context %>" data-index="<%= index %>">
                         <span class='stroke'></span>
                         <i class="icon <%= frame.context %>"></i>
                         <div class="info">
@@ -688,41 +697,8 @@
         </nav>
 
         <% backtrace_frames.each_with_index do |frame, index| %>
-            <div class="frame_info" id="frame_info_<%= index %>" style="display:none;">
-                <header class="trace_info">
-                    <div class="title">
-                        <h2 class="name"><%= frame.name %></h2>
-                        <div class="location"><span class="filename"><%= frame.pretty_path %></span></div>
-                    </div>
-                    
-                    <%== highlighted_code_block frame %>
-                
-                    <% if BetterErrors.binding_of_caller_available? && frame.frame_binding %>
-                        <div class="repl">
-                            <div class="console">
-                                <pre></pre>
-                                <div class="prompt"><span>&gt;&gt;</span> <input/></div>
-                            </div>
-                        </div>
-                    <% end %>
-                </header>
-
-                <% if BetterErrors.binding_of_caller_available? && frame.frame_binding %>
-                    <div class="hint">
-                        This a live shell. Type in here.
-                    </div>
-
-                    <div class="variable_info"></div>
-                <% end %>
-                
-                <% unless BetterErrors.binding_of_caller_available? %>
-                    <div class="hint">
-                        <strong>Tip:</strong> add <code>gem "binding_of_caller"</code> to your Gemfile to enable the REPL and local/instance variable inspection.
-                    </div>
-                <% end %>
-            </div>
+            <div class="frame_info" id="frame_info_<%= index %>" style="display:none;"></div>
         <% end %>
-        <div style="clear:both"></div>
     </section>
 </body>
 <script>
@@ -736,7 +712,7 @@
 
     function apiCall(method, opts, cb) {
         var req = new XMLHttpRequest();
-        req.open("POST", "/__better_errors/" + OID + "/" + method, true);
+        req.open("POST", <%== uri_prefix.gsub("<", "&lt;").inspect %> + "/__better_errors/" + OID + "/" + method, true);
         req.setRequestHeader("Content-Type", "application/json");
         req.send(JSON.stringify(opts));
         req.onreadystatechange = function() {
@@ -859,34 +835,41 @@
         }
     };
     
-    function populateVariableInfo(index) {
+    function switchTo(el) {
+        if(previousFrameInfo) previousFrameInfo.style.display = "none";
+        previousFrameInfo = el;
+
+        el.style.display = "block";
+
+        var replInput = el.querySelector('.console input');
+        if (replInput) replInput.focus();
+    }
+
+    function selectFrameInfo(index) {
         var el = allFrameInfos[index];
-        var varInfo = el.querySelector(".variable_info");
-        if(varInfo && varInfo.innerHTML == "") {
+        if(el) {
+            if (el.loaded) {
+                return switchTo(el);
+            }
+
             apiCall("variables", { "index": index }, function(response) {
+                el.loaded = true;
                 if(response.error) {
-                    varInfo.innerHTML = "<span class='error'>" + escapeHTML(response.error) + "</span>";
+                    el.innerHTML = "<span class='error'>" + escapeHTML(response.error) + "</span>";
                 } else {
-                    varInfo.innerHTML = response.html;
+                    el.innerHTML = response.html;
+
+                    var repl = el.querySelector(".repl .console");
+                    if(repl) {
+                        new REPL(index).install(repl);
+                    }
+
+                    switchTo(el);
                 }
             });
         }
     }
     
-    function selectFrameInfo(index) {
-        populateVariableInfo(index);
-        
-        if(previousFrameInfo) {
-            previousFrameInfo.style.display = "none";
-        }
-        previousFrameInfo = allFrameInfos[index];
-        previousFrameInfo.style.display = "block";
-        
-        if(REPL.all[index]) {
-            REPL.all[index].focus();
-        }
-    }
-    
     for(var i = 0; i < allFrames.length; i++) {
         (function(i, el) {
             var el = allFrames[i];
@@ -899,10 +882,6 @@
                 
                 selectFrameInfo(el.attributes["data-index"].value);
             };
-            var repl = allFrameInfos[i].querySelector(".repl .console");
-            if(repl) {
-                new REPL(i).install(repl);
-            }
         })(i);
     }
     
@@ -910,7 +889,7 @@
     (
       document.querySelector(".frames li.application") ||
       document.querySelector(".frames li")
-    ).click();
+    ).onclick();
     
     var applicationFramesButton = document.getElementById("application_frames");
     var allFramesButton = document.getElementById("all_frames");
@@ -937,7 +916,7 @@
         return false;
     };
     
-    applicationFramesButton.click();
+    applicationFramesButton.onclick();
 })();
 </script>
 </html>

data/lib/better_errors/templates/variable_info.erb

@@ -1,9 +1,55 @@
+<header class="trace_info">
+    <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>
+    
+    <%== highlighted_code_block @frame %>
+
+    <% if BetterErrors.binding_of_caller_available? && @frame.frame_binding %>
+        <div class="repl">
+            <div class="console">
+                <pre></pre>
+                <div class="prompt"><span>&gt;&gt;</span> <input/></div>
+            </div>
+        </div>
+    <% end %>
+</header>
+
+<% if BetterErrors.binding_of_caller_available? && @frame.frame_binding %>
+    <div class="hint">
+        This a live shell. Type in here.
+    </div>
+
+    <div class="variable_info"></div>
+<% end %>
+
+<% unless BetterErrors.binding_of_caller_available? %>
+    <div class="hint">
+        <strong>Tip:</strong> add <code>gem "binding_of_caller"</code> to your Gemfile to enable the REPL and local/instance variable inspection.
+    </div>
+<% end %>
+
+<div class="sub">
+    <h3>Request info</h3>
+    <div class='inset variables'>
+        <table class="var_table">
+            <% if rails_params %>
+                <tr><td class="name">Request parameters</td><td><pre><%== inspect_value rails_params %></pre></td></tr>
+            <% end %>
+            <% if rack_session %>
+                <tr><td class="name">Rack session</td><td><pre><%== inspect_value rack_session %></pre></td></tr>
+            <% end %>
+        </table>
+    </div>
+</div>
+
 <div class="sub">
     <h3>Local Variables</h3>
     <div class='inset variables'>
         <table class="var_table">
             <% @frame.local_variables.each do |name, value| %>
-                <tr><td class="name"><%= name %></td><td><pre><%= value.inspect %></pre></td></tr>
+                <tr><td class="name"><%= name %></td><td><pre><%== inspect_value value %></pre></td></tr>
             <% end %>
         </table>
     </div>
@@ -14,8 +60,10 @@
     <div class="inset variables">
         <table class="var_table">
             <% @frame.instance_variables.each do |name, value| %>
-                <tr><td class="name"><%= name %></td><td><pre><%= value.inspect %></pre></td></tr>
+                <tr><td class="name"><%= name %></td><td><pre><%== inspect_value value %></pre></td></tr>
             <% end %>
         </table>
     </div>
 </div>
+
+<!-- <%= Time.now.to_f - @var_start_time %> seconds -->

data/lib/better_errors/version.rb

@@ -1,3 +1,3 @@
 module BetterErrors
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/better_errors/error_page_spec.rb

@@ -2,9 +2,9 @@ require "spec_helper"
 
 module BetterErrors
   describe ErrorPage do
-    let(:exception) { raise ZeroDivisionError, "you divided by zero you silly goose!" rescue $! }
+    let!(:exception) { raise ZeroDivisionError, "you divided by zero you silly goose!" rescue $! }
   
-    let(:error_page) { ErrorPage.new exception, { "REQUEST_PATH" => "/some/path" } }
+    let(:error_page) { ErrorPage.new exception, { "PATH_INFO" => "/some/path" } }
     
     let(:response) { error_page.render }
     

data/spec/better_errors/middleware_spec.rb

@@ -2,10 +2,30 @@ require "spec_helper"
 
 module BetterErrors
   describe Middleware do
+    let(:app) { Middleware.new(->env { ":)" }) }
+
     it "should pass non-error responses through" do
-      app = Middleware.new(->env { ":)" })
       app.call({}).should == ":)"
     end
+
+    it "should call the internal methods" do
+      app.should_receive :internal_call
+      app.call("PATH_INFO" => "/__better_errors/1/preform_awesomness")
+    end
+
+    it "should show the error page" do
+      app.should_receive :show_error_page
+      app.call("PATH_INFO" => "/__better_errors/")
+    end
+
+    context "when requesting the /__better_errors manually" do
+      let(:app) { Middleware.new(->env { ":)" }) }
+      
+      it "should show 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
+    end
     
     context "when handling an error" do
       let(:app) { Middleware.new(->env { raise "oh no :(" }) }

data/spec/better_errors/stack_frame_spec.rb

@@ -56,6 +56,29 @@ module BetterErrors
         
         frame.gem_path.should == "(gem) 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"])
+        frame = StackFrame.new("/abc/xyz/vendor/gems/whatever-1.2.3/lib/whatever.rb", 123, "foo")
+        
+        frame.gem_path.should == "(gem) whatever-1.2.3/lib/whatever.rb"
+      end
+    end
+    
+    context "#pretty_path" do
+      it "should return #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"])
+        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
@@ -80,5 +103,19 @@ module BetterErrors
       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
+      error = StandardError.new
+      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
+      error = StandardError.new
+      error.stub!(:backtrace).and_return(["crap:filename.rb:123"])
+      frames = StackFrame.from_exception(error)
+      frames.first.filename.should == "crap:filename.rb"
+    end
   end
 end

data/spec/better_errors_spec.rb

@@ -0,0 +1,13 @@
+require "spec_helper"
+
+describe BetterErrors do
+  context ".editor" do
+    it "should default 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
+      subject.editor["&.rb", 0].should == "txmt://open?url=file://%26.rb&line=0"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require "simplecov"
+SimpleCov.start
+
 $: << File.expand_path("../../lib", __FILE__)
 require "better_errors"
 require "ostruct"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_errors
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -27,6 +27,70 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: binding_of_caller
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -69,6 +133,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .yardopts
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -77,6 +143,7 @@ files:
 - lib/better_errors.rb
 - lib/better_errors/code_formatter.rb
 - lib/better_errors/core_ext/exception.rb
+- lib/better_errors/disable_logging_middleware.rb
 - lib/better_errors/error_page.rb
 - lib/better_errors/middleware.rb
 - lib/better_errors/rails.rb
@@ -93,6 +160,7 @@ files:
 - spec/better_errors/repl/basic_spec.rb
 - spec/better_errors/stack_frame_spec.rb
 - spec/better_errors/support/my_source.rb
+- spec/better_errors_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/charliesome/better_errors
 licenses:
@@ -126,5 +194,6 @@ test_files:
 - spec/better_errors/repl/basic_spec.rb
 - spec/better_errors/stack_frame_spec.rb
 - spec/better_errors/support/my_source.rb
+- spec/better_errors_spec.rb
 - spec/spec_helper.rb
 has_rdoc: