render_me_pretty 0.8.0 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c5f4662509ff4efce8bde738342f9f97fc5fd8083cb9639006c515e6eb47bdd
-  data.tar.gz: 38b4fdad0e9b9b0c311c10f58e530bf5ef145582fa5982afc7e58f86ab196181
+  metadata.gz: 568385d41ee6116a69769e93aef3da2540dd504313956a521938d5e8c85114dc
+  data.tar.gz: 6728276075074f49d08860f254d09a71e5a4adc24346c218cb5f9961a85c81da
 SHA512:
-  metadata.gz: 0df66e4fd938fd5c8477bd24603f0566838897b798756eda7a4769388d0bc5104d6ed4347c2998b3d3b7918a8c3ef886d35d83e78e04bc78769a20afbd3bcee4
-  data.tar.gz: cac5e1a0a9026838e8ae6d5123f19d7c2388794319d56ebd180d222fc5028c6409a602d8e84ecfb8b77f88b50d2bca27161215bc285b1a02c65a4fbb8e869af2
+  metadata.gz: 06c70b6311b152a7725c200da4760678c2ba5bc12a3dc4a127a3e91a32be762df5e9717678973c9aeddfe054afdec4345911400d2aa7b221302af6437c9e7ce7
+  data.tar.gz: 40c6951774cc3de8106a5e96a9a75823fb0d9aebcd990b1db32d156474d85a1fb844ed6fc1f8ce85f3385a1d4768a4d5642fcc3a11bb16abfa2cbf8433fc2b2d

data/.circleci/config.yml

@@ -0,0 +1,58 @@
+# Ruby CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: circleci/ruby:2.5.3
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      - run:
+          name: submodule sync
+          command: |
+            git submodule sync
+            git submodule update --init
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v2-dependencies-{{ checksum "Gemfile.lock" }}
+          # fallback to using the latest cache if no exact match is found
+          - v2-dependencies-
+
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v2-dependencies-{{ checksum "Gemfile.lock" }}
+
+      # run tests!
+      - run:
+          name: run tests
+          command: |
+            mkdir /tmp/test-results
+
+            cat >.rspec <<EOL
+            --format documentation
+            --require spec_helper
+            EOL
+
+            bundle exec rspec
+
+      # collect reports
+      - store_test_results:
+          path: /tmp/test-results
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: test-results

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/Gemfile.lock

data/CHANGELOG.md

@@ -3,6 +3,20 @@
 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.4] - 2021-12-28
+- fix activesupport require
+
+## [0.8.3]
+- add .circleci/config.yml
+- show full backtrace when error not found within users layout or project path
+
+## [0.8.2]
+- use rainbow gem for terminal color
+
+## [0.8.1]
+- tilt default_encoding utf-8
+- update readme with layout support
+
 ## [0.8.0]
 - pull request #1 from tongueroo/layout-support
 

data/README.md

@@ -2,6 +2,8 @@
 
 [![CircleCI](https://circleci.com/gh/tongueroo/render_me_pretty.svg?style=svg)](https://circleci.com/gh/tongueroo/render_me_pretty)
 
+[![BoltOps Badge](https://img.boltops.com/boltops/badges/boltops-badge.png)](https://www.boltops.com)
+
 Let's say you have an error in your ERB template:
 
 ```
@@ -47,6 +49,12 @@ There's also a convenience class method:
 RenderMePretty.result("/path/to/tempate.erb", a: 5)
 ```
 
+### Layout Support
+
+```ruby
+RenderMePretty.result("/path/to/tempate.erb", layout: "/path/to/layout.erb")
+```
+
 ### Custom Context
 
 ```ruby

data/lib/render_me_pretty/erb/base_handler.rb

@@ -15,10 +15,10 @@ class RenderMePretty::Erb
       io = StringIO.new
 
       message = full_message ? ": #{@exception.message}" : ""
-      io.puts "#{@exception.class}#{message}".colorize(:red)
+      io.puts "#{@exception.class}#{message}".color(:red)
 
       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}:"
+      io.puts "Error evaluating ERB template around line #{error_line_number.to_s.color(:red)} of: #{pretty_path}:"
 
       context = 5 # lines of context
       top, bottom = [error_line_number-context-1, 0].max, error_line_number+context-1
@@ -28,7 +28,7 @@ class RenderMePretty::Erb
       lines[top..bottom].each_with_index do |line_content, index|
         current_line_number = top+index+1
         if current_line_number == error_line_number
-          io.printf("%#{spacing}d %s\n".colorize(:red), current_line_number, line_content)
+          io.printf("%#{spacing}d %s\n".color(:red), current_line_number, line_content)
         else
           io.printf("%#{spacing}d %s\n", current_line_number, line_content)
         end
@@ -73,7 +73,7 @@ class RenderMePretty::Erb
           # render_me_pretty lines
         lines = lines[0..7] # keep 8 lines
       end
-      lines[0] = lines[0].colorize(:red)
+      lines[0] = lines[0].color(:red)
 
       # header
       lines.unshift "\nOriginal backtrace#{full ? '' : ' (last 8 lines)'}:"

data/lib/render_me_pretty/erb/main_error_handler.rb

@@ -10,7 +10,13 @@ class RenderMePretty::Erb
       error_line = lines.select do |line|
         line.include?(template_path_with_error)
       end.first
-      error_line.split(':')[1].to_i
+
+      if error_line.nil?
+        puts "WARN: Unable to find line number. Fallback and print out full backtrace."
+        puts @exception.backtrace
+      else
+        error_line.split(':')[1].to_i
+      end
     end
 
     def error_in_layout?

data/lib/render_me_pretty/erb.rb

@@ -73,17 +73,19 @@ module RenderMePretty
         context.instance_variable_set('@' + key.to_s, value)
       end
 
+      # https://github.com/gotar/dry-view/commit/39e3f96625bf90da2e51fb1fd437f18cedb9ae8c
+      tilt_options = {trim: '-', default_encoding: "utf-8"}
       if @layout_path
-        layout = Tilt::ERBTemplate.new(@layout_path, trim: '-')
+        layout = Tilt::ERBTemplate.new(@layout_path, tilt_options)
       else
         # trim mode: https://searchcode.com/codesearch/view/77362792/
-        template = Tilt::ERBTemplate.new(@path, trim: '-')
+        template = Tilt::ERBTemplate.new(@path, tilt_options)
       end
 
       begin
         if @layout_path
           layout.render(context) do
-            Tilt::ERBTemplate.new(@path, trim: '-').render(context)
+            Tilt::ERBTemplate.new(@path, tilt_options).render(context)
           end
         else
           template.render(context)
@@ -107,8 +109,8 @@ module RenderMePretty
     # Refer to specs and uncomment puts out to see the different types of errors.
     def handle_exception(e)
       # puts "*" * 30
-      # puts e.class.to_s.colorize(:cyan)
-      # puts e.message.colorize(:cyan)
+      # puts e.class.to_s.color(:cyan)
+      # puts e.message.color(:cyan)
       # puts e.backtrace
       # puts "*" * 30
       handler = e.is_a?(SyntaxError) ?
@@ -158,7 +160,7 @@ module RenderMePretty
           # render_me_pretty lines
         lines = lines[0..7] # keep 8 lines
       end
-      lines[0] = lines[0].colorize(:red)
+      lines[0] = lines[0].color(:red)
 
       # header
       lines.unshift "\nOriginal backtrace#{full ? '' : ' (last 8 lines)'}:"

data/lib/render_me_pretty/version.rb

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

data/lib/render_me_pretty.rb

@@ -1,6 +1,7 @@
 require "render_me_pretty/version"
+require "active_support"
 require "active_support/core_ext/string"
-require "colorize"
+require "rainbow/ext/string"
 
 module RenderMePretty
   autoload :Erb, 'render_me_pretty/erb'

data/render_me_pretty.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport"
-  spec.add_dependency "colorize"
+  spec.add_dependency "rainbow"
   spec.add_dependency "tilt"
 
   spec.add_development_dependency "bundler"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: render_me_pretty
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2021-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,11 +101,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console
@@ -136,8 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Render ERB template and provide more useful message pointing out the line

data/Gemfile.lock

@@ -1,52 +0,0 @@
-PATH
-  remote: .
-  specs:
-    render_me_pretty (0.6.0)
-      activesupport
-      colorize
-      tilt
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.1.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    colorize (0.8.1)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    rake (12.3.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    thread_safe (0.3.6)
-    tilt (2.0.8)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  rake
-  render_me_pretty!
-  rspec
-
-BUNDLED WITH
-   1.16.1