technologic 0.25.0 → 0.25.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e333d0af1583653fced513daedb31e19418713c0caa7b4e43a901caa33424480
-  data.tar.gz: 8b65c9e69d6262921b46d54b98efedb8f5893e45574f5765f6226aa1a9685578
+  metadata.gz: 7cd57de02d8a86f3c7a1911a8236379b92fe9609cbf84e09b1b69714f312b220
+  data.tar.gz: e2af80cc1e626c02fe427871beb6732a87f79b342588ce172ce1ad6cbd3dbbff
 SHA512:
-  metadata.gz: c72e054a970b09029029ddbad1d0d20cc4f099b7e2cfd8e57d11a0724ef0455bdf918ba84c8515374d6ad2775ee47aa5716d3923c7e5b7f3b61d014c0ae1f68d
-  data.tar.gz: 90df5f8d297bb54d863121b19f1dec7d6dceff5a00ef64d5c30318364c11a3b5e4274763b1f74a01ad30af8fc5be699bd9fe379f459422ec2793c872416a0308
+  metadata.gz: 29b2e092e4819112e8b7befd3a18ee971fedad28d7e17c118e72092dd0f540e6a6f264802e66d2110021cdcfe16ab79c562a9be288eac42feba7efa680e7e5dd
+  data.tar.gz: 111932ca84f04d71bbf12e9b6fb8ac196d8c685808d0832f8b8a1317181872a275f44f4e499e6304539bfdcd36cecebb7bbbaf80e2e999f08969cba80d8f18c4

data/lib/technologic.rb

@@ -29,9 +29,11 @@ module Technologic
   SEVERITIES = %i[debug info warn error fatal].freeze
   EXCEPTION_SEVERITIES = %i[error fatal].freeze
 
+  ACTIVEJOB_WORKAROUND_FIRST_VERSION = Gem::Version.new("6.1.0")
+
   included do
-    delegate :instrument, :surveil, to: :class
-    protected :instrument, :surveil
+    delegate :_tl_instrument, :surveil, to: :class
+    protected :_tl_instrument, :surveil
 
     SEVERITIES.each do |severity|
       delegate severity, to: :class
@@ -46,31 +48,45 @@ module Technologic
     end
   end
 
-  class_methods do
-    def instrument(severity, event, **data, &block)
-      ActiveSupport::Notifications.instrument("#{event}.#{name}.#{severity}", data, &block).tap do
-        # If a block was defined, :instrument will return the value of the block.
-        # Otherwise, :instrument will return nil, since it didn't do anything.
-        # Returning true here allows us to do fun things like `info :subscription_created and return subscription`
-        return true unless block_given?
-      end
+  protected
+
+  # DEP-2021-01-14
+  # Remove this method
+  def instrument(*args, **opts, &block)
+    # Targeted workaround for ActiveJob#instrument in Rails 6.1+
+    return super if defined?(ActiveJob) && self.class <= ActiveJob::Base && ActiveJob.version >= ACTIVEJOB_WORKAROUND_FIRST_VERSION
+
+    ActiveSupport::Deprecation.warn("Technologic#instrument is deprecated. Instead, use the corresponding severity-level convenience method (#info, #error etc)")
+
+    _tl_instrument(*args, **opts, &block)
+  end
+
+  module ClassMethods
+    # DEP-2021-01-14
+    # Remove this method
+    def instrument(*args, **opts, &block)
+      ActiveSupport::Deprecation.warn("Technologic.instrument is deprecated. Instead, use the corresponding severity-level convenience method (#info, #error etc)")
+
+      _tl_instrument(*args, **opts, &block)
     end
 
     def surveil(event, severity: :info, **data, &block)
       raise LocalJumpError unless block_given?
 
-      instrument(severity, "#{event}_started", **data)
-      instrument(severity, "#{event}_finished", &block)
+      raise ArgumentError, "Invalid severity: #{severity}" unless severity.to_sym.in?(SEVERITIES)
+
+      __send__(severity, "#{event}_started", **data)
+      __send__(severity, "#{event}_finished", &block)
     end
 
     SEVERITIES.each do |severity|
-      define_method(severity) { |event, **data, &block| instrument(severity, event, **data, &block) }
+      define_method(severity) { |event, **data, &block| _tl_instrument(severity, event, **data, &block) }
     end
 
     EXCEPTION_SEVERITIES.each do |severity|
       define_method("#{severity}!") do |exception = StandardError, message = nil, **data, &block|
         if exception.is_a?(Exception)
-          instrument(
+          _tl_instrument(
             severity,
             exception.class.name.demodulize,
             **{
@@ -88,6 +104,17 @@ module Technologic
         end
       end
     end
+
+    protected
+
+    def _tl_instrument(severity, event, **data, &block)
+      ActiveSupport::Notifications.instrument("#{event}.#{name}.#{severity}", data, &block).tap do
+        # If a block was defined, :instrument will return the value of the block.
+        # Otherwise, :instrument will return nil, since it didn't do anything.
+        # Returning true here allows us to do fun things like `info :subscription_created and return subscription`
+        return true unless block_given?
+      end
+    end
   end
 end
 

data/lib/technologic/version.rb

@@ -2,5 +2,5 @@
 
 module Technologic
   # This constant is managed by spicerack
-  VERSION = "0.25.0"
+  VERSION = "0.25.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: technologic
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.25.5
 platform: ruby
 authors:
 - Eric Garside
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.25.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.25.5
 description: A clean and terse way to produce standardized, highly actionable, and
   data-rich logs
 email:
@@ -87,7 +87,7 @@ metadata:
   homepage_uri: https://github.com/Freshly/spicerack/tree/master/technologic
   source_code_uri: https://github.com/Freshly/spicerack/tree/master/technologic
   changelog_uri: https://github.com/Freshly/spicerack/blob/master/technologic/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/technologic/0.25.0
+  documentation_uri: https://www.rubydoc.info/gems/technologic/0.25.5
 post_install_message: 
 rdoc_options: []
 require_paths: