render_me_pretty 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fca5bd4ed5c7502ec8b72669e5fced039e90b8e4f1cdb6f47fdaab6f289e247
-  data.tar.gz: 26ecbd9090b108e5baf921cec068a06a2ac4057232d984792304e49d0d038304
+  metadata.gz: a5e982d58b2b59ca91a4713eeb1720ba73fcc0fe6c23ad0052ec54fa8c80adde
+  data.tar.gz: 2b791ee128231df293c58fa55c064d1cae60df140baf6460c38f68446325f04a
 SHA512:
-  metadata.gz: bb38911b2da29bc35e67d648d7de31b17b74cdfd0b7a3b97bfbb6419a641d884c77d063d84ba9f4abd195f2fc6ebf7915e598b3b9b2b6ff18297e2cd6a6f601b
-  data.tar.gz: 74a63b170fcab819827e3f808f0b14c25925b162c123b9b7f519c39b2b77e07a858fe38c351fa3e08cfbc4ce6a52c5c70dc3a687f069993bc6348e8179ca253c
+  metadata.gz: '085a42766665d911e15928aa5026d3bc95aa595030a92d20340222b0661750dd5b24ae95884310828b67952cd3b0b697c545d2ef470d5b6ee9a6d811621fb1ba'
+  data.tar.gz: '0943c0fb992da2d40e00b2d4242c70694bca5195672eea6e4164a19fd32cf505f6918cf9b7e84ed9e0b594c6a47defc8ce9b6e06753c767181ba7c6869b6267d'

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.5.0]
+- fix find_template_error_line
+- remove some of the filtering for backtrace lines
+
 ## [0.4.0]
 - fix erb and context definitions, fix bug with empty variables={}
 - improve original backtrace info, colorize exact line

data/lib/render_me_pretty/erb.rb

@@ -78,13 +78,23 @@ module RenderMePretty
 
     # handles Tilt error
     def handle_exception(e)
-      # first line of the baacktrace for Tilt has the line number
-      # spec/fixtures/invalid.erb:2:in `block in singleton class'
-      error_info = e.backtrace[0]
-      error_line_number = error_info.split(':')[1].to_i
+      error_line = find_template_error_line(e.backtrace)
+      error_line_number = error_line.split(':')[1].to_i
       pretty_error(e, error_line_number)
     end
 
+    # For Tilt, first line of the baacktrace that contains the path of the file
+    # we're rendeirng has the line number. Example:
+    #
+    #   spec/fixtures/invalid.erb:2:in `block in singleton class'
+    #   error_info = e.backtrace[0]
+    def find_template_error_line(lines)
+      lines.select do |line|
+        line.include?(@path)
+      end.first
+    end
+
+
     def pretty_error(e, line)
       pretty_path = @path.sub(/^\.\//, '')
       io = StringIO.new
@@ -134,20 +144,24 @@ module RenderMePretty
         lines = e.backtrace
       else
         lines = e.backtrace
+        # This filtering business makes is hiding useful info.
+        # Think it was needed for ERB but Tilt provides a better stack trace.
+        # Commenting out for now.
+
         # filter out internal lines
-        removal_index = lines.find_index { |l| l =~ %r[lib/render_me_pretty] }
-        lines = lines[removal_index..-1] # remove leading lines above the lib/
+        # removal_index = lines.find_index { |l| l =~ %r[lib/render_me_pretty] }
+        # lines = lines[removal_index..-1] # remove leading lines above the lib/
           # render_me_pretty lines by keeping lines past the removal index
-        lines.reject! { |l| l =~ %r[lib/render_me_pretty] } # now filter out
+        # lines.reject! { |l| l =~ %r[lib/render_me_pretty] } # now filter out
           # render_me_pretty lines
         lines = lines[0..7] # keep 8 lines
-        lines[0] = lines[0].colorize(:red)
       end
+      lines[0] = lines[0].colorize(:red)
 
       # header
-      lines.unshift "\nOriginal filtered backtrace#{full ? '' : ' (last 8 lines)'}:"
+      lines.unshift "\nOriginal backtrace#{full ? '' : ' (last 8 lines)'}:"
       # footer
-      lines << "\nRe-run with FULL_STACK_TRACE=1 to see all lines"
+      lines << "\nRe-run with FULL_BACKTRACE=1 to see all lines"
       lines.join("\n")
     end
   end

data/lib/render_me_pretty/version.rb

@@ -1,3 +1,3 @@
 module RenderMePretty
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: render_me_pretty
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport