enhanced_errors 2.1.3 → 3.0.0

data/lib/enhanced_errors.rb

@@ -24,7 +24,7 @@ class EnhancedErrors
     attr_accessor :enabled, :config_block, :on_capture_hook, :eligible_for_capture, :exception_trace, :override_messages
 
     GEMS_REGEX = %r{[\/\\]gems[\/\\]}
-    DEFAULT_MAX_LENGTH = 2000
+    DEFAULT_MAX_CAPTURE_LENGTH = 2500
     MAX_BINDING_INFOS = 3
 
     RSPEC_SKIP_LIST = [
@@ -87,7 +87,7 @@ class EnhancedErrors
     RSPEC_HANDLER_NAMES = ['RSpec::Expectations::PositiveExpectationHandler', 'RSpec::Expectations::NegativeExpectationHandler']
 
     @enabled = nil
-    @max_length = nil
+    @max_capture_length = nil
     @capture_rescue = nil
     @skip_list = nil
     @capture_events = nil
@@ -131,18 +131,21 @@ class EnhancedErrors
       mutex.synchronize { @max_capture_events || -1 }
     end
 
+
+    def max_capture_length
+      mutex.synchronize { @max_capture_length || DEFAULT_MAX_CAPTURE_LENGTH }
+    end
+
+    def max_capture_length=(val)
+      mutex.synchronize { @max_capture_length = value }
+    end
+
     def max_capture_events=(value)
       mutex.synchronize do
         @max_capture_events = value
       end
     end
 
-    def enforce_capture_limit
-      exceeded = capture_limit_exceeded?
-      disable_capturing! if capture_limit_exceeded?
-      exceeded
-    end
-
     def capture_limit_exceeded?
       mutex.synchronize do
        max_capture_events > 0 && capture_events_count >= max_capture_events
@@ -158,13 +161,6 @@ class EnhancedErrors
       end
     end
 
-    def increment_capture_events_count
-      mutex.synchronize do
-        @capture_events_count ||= 0
-        @max_capture_events ||= -1
-        @capture_events_count += 1
-      end
-    end
 
     def reset!
       mutex.synchronize do
@@ -179,17 +175,6 @@ class EnhancedErrors
       end
     end
 
-    def max_length(value = nil)
-      mutex.synchronize do
-        if value.nil?
-          @max_length ||= DEFAULT_MAX_LENGTH
-        else
-          @max_length = value
-        end
-        @max_length
-      end
-    end
-
     def skip_list
       mutex.synchronize do
         @skip_list ||= DEFAULT_SKIP_LIST
@@ -202,30 +187,27 @@ class EnhancedErrors
       when nil
         return nil
       when RSpec::Core::MultipleExceptionError
-        override_exception_message(exception_obj.all_exceptions.first, binding_or_bindings)
+        exception_obj.all_exceptions.each do |exception|
+          override_exception_message(exception, binding_or_bindings)
+        end
       else
         override_exception_message(exception_obj, binding_or_bindings)
       end
-
     end
 
     def override_exception_message(exception, binding_or_bindings)
-      return nil unless exception
-      rspec_binding = !(binding_or_bindings.nil? || binding_or_bindings.empty?)
+      return nil unless exception && exception.respond_to?(:message)
+      test_binding = !(binding_or_bindings.nil? || binding_or_bindings.empty?)
       exception_binding = (exception.binding_infos.length > 0)
       has_message = !(exception.respond_to?(:unaltered_message))
-      return nil unless (rspec_binding || exception_binding) && has_message
+      return nil unless (test_binding || exception_binding) && has_message
 
       variable_str = EnhancedErrors.format(binding_or_bindings)
       message_str = exception.message
-      if exception.respond_to?(:captured_variables) && !message_str.include?(exception.captured_variables)
-        message_str += exception.captured_variables
-      end
       exception.define_singleton_method(:unaltered_message) { message_str }
       exception.define_singleton_method(:message) do
         "#{message_str}#{variable_str}"
       end
-      exception
     end
 
     def add_to_skip_list(*vars)
@@ -304,13 +286,12 @@ class EnhancedErrors
     end
 
     def start_minitest_binding_capture
-      return if enforce_capture_limit
+      EnhancedExceptionContext.clear_all
       @enabled = true if @enabled.nil?
       mutex.synchronize do
         @minitest_trace = TracePoint.new(:return) do |tp|
           next unless tp.method_id.to_s.start_with?('test_') && is_a_minitest?(tp.defined_class)
           @minitest_test_binding = tp.binding
-          increment_capture_events_count
         end
         @minitest_trace.enable
       end
@@ -339,7 +320,6 @@ class EnhancedErrors
     end
 
     def start_rspec_binding_capture
-      return if enforce_capture_limit
       @enabled = true if @enabled.nil?
       mutex.synchronize do
         @rspec_example_binding = nil
@@ -357,10 +337,8 @@ class EnhancedErrors
               next
             end
             next unless @capture_next_binding
-
             if @capture_next_binding == :next || @capture_next_binding == :next_matching && is_rspec_example?(tp)
               @capture_next_binding = false
-              increment_capture_events_count
               @rspec_example_binding = tp.binding
             end
           elsif tp.event == :raise
@@ -385,7 +363,7 @@ class EnhancedErrors
         binding_info = convert_binding_to_binding_info(@rspec_example_binding) if @rspec_example_binding
         @capture_next_binding = false
         @rspec_example_binding = nil
-        binding_info
+        return binding_info
       end
     end
 
@@ -587,7 +565,7 @@ class EnhancedErrors
       end
 
       mutex.synchronize do
-        max_len = @max_length || DEFAULT_MAX_LENGTH
+        max_len = @max_capture_length || DEFAULT_MAX_CAPTURE_LENGTH
         if result.length > max_len
           result = result[0...max_len] + "... (truncated)"
         end
@@ -605,7 +583,6 @@ class EnhancedErrors
     def handle_tracepoint_event(tp)
       # Check enabled outside the synchronized block for speed, but still safe due to re-check inside.
       return unless enabled
-      return if enforce_capture_limit
       return if Thread.current[:enhanced_errors_processing] || Thread.current[:on_capture] || ignored_exception?(tp.raised_exception)
 
       Thread.current[:enhanced_errors_processing] = true
@@ -681,7 +658,6 @@ class EnhancedErrors
 
       if binding_info
         binding_info = validate_binding_format(binding_info)
-        increment_capture_events_count
         if binding_info && exception.binding_infos.length >= MAX_BINDING_INFOS
           exception.binding_infos.delete_at(MAX_BINDING_INFOS / 2.round)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enhanced_errors
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Eric Beland
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 2024-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -84,12 +84,15 @@ files:
 - benchmark/benchmark.rb
 - benchmark/memory_bench.rb
 - benchmark/stackprofile.rb
+- doc/Context.html
 - doc/Enhanced.html
 - doc/Enhanced/Colors.html
 - doc/Enhanced/Integrations.html
 - doc/Enhanced/Integrations/RSpecErrorFailureMessage.html
 - doc/EnhancedErrors.html
+- doc/EnhancedExceptionContext.html
 - doc/Exception.html
+- doc/ExceptionBindingInfos.html
 - doc/Minitest.html
 - doc/_index.html
 - doc/class_list.html
@@ -113,6 +116,8 @@ files:
 - examples/demo_minitest.rb
 - examples/demo_rspec.rb
 - lib/enhanced/colors.rb
+- lib/enhanced/context.rb
+- lib/enhanced/enhanced_exception_context.rb
 - lib/enhanced/exception.rb
 - lib/enhanced/minitest_patch.rb
 - lib/enhanced_errors.rb
@@ -136,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Automatically enhance your errors with messages containing variable values