enhanced_errors 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbb09107f2f0aa86f1d75a293adaa6088123f46bec7b93d2e521e27a7619b829
-  data.tar.gz: a735a7ae935b3718d24f391e55ca7685fafe507ed8ca72a6f79aca07422aad5e
+  metadata.gz: f31d5706d675b416846c7fe44cc1c6f6eb405489d574a9e9578aebee106109af
+  data.tar.gz: a5d31e4545534bfba158646f30d99bae1107086c51e20d1f8a5ad77454d74c23
 SHA512:
-  metadata.gz: 8de7cf2dddc8b575d191605a060a55c56fe13867edbd3b81de2c4fd21905f28de88695dd5e5b5de7a36dce5195165587977f1d3151edd2e19207efe8aac93ee7
-  data.tar.gz: 227b68eaeaa3050e9566067041d322ec121ae9331dad1e6bbed8686766efdcdc2608ab25dadce266acd04190ea490b8b347f5fb0710d785d9c7b0aedccc452c9
+  metadata.gz: b79305f72e59ac8c615b137b6279c74d13156085d698bcc6efaf0d6c637bd489d6bfe1e93bfc1aede2673abe60033b3e64111b07b4916b4fe880f417684bfdbd
+  data.tar.gz: 97c791940c780ee0952e82f256b640923ba59623052224ec0c3ca5d84bf57a471f349e281cea82c0f00976dbba497a62bdc39fa5f1115d655e96baa980d0215c

data/enhanced_errors.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = "enhanced_errors"
-  spec.version = "3.0.2"
+  spec.version = "3.0.3"
   spec.authors = ["Eric Beland"]
 
   spec.summary = "Automatically enhance your errors with messages containing variable values from the moment they were raised."

data/lib/enhanced_errors.rb

@@ -161,25 +161,22 @@ class EnhancedErrors
 
     def override_rspec_message(example, binding_or_bindings)
       exception_obj = example.exception
-      case exception_obj
-      when nil
-        return nil
-      when RSpec::Core::MultipleExceptionError
+      return if exception_obj.nil?
+
+      from_bindings = [binding_or_bindings].flatten.compact
+      case exception_obj.class.to_s
+      when 'RSpec::Core::MultipleExceptionError'
         exception_obj.all_exceptions.each do |exception|
-          override_exception_message(exception, binding_or_bindings)
+          override_exception_message(exception, from_bindings + exception.binding_infos)
         end
-      else
+      when 'RSpec::Expectations::ExpectationNotMetError'
         override_exception_message(exception_obj, binding_or_bindings)
+      else
+        override_exception_message(exception_obj, from_bindings + exception_obj.binding_infos)
       end
     end
 
     def override_exception_message(exception, binding_or_bindings)
-      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 (test_binding || exception_binding) && has_message
-
       variable_str = EnhancedErrors.format(binding_or_bindings)
       message_str = exception.message
       exception.define_singleton_method(:unaltered_message) { message_str }
@@ -281,35 +278,37 @@ class EnhancedErrors
         @capture_next_binding = false
         @rspec_tracepoint&.disable
 
-        @rspec_tracepoint = TracePoint.new(:raise, :b_return) do |tp|
-          # puts "name #{tp.raised_exception.class.name rescue ''} method:#{tp.method_id} tp.binding:#{tp.binding.local_variables rescue ''}"
-          # puts "event: #{tp.event} defined_class#{class_to_string(tp.defined_class)} #{tp.path}:#{tp.lineno} #{tp.callee_id} "
-          # This trickery below is to help us identify the anonymous block return we want to grab
-          # Very kluge-y and edge cases have grown it, but it works
-          if tp.event == :b_return
-            if RSPEC_HANDLER_NAMES.include?(class_to_string(tp.defined_class))
-              @capture_next_binding = :next
-              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
-              @rspec_example_binding = tp.binding
-            end
-          elsif tp.event == :raise
+        @rspec_tracepoint = TracePoint.new(:raise) do |tp|
             class_name = tp.raised_exception.class.name
             case class_name
             when 'RSpec::Expectations::ExpectationNotMetError'
-              @capture_next_binding = :next_matching
+              start_rspec_binding_trap
             else
               handle_tracepoint_event(tp)
             end
           end
         end
         @rspec_tracepoint.enable
+    end
+
+    # grab the next rspec binding that goes by, and then stop the expensive listening trace
+    def start_rspec_binding_trap
+      @rspec_binding_trap = TracePoint.new(:b_return) do |tp|
+        # kluge-y hack and will be a pain to maintain
+        if tp.callee_id == :handle_matcher
+          @capture_next_binding = :next
+          next
+        end
+        next unless @capture_next_binding
+        @capture_next_binding = false
+        @rspec_example_binding = tp.binding
+        @rspec_binding_trap.disable
+        @rspec_binding_trap = nil
       end
+      @rspec_binding_trap.enable
     end
 
+
     def stop_rspec_binding_capture
       mutex.synchronize do
         @rspec_tracepoint&.disable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enhanced_errors
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Eric Beland