escalate 0.2.0.pre.1 → 0.2.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a0dc76f8fb9f09d141c117b3b746b143078712c8d14687e9a413f9e0db0eee4
-  data.tar.gz: 0a8861399988e40db304ff5bed43a5a3c6359eb2f0853f162515c5883e74c613
+  metadata.gz: 8e6dc6ba580b590c324c351001687805582d7a2d757cb7aebeaed1a6ee50d07b
+  data.tar.gz: '02439935ba7a19a8c68b5ff0adcad892d658b29a2f843311a79a798fa090fac2'
 SHA512:
-  metadata.gz: 95f0fd83333e4245756cee9c5fff725255a8b81e954102ad22e8d0d2c0f49bf27050c15154a00a309d4c0bce8f9edd7e5247aba3dfdc8b2f9b1fa64cbf281ab8
-  data.tar.gz: 62f87cc4801ff0a5187c251ec2fe0e47433d52ab4bdc89558af29a57f6bbf50ee912c9e92127c4a152a5008cf1d7e3110735b8082ec540b6aac9e7d95bf2fa18
+  metadata.gz: 39d9cb26ed59b9eca7f0a234ed2ead5375ae2144128098b6cd74bbabe54cdd6281278baaf12cf186a4873c9bf50092f5440e4e10931da33f606bca344f76edd6
+  data.tar.gz: d9608ff9899f52a7a99a2e26937340b3909d4715e9f5dbd68bdb7474fbe2782c7419f277ef3ab3d21d931a4fa9ad656b877929796707003fb01b771e8910370f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    escalate (0.2.0.pre.1)
+    escalate (0.2.0.pre.2)
       activesupport
 
 GEM

data/lib/escalate.rb

@@ -9,6 +9,8 @@ require_relative "escalate/mixin"
 module Escalate
   class Error < StandardError; end
 
+  LOG_FIRST_INSTANCE_VARIABLE = :@_escalate_log_first
+
   class << self
     # Logs and escalated an exception
     #
@@ -25,7 +27,7 @@ module Escalate
     #   Any additional context to be tied to the escalation
     def escalate(exception, location_message, logger, **context)
       ensure_failsafe("Exception rescued while escalating #{exception.inspect}") do
-        if on_escalate_blocks.any? || on_escalate_no_log_first_blocks.none?
+        if on_escalate_blocks.none? || on_escalate_blocks.any? { |block| block.instance_variable_get(LOG_FIRST_INSTANCE_VARIABLE) }
           error_message = <<~EOS
             [Escalate] #{location_message} (#{context.inspect})
             #{exception.class.name}: #{exception.message}
@@ -39,7 +41,7 @@ module Escalate
           end
         end
 
-        all_on_escalate_blocks.each do |block|
+        on_escalate_blocks.each do |block|
           ensure_failsafe("Exception rescued while escalating #{exception.inspect} to #{block.inspect}") do
             block.call(exception, location_message, **context)
           end
@@ -87,16 +89,12 @@ module Escalate
     # @param [boolean] log_first: true
     #   whether escalate should log first before escalating, or leave the logging to the escalate block
     def on_escalate(log_first: true, &block)
-      if log_first
-        on_escalate_blocks.add(block)
-      else
-        on_escalate_no_log_first_blocks.add(block)
-      end
+      block.instance_variable_set(LOG_FIRST_INSTANCE_VARIABLE, log_first)
+      on_escalate_blocks.add(block)
     end
 
-    def clear_all_on_escalate_blocks
+    def clear_on_escalate_callbacks
       on_escalate_blocks.clear
-      on_escalate_no_log_first_blocks.clear
     end
 
     private
@@ -115,13 +113,5 @@ module Escalate
     def on_escalate_blocks
       @on_escalate_blocks ||= Set.new
     end
-
-    def on_escalate_no_log_first_blocks
-      @on_escalate_no_log_first_blocks ||= Set.new
-    end
-
-    def all_on_escalate_blocks
-      on_escalate_blocks + on_escalate_no_log_first_blocks
-    end
   end
 end

data/lib/escalate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Escalate
-  VERSION = "0.2.0.pre.1"
+  VERSION = "0.2.0.pre.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: escalate
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre.1
+  version: 0.2.0.pre.2
 platform: ruby
 authors:
 - Invoca Development