dsl_evaluator 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd75a6a48ce5a9eb6858f470264eaf01af1039d93e4be1d5f609f8bc381ba297
-  data.tar.gz: d21493fb8aa7d9c78c7e873374a8037c1c40fd3991f4002c379ac0926c0e0e45
+  metadata.gz: b8435bd7d87d467ba317984fd74bd31c8af789524228a5ae8895d50856efb1d2
+  data.tar.gz: d8297543d1c5e02f2c3a2333c5f45417318f34bb32d6d10175a3b09d2dbada53
 SHA512:
-  metadata.gz: fa1913f87e7c7285bf3266097742353fbbb1817dface02543513798aba3d6b284b9231a8702199d3229accf57b6480f620490e15b23d92b25c9f0c03432bf742
-  data.tar.gz: 995507941a52c9b0ad3691346268ed5a30d852fb116cc7cd8132692343760411ed213f0b9815a43f20926e35b22d502d9bc3d37d4dd1062fd7d6037d86324305
+  metadata.gz: ac18d9e60a195db5cb84befd2ebb49eee7891f6de1b8faed08c686cceb9149d047322fa90eaebccfe11e9a66eb23c026c34eaa0ec988eadfcf30a8925e0a7822
+  data.tar.gz: 0c06aaffebf2bd326e86ddd5f45bc1dbd89a5d330e43e70b3371df3e93cb3f202b7b9b370a8ae3d35698e745b70dfe418a949d12fc4bebbf34bde9d25070225f

data/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [0.2.3] - 2022-02-27
+- [#5](https://github.com/tongueroo/dsl_evaluator/pull/5) add zeitwerk dependency
+
+## [0.2.2] - 2022-02-25
+- dont filter lines with FULL_BACKTRACE=1
+
+## [0.2.1] - 2022-02-25
+- [#4](https://github.com/tongueroo/dsl_evaluator/pull/4) add config.select_pattern option
+
 ## [0.2.0] - 2022-02-24
 - [#3](https://github.com/tongueroo/dsl_evaluator/pull/3) major improvements: configure ability
 

data/dsl_evaluator.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "memoist"
   spec.add_dependency "rainbow"
+  spec.add_dependency "zeitwerk"
 end

data/lib/dsl_evaluator/app.rb

@@ -1,3 +1,5 @@
+require "singleton"
+
 module DslEvaluator
   class App
     extend Memoist
@@ -21,6 +23,7 @@ module DslEvaluator
 
       config.backtrace = ActiveSupport::OrderedOptions.new
       config.backtrace.reject_pattern = nil # dont use .reject. Seems its used internally by ActiveSupport::OrderedOptions
+      config.backtrace.select_pattern = nil
 
       config
     end

data/lib/dsl_evaluator/autoloader.rb

@@ -1,3 +1,5 @@
+require "zeitwerk"
+
 module DslEvaluator
   class Autoloader
     class Inflector < Zeitwerk::Inflector

data/lib/dsl_evaluator/printer.rb

@@ -52,21 +52,11 @@ module DslEvaluator
       if ENV['FULL_BACKTRACE']
         logger.error @error.message.color(:red)
         logger.error lines.join("\n")
+      else
+        lines = reject(lines)
+        lines = select(lines)
       end
 
-      # Keep DslEvaluator.backtrace_reject for backwards compatibility
-      backtrace_reject = config.backtrace.reject_pattern || DslEvaluator.backtrace_reject
-      if backtrace_reject
-        lines = lines.reject do |l|
-          if backtrace_reject.is_a?(String)
-            l.include?(backtrace_reject)
-          else
-            l.match(backtrace_reject)
-          end
-        end
-      end
-      lines = lines.reject { |l| l.include?("lib/dsl_evaluator") } # ignore internal lib/dsl_evaluator backtrace lines
-
       error_info = lines.first
       parts = error_info.split(':')
       windows = error_info.match(/^[a-zA-Z]:/)
@@ -77,6 +67,35 @@ module DslEvaluator
       {path: path, line_number: line_number}
     end
 
+    def reject(lines)
+      # Keep DslEvaluator.backtrace_reject for backwards compatibility
+      pattern = config.backtrace.reject_pattern || DslEvaluator.backtrace_reject
+      return lines unless pattern
+
+      lines.reject! do |l|
+        if pattern.is_a?(String)
+          l.include?(pattern)
+        else
+          l.match(pattern)
+        end
+      end
+      # Always ignore internal lib/dsl_evaluator backtrace lines
+      lines.reject { |l| l.include?("lib/dsl_evaluator") }
+    end
+
+    def select(lines)
+      pattern = config.backtrace.select_pattern
+      return unless pattern
+
+      lines.select do |l|
+        if pattern.is_a?(String)
+          l.include?(pattern)
+        else
+          l.match(pattern)
+        end
+      end
+    end
+
     def pretty_path(path)
       path.sub("#{config.root}/",'')
     end

data/lib/dsl_evaluator/version.rb

@@ -1,3 +1,3 @@
 module DslEvaluator
-  VERSION = "0.2.0"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsl_evaluator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-24 00:00:00.000000000 Z
+date: 2022-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - tongueroo@gmail.com