better_errors 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 27b27931ec5b8e074bac10e095d6c842dbeab9fc
-  data.tar.gz: b7631911ff716069a371bf30b060241c08d4916d
+SHA256:
+  metadata.gz: 832f46e8977908b469e6b527edbaf770541b66dfafcc3f8c1b292c0c6c25838c
+  data.tar.gz: 4584adc6e2870f40a5bd3eb0d7f18b693380e6a1c04716217f00c9190766f3e7
 SHA512:
-  metadata.gz: cb6451b31dd661e6c966411814522e2c06bc9e19070468b91cdb2f3b46f0160e2ccdd8d38aac0c4ce1e5d83b894aa01478a8b6ddecbb2ff3123cc3b901f29aaf
-  data.tar.gz: ea83fb1c88433f2f3df9cd7794996896d05956893bde09772b9bc85d4c12e63640162d860660b7ede93c7fbe393ed89611e20c77a1d99e1bf18f41a5c6f00a9f
+  metadata.gz: 844ecf262fdeee48a8165e201a189fcd7812db7bf437bf8e5e11ba80f63edeaa841015fcbc21a11b291e9705c8751fa382eba94e86b90d350828c662fffdbf0b
+  data.tar.gz: 82ff2fbb24fcbd5dafefe1776125da521cf5813461bca58700060d9be41aa7c138fe95d98b3056289aab5976adc48b83b7dc204521500fc85fe6ee8eb141d09b

data/.travis.yml

@@ -1,6 +1,9 @@
 sudo: false
 language: ruby
 cache: bundler
+before_install:
+  - gem update --system
+  - gem update bundler
 notifications:
   webhooks:
     # With COVERALLS_PARALLEL, coverage information sent to coveralls will not be processed until
@@ -8,22 +11,24 @@ notifications:
     # https://coveralls.zendesk.com/hc/en-us/articles/203484329-Parallel-Build-Webhook
     - secure: "YnHYbTq51ySistjvOxsuNhyg4GLuUffEJstTYeGYXiBF7HG5h43IVYo8KNuLzwkgsOYBcNo+YMdQX7qCqJffSbhsr1FZRSzBmjFFxcyD4hu+ukM2theZ4mePVAZiePscYvQPRNY4hIb4d3egStJEytkalDhB3sOebF57tIaCssg="
 rvm:
-  - 2.0.0
-  - 2.1.10
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
   - ruby-head
 gemfile:
   - gemfiles/rails42.gemfile
   - gemfiles/rails50.gemfile
   - gemfiles/rails51.gemfile
+  - gemfiles/rails52.gemfile
   - gemfiles/rails42_haml.gemfile
   - gemfiles/rails50_haml.gemfile
   - gemfiles/rails51_haml.gemfile
+  - gemfiles/rails52_haml.gemfile
   - gemfiles/rails42_boc.gemfile
   - gemfiles/rails50_boc.gemfile
   - gemfiles/rails51_boc.gemfile
+  - gemfiles/rails52_boc.gemfile
   - gemfiles/rack.gemfile
   - gemfiles/rack_boc.gemfile
   - gemfiles/pry09.gemfile
@@ -36,33 +41,15 @@ matrix:
     - gemfile: gemfiles/pry010.gemfile
     - gemfile: gemfiles/pry011.gemfile
   exclude:
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails50.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails50_boc.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails50_haml.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails51.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails51_boc.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails51_haml.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails50.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails50_boc.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails50_haml.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails51.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails51_boc.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails51_haml.gemfile
-    - rvm: 2.4.1
+    - rvm: 2.4.4
       gemfile: gemfiles/rails42.gemfile
-    - rvm: 2.4.1
+    - rvm: 2.4.4
       gemfile: gemfiles/rails42_boc.gemfile
-    - rvm: 2.4.1
+    - rvm: 2.4.4
+      gemfile: gemfiles/rails42_haml.gemfile
+    - rvm: 2.5.1
+      gemfile: gemfiles/rails42.gemfile
+    - rvm: 2.5.1
+      gemfile: gemfiles/rails42_boc.gemfile
+    - rvm: 2.5.1
       gemfile: gemfiles/rails42_haml.gemfile

data/CHANGELOG.md

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

data/README.md

@@ -1,17 +1,17 @@
-[![Build Status](https://travis-ci.org/charliesome/better_errors.svg)](https://travis-ci.org/charliesome/better_errors)
-[![Code Climate](https://img.shields.io/codeclimate/github/charliesome/better_errors.svg)](https://codeclimate.com/github/charliesome/better_errors)
-[![Coverage](https://coveralls.io/repos/github/charliesome/better_errors/badge.svg?branch=master)](https://coveralls.io/github/charliesome/better_errors?branch=master)
+[![Build Status](https://travis-ci.org/BetterErrors/better_errors.svg)](https://travis-ci.org/BetterErrors/better_errors)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/6bc3e7d6118d47e6959b16690b815909)](https://www.codacy.com/app/BetterErrors/better_errors?utm_source=github.com&utm_medium=referral&utm_content=BetterErrors/better_errors&utm_campaign=Badge_Grade)
+[![Coverage](https://coveralls.io/repos/github/BetterErrors/better_errors/badge.svg?branch=master)](https://coveralls.io/github/BetterErrors/better_errors?branch=master)
 [![Gem Version](https://img.shields.io/gem/v/better_errors.svg)](https://rubygems.org/gems/better_errors)
 
 # 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.
 
-![image](https://i.imgur.com/6zBGAAb.png)
+![screenshot of Better Errors in action](https://i.imgur.com/6zBGAAb.png)
 
 ## Features
 
-For screenshots of these features, [see the wiki](https://github.com/charliesome/better_errors/wiki).
+For screenshots of these features, [see the wiki](https://github.com/BetterErrors/better_errors/wiki).
 
 * Full stack trace
 * Source code inspection for all stack frames (with highlighting)
@@ -43,7 +43,7 @@ _Note: If you discover that Better Errors isn't working - particularly after upg
 You will notice that the only machine that gets the Better Errors page is localhost, which means you get the default error page if you are developing on a remote host (or a virtually remote host, such as a Vagrant box).
 Obviously, the REPL is not something you want to expose to the public, and there may be sensitive information available in the backtrace.
 
-For more information on how to configure access, see [the wiki](https://github.com/charliesome/better_errors/wiki/Allowing-access-to-the-console).
+For more information on how to configure access, see [the wiki](https://github.com/BetterErrors/better_errors/wiki/Allowing-access-to-the-console).
 
 ## Usage
 
@@ -53,7 +53,7 @@ If you're using Rails, there's nothing else you need to do.
 
 If you're not using Rails, you need to insert `BetterErrors::Middleware` into your middleware stack, and optionally set `BetterErrors.application_root` if you'd like Better Errors to abbreviate filenames within your application.
 
-For instructions for your specific middleware, [see the wiki](https://github.com/charliesome/better_errors/wiki/Non-Rails-frameworks).
+For instructions for your specific middleware, [see the wiki](https://github.com/BetterErrors/better_errors/wiki/Non-Rails-frameworks).
 
 ### Plain text requests
 
@@ -78,7 +78,7 @@ to troubleshoot an issue in development.
 
 Better Errors includes a link to your editor for the file and line of code that is being shown.
 By default, it uses your environment to determine which editor should be opened.
-See [the wiki for instructions on configuring the editor](https://github.com/charliesome/better_errors/wiki/Link-to-your-editor).
+See [the wiki for instructions on configuring the editor](https://github.com/BetterErrors/better_errors/wiki/Link-to-your-editor).
 
 
 ## Set maximum variable size for inspector.

data/better_errors.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email         = ["charlie@charliesomerville.com"]
   s.description   = %q{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.}
   s.summary       = %q{Better error page for Rails and other Rack apps}
-  s.homepage      = "https://github.com/charliesome/better_errors"
+  s.homepage      = "https://github.com/BetterErrors/better_errors"
   s.license       = "MIT"
 
   s.files         = `git ls-files -z`.split("\x0").reject do |f|

data/gemfiles/rails52.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+
+gem 'coveralls', require: false
+
+gemspec path: "../"

data/gemfiles/rails52_boc.gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+gem "binding_of_caller"
+
+gem 'coveralls', require: false
+
+gemspec path: "../"

data/gemfiles/rails52_haml.gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+gem "haml"
+
+gem 'coveralls', require: false
+
+gemspec path: "../"

data/lib/better_errors.rb

@@ -4,6 +4,7 @@ require "coderay"
 require "uri"
 
 require "better_errors/code_formatter"
+require "better_errors/inspectable_value"
 require "better_errors/error_page"
 require "better_errors/middleware"
 require "better_errors/raised_exception"
@@ -19,6 +20,8 @@ module BetterErrors
     { symbols: [:textmate, :txmt, :tm], sniff: /mate/i,  url: "txmt://open?url=file://%{file}&line=%{line}" },
     { symbols: [:idea], sniff: /idea/i, url: "idea://open?file=%{file}&line=%{line}" },
     { symbols: [:rubymine], sniff: /mine/i, url: "x-mine://open?file=%{file}&line=%{line}" },
+    { symbols: [:vscode, :code], sniff: /code/i, url: "vscode://file/%{file}:%{line}" },
+    { symbols: [:atom], sniff: /atom/i,  url: "atom://core/open/file?filename=%{file}&line=%{line}" },
   ]
 
   class << self
@@ -76,6 +79,7 @@ module BetterErrors
   #   * `:textmate`, `:txmt`, `:tm`
   #   * `:sublime`, `:subl`, `:st`
   #   * `:macvim`
+  #   * `:atom`
   #
   #   @param [Symbol] sym
   #
@@ -125,7 +129,7 @@ module BetterErrors
   # Enables experimental Pry support in the inline REPL
   #
   # If you encounter problems while using Pry, *please* file a bug report at
-  # https://github.com/charliesome/better_errors/issues
+  # https://github.com/BetterErrors/better_errors/issues
   def self.use_pry!
     REPL::PROVIDERS.unshift const: :Pry, impl: "better_errors/repl/pry"
   end

data/lib/better_errors/error_page.rb

@@ -70,7 +70,8 @@ module BetterErrors
       application_frames.first || backtrace_frames.first
     end
 
-  private
+    private
+
     def editor_url(frame)
       BetterErrors.editor[frame.filename, frame.line]
     end
@@ -104,30 +105,15 @@ module BetterErrors
     end
 
     def inspect_value(obj)
-      inspect_raw_value(obj)
-    rescue NoMethodError
-      "<span class='unsupported'>(object doesn't support inspect)</span>"
+      InspectableValue.new(obj).to_html
+    rescue BetterErrors::ValueLargerThanConfiguredMaximum
+      "<span class='unsupported'>(object too large. "\
+        "Modify #{CGI.escapeHTML(obj.class.name)}#inspect "\
+        "or adjust BetterErrors.maximum_variable_inspect_size)</span>"
     rescue Exception => e
       "<span class='unsupported'>(exception #{CGI.escapeHTML(e.class.to_s)} was raised in inspect)</span>"
     end
 
-    def inspect_raw_value(obj)
-      value = CGI.escapeHTML(obj.inspect)
-
-      if value_small_enough_to_inspect?(value)
-        value
-      else
-        "<span class='unsupported'>(object too large. "\
-          "Modify #{CGI.escapeHTML(obj.class.to_s)}#inspect "\
-          "or increase BetterErrors.maximum_variable_inspect_size)</span>"
-      end
-    end
-
-    def value_small_enough_to_inspect?(value)
-      return true if BetterErrors.maximum_variable_inspect_size.nil?
-      value.length <= BetterErrors.maximum_variable_inspect_size
-    end
-
     def eval_and_respond(index, code)
       result, prompt, prefilled_input = @repls[index].send_input(code)
 

data/lib/better_errors/inspectable_value.rb

@@ -0,0 +1,45 @@
+require "cgi"
+require "objspace" rescue nil
+
+module BetterErrors
+  class ValueLargerThanConfiguredMaximum < StandardError; end
+
+  class InspectableValue
+    def initialize(value)
+      @original_value = value
+    end
+
+    def to_html
+      raise ValueLargerThanConfiguredMaximum unless value_small_enough_to_inspect?
+      value_as_html
+    end
+
+    private
+
+    attr_reader :original_value
+
+    def value_as_html
+      @value_as_html ||= CGI.escapeHTML(value)
+    end
+
+    def value
+      @value ||= begin
+        if original_value.respond_to? :inspect
+          original_value.inspect
+        else
+          original_value
+        end
+      end
+    end
+
+    def value_small_enough_to_inspect?
+      return true if BetterErrors.maximum_variable_inspect_size.nil?
+
+      if defined?(ObjectSpace) && defined?(ObjectSpace.memsize_of) && ObjectSpace.memsize_of(value)
+        ObjectSpace.memsize_of(value) <= BetterErrors.maximum_variable_inspect_size
+      else
+        value_as_html.length <= BetterErrors.maximum_variable_inspect_size
+      end
+    end
+  end
+end

data/lib/better_errors/stack_frame.rb

@@ -76,14 +76,16 @@ module BetterErrors
         # considered a bug in Ruby itself, but we need to work around it.
         next if name == :"\#$!"
 
-        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
+        hash[name] = local_variable(name)
       end
     end
 
+    def local_variable(name)
+      get_local_variable(name) || eval_local_variable(name)
+    rescue NameError => ex
+      "#{ex.class}: #{ex.message}"
+    end
+
     def instance_variables
       return {} unless frame_binding
       Hash[visible_instance_variables.map { |x|
@@ -114,5 +116,15 @@ module BetterErrors
         @method_name = "##{method_name}"
       end
     end
+
+    def get_local_variable(name)
+      if defined?(frame_binding.local_variable_get)
+        frame_binding.local_variable_get(name)
+      end
+    end
+
+    def eval_local_variable(name)
+      frame_binding.eval(name.to_s)
+    end
   end
 end

data/lib/better_errors/templates/main.erb

@@ -721,12 +721,22 @@
               if(document.styleSheets[i].href)
                   document.styleSheets[i].disabled = true;
           }
-          document.addEventListener("page:restore", function restoreCSS(e) {
-              for(var i=0; i < document.styleSheets.length; i++) {
-                  document.styleSheets[i].disabled = false;
-              }
-              document.removeEventListener("page:restore", restoreCSS, false);
-          });
+          if (window.Turbolinks.controller) {
+              // Turbolinks > 5 (see https://github.com/turbolinks/turbolinks/issues/6)
+              document.addEventListener("turbolinks:load", function restoreCSS(e) {
+                  for(var i=0; i < document.styleSheets.length; i++) {
+                      document.styleSheets[i].disabled = false;
+                  }
+                  document.removeEventListener("turbolinks:load", restoreCSS, false);
+              });
+          } else {
+              document.addEventListener("page:restore", function restoreCSS(e) {
+                  for(var i=0; i < document.styleSheets.length; i++) {
+                      document.styleSheets[i].disabled = false;
+                  }
+                  document.removeEventListener("page:restore", restoreCSS, false);
+              });
+          }
       }
     </script>
 
@@ -943,7 +953,7 @@
                     if(response.explanation) {
                       el.innerHTML += "<p class='explanation'>" + escapeHTML(response.explanation) + "</p>";
                     }
-                    el.innerHTML += "<p><a target='_new' href='https://github.com/charliesome/better_errors'>More about Better Errors</a></p>";
+                    el.innerHTML += "<p><a target='_new' href='https://github.com/BetterErrors/better_errors'>More about Better Errors</a></p>";
                 } else {
                     el.innerHTML = response.html;
 

data/lib/better_errors/version.rb

@@ -1,3 +1,3 @@
 module BetterErrors
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_errors
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Charlie Somerville
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-13 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -154,12 +154,16 @@ files:
 - gemfiles/rails51.gemfile
 - gemfiles/rails51_boc.gemfile
 - gemfiles/rails51_haml.gemfile
+- gemfiles/rails52.gemfile
+- gemfiles/rails52_boc.gemfile
+- gemfiles/rails52_haml.gemfile
 - lib/better_errors.rb
 - lib/better_errors/code_formatter.rb
 - lib/better_errors/code_formatter/html.rb
 - lib/better_errors/code_formatter/text.rb
 - lib/better_errors/error_page.rb
 - lib/better_errors/exception_extension.rb
+- lib/better_errors/inspectable_value.rb
 - lib/better_errors/middleware.rb
 - lib/better_errors/rails.rb
 - lib/better_errors/raised_exception.rb
@@ -171,7 +175,7 @@ files:
 - lib/better_errors/templates/text.erb
 - lib/better_errors/templates/variable_info.erb
 - lib/better_errors/version.rb
-homepage: https://github.com/charliesome/better_errors
+homepage: https://github.com/BetterErrors/better_errors
 licenses:
 - MIT
 metadata: {}
@@ -191,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Better error page for Rails and other Rack apps