render_me_pretty 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e4af73e4c239f8f3bff66c3818c43a4e741a09442148c2fa2c56e551f7ac3ed
-  data.tar.gz: 2699cbcd5a14731255b3d48f510ccba48bbca15bf1bbc82cf965a1ba29ec355e
+  metadata.gz: 8c5f4662509ff4efce8bde738342f9f97fc5fd8083cb9639006c515e6eb47bdd
+  data.tar.gz: 38b4fdad0e9b9b0c311c10f58e530bf5ef145582fa5982afc7e58f86ab196181
 SHA512:
-  metadata.gz: 0dde0c45916b0704ef3610b2d85ed19ec208c38e221b75d7039bcf90deac33e971d7cdb032d8348512de01d8ce6b473f63786898bf6c40dc961e4555823f24ea
-  data.tar.gz: 297eaf75a2780878ef937e88f264c48ce775c31478d3b185458110b88618fa52c21a2ffa50c95bf3ebbc85af626980e1f854ec5336760cb0d31f1519e7810f5a
+  metadata.gz: 0df66e4fd938fd5c8477bd24603f0566838897b798756eda7a4769388d0bc5104d6ed4347c2998b3d3b7918a8c3ef886d35d83e78e04bc78769a20afbd3bcee4
+  data.tar.gz: cac5e1a0a9026838e8ae6d5123f19d7c2388794319d56ebd180d222fc5028c6409a602d8e84ecfb8b77f88b50d2bca27161215bc285b1a02c65a4fbb8e869af2

data/.rspec

@@ -1 +1,3 @@
 --require spec_helper
+--format documentation
+--require spec_helper

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 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.8.0]
+- pull request #1 from tongueroo/layout-support
+
 ## [0.7.1]
 - trim - mode
 

data/README.md

@@ -1,5 +1,7 @@
 # Render Me Pretty
 
+[![CircleCI](https://circleci.com/gh/tongueroo/render_me_pretty.svg?style=svg)](https://circleci.com/gh/tongueroo/render_me_pretty)
+
 Let's say you have an error in your ERB template:
 
 ```

data/lib/render_me_pretty/erb.rb

@@ -51,6 +51,7 @@ module RenderMePretty
       @path = path
       @init_vars = variables
       @context = variables.delete(:context)
+      @layout_path = variables.delete(:layout)
     end
 
     # Usage:
@@ -72,9 +73,21 @@ module RenderMePretty
         context.instance_variable_set('@' + key.to_s, value)
       end
 
-      template = Tilt::ERBTemplate.new(@path, trim: '-')
+      if @layout_path
+        layout = Tilt::ERBTemplate.new(@layout_path, trim: '-')
+      else
+        # trim mode: https://searchcode.com/codesearch/view/77362792/
+        template = Tilt::ERBTemplate.new(@path, trim: '-')
+      end
+
       begin
-        template.render(context)
+        if @layout_path
+          layout.render(context) do
+            Tilt::ERBTemplate.new(@path, trim: '-').render(context)
+          end
+        else
+          template.render(context)
+        end
       rescue Exception => e
         if e.class == SystemExit # allow exit to happen normally
           raise
@@ -99,8 +112,8 @@ module RenderMePretty
       # puts e.backtrace
       # puts "*" * 30
       handler = e.is_a?(SyntaxError) ?
-                  SyntaxErrorHandler.new(@path, e) :
-                  MainErrorHandler.new(@path, e)
+                  SyntaxErrorHandler.new(e, @path, @layout_path) :
+                  MainErrorHandler.new(e, @path, @layout_path)
       io = handler.handle
       print_result(io)
     end

data/lib/render_me_pretty/erb/base_handler.rb

@@ -1,8 +1,9 @@
 class RenderMePretty::Erb
   class BaseHandler
-    def initialize(path, exception)
-      @path = path
+    def initialize(exception, path, layout_path=nil)
       @exception = exception
+      @path = path
+      @layout_path = layout_path
     end
 
     def handle
@@ -16,13 +17,13 @@ class RenderMePretty::Erb
       message = full_message ? ": #{@exception.message}" : ""
       io.puts "#{@exception.class}#{message}".colorize(:red)
 
-      pretty_path = @path.sub(/^\.\//, '')
+      pretty_path = template_path_with_error.sub(/^\.\//, '')
       io.puts "Error evaluating ERB template around line #{error_line_number.to_s.colorize(:red)} of: #{pretty_path}:"
 
       context = 5 # lines of context
       top, bottom = [error_line_number-context-1, 0].max, error_line_number+context-1
 
-      lines = IO.read(@path).split("\n")
+      lines = IO.read(template_path_with_error).split("\n")
       spacing = lines.size.to_s.size
       lines[top..bottom].each_with_index do |line_content, index|
         current_line_number = top+index+1
@@ -37,6 +38,10 @@ class RenderMePretty::Erb
       io
     end
 
+    def template_path_with_error
+      error_in_layout? ? @layout_path : @path
+    end
+
     # Method produces a filtered original stack trace that can be appended to
     # the pretty backtrace output.
     #

data/lib/render_me_pretty/erb/main_error_handler.rb

@@ -8,9 +8,15 @@ class RenderMePretty::Erb
     def find_line_number
       lines = @exception.backtrace
       error_line = lines.select do |line|
-        line.include?(@path)
+        line.include?(template_path_with_error)
       end.first
       error_line.split(':')[1].to_i
     end
+
+    def error_in_layout?
+      # The first line of the backtrace has the template path that errored
+      error_info = @exception.backtrace[0]
+      error_info.include?(@layout_path) if @layout_path
+    end
   end
 end

data/lib/render_me_pretty/erb/syntax_error_handler.rb

@@ -9,7 +9,7 @@ class RenderMePretty::Erb
     #
     # We will only find the first line number for the error.
     def find_line_number
-      pattern = Regexp.new("#{@path}:(\\\d+): syntax error")
+      pattern = Regexp.new("#{template_path_with_error}:(\\\d+): syntax error")
       lines = @exception.message.split("\n")
       found_line = lines.find do |line|
         line.match(pattern)
@@ -17,5 +17,14 @@ class RenderMePretty::Erb
       md = found_line.match(pattern)
       md[1].to_i # line_number
     end
+
+    def error_in_layout?
+      # first line has the error info
+      lines = @exception.message.split("\n")
+      error_info = lines.first
+      md = error_info.match(/(.*):(\d+): syntax error/)
+      file = md[1]
+      file == @layout_path
+    end
   end
 end

data/lib/render_me_pretty/version.rb

@@ -1,3 +1,3 @@
 module RenderMePretty
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

metadata

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