appydays 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb1862009d51664566983d9878a212b53fbe7db55fa434e169460f86e946f7ed
-  data.tar.gz: 7eecb5b9dcbe494cdbfeb8724ac28f2e6a51db029caab5a39b5d5d8c2b08a7ea
+  metadata.gz: c62e5c29b61ec33a407cded74ed7aa319d35930f967abb466e320301ca95d54d
+  data.tar.gz: 02f4728257bc7939e2523cde295eae642f7ae7e3380e2317a471041228a53990
 SHA512:
-  metadata.gz: 4a0c0fd8f35ac2e1d39a91cb6b9a32b753e57035c4f34e6ef42a16f32dd344ce7acd18b2198037b5b47e18132ddffcafeedae593dc5b9cf65c1b92756c6ff5c3
-  data.tar.gz: a9d3043afcb2e5c4338757fc83107b77d1bd67dccc863fed42e6114d512898794cc8723b07673f80f51fee4a527a03577c40a2476e43370ed0187b46833e6735
+  metadata.gz: ec323ab87f7d961d3a4a1f2dcf43f225ab5a7d6420bfeb99a10e357e07c57a3ed356be9aeeba81475f205b6eea5a678d5dfbe9eed9f0822739931f0661bcbbec
+  data.tar.gz: f1cba7a203aac0fd4cbca21b61c89de8472d564b0f85c3c41c8ddb2cf6947fd47f772f8723dddf3edd929cd5bd6cc497babd70e1e486a830322289e92e717713

data/lib/appydays/configurable.rb

@@ -107,7 +107,7 @@ module Appydays::Configurable
       @target.define_singleton_method(name) do
         self.class_variable_get("@@#{name}")
       end
-      @target.define_singleton_method("#{name}=".to_sym) do |v|
+      @target.define_singleton_method(:"#{name}=") do |v|
         installer._set_value(name, v, side_effect)
       end
 
@@ -136,10 +136,10 @@ module Appydays::Configurable
     def _converter(default, converter)
       return converter if converter
 
-      return ->(v) { v.to_s } if default.nil? || default.is_a?(String)
-      return ->(v) { v.to_i } if default.is_a?(Integer)
-      return ->(v) { v.to_f } if default.is_a?(Float)
-      return ->(v) { v.to_sym } if default.is_a?(Symbol)
+      return lambda(&:to_s) if default.nil? || default.is_a?(String)
+      return lambda(&:to_i) if default.is_a?(Integer)
+      return lambda(&:to_f) if default.is_a?(Float)
+      return lambda(&:to_sym) if default.is_a?(Symbol)
       return ->(v) { v.casecmp("true").zero? } if [TrueClass, FalseClass].include?(default.class)
       raise TypeError, "Uncoercable type %p" % [default.class]
     end
@@ -161,7 +161,7 @@ module Appydays::Configurable
     def _reset(overrides)
       @settings.each do |k, v|
         real_v = overrides.fetch(k, v)
-        @target.send("#{k}=".to_sym, real_v)
+        @target.send(:"#{k}=", real_v)
       end
       self._run_after_configured
     end

data/lib/appydays/dotenviable.rb

@@ -41,7 +41,7 @@ module Appydays::Dotenviable
       ".env",
     ]
     orig_env = nil
-    if env.object_id != ENV.object_id
+    unless env.equal?(ENV)
       orig_env = ENV.to_h
       ENV.replace(env)
     end

data/lib/appydays/loggable/request_logger.rb

@@ -48,7 +48,7 @@ class Appydays::Loggable::RequestLogger
     status, header, body = SemanticLogger.named_tagged(request_id:) do
       @app.call(env)
     end
-    header = Rack::Utils::HeaderHash.new(header)
+    header = Rack::Headers[header]
     body = Rack::BodyProxy.new(body) { self.log_finished(env, began_at, status, header) }
     [status, header, body]
   rescue StandardError => e
@@ -117,7 +117,7 @@ class Appydays::Loggable::RequestLogger
   # This allows you to add useful context to the request without needing
   # a dedicated log message.
   # See README for more info.
-  def self.set_request_tags(**tags)
+  def self.set_request_tags(tags)
     Thread.current[:appydays_request_logger_request_tags] ||= {}
     Thread.current[:appydays_request_logger_request_tags].merge!(tags)
   end

data/lib/appydays/loggable/sequel_logger.rb

@@ -13,12 +13,34 @@ class Sequel::Database
   # Use nil to disable the full message logging.
   module AppydaysLogger
     class << self
-      attr_accessor :truncate_messages_over, :truncation_message, :truncation_context, :log_full_message_level
+      # Messages more than this many characters are truncated.
+      # Defaults to 2000.
+      attr_accessor :truncate_messages_over
+
+      # Placeholder message when truncation occurs.
+      # Defaults to '<truncated>'.
+      attr_accessor :truncation_message
+
+      # How many characters to preserve before and after truncation.
+      # Defaults to 200 (400 total).
+      attr_accessor :truncation_context
+
+      # If set, log the full message at this level when truncation occurs.
+      # For example, a truncated message may be logged at :info,
+      # and the full message logged at +:default+.
+      # Defaults to +nil+ (does not log full messages when truncation occurs).
+      attr_accessor :log_full_message_level
+
+      # Log slow queries at this level.
+      # See +Sequel::Database#log_warn_duration+.
+      # Default to +:warn+.
+      attr_accessor :slow_query_log_level
 
       def setdefaults
         @truncate_messages_over = 2000
-        @truncation_message = "<truncated, full message logged at debug>"
+        @truncation_message = "<truncated>"
         @truncation_context = 200
+        @slow_query_log_level = :warn
       end
 
       def truncate_message(message)
@@ -58,7 +80,7 @@ class Sequel::Database
     lwd = log_warn_duration
     was_truncated = false
     log_each(
-      lwd && (duration >= lwd) ? :warn : sql_log_level,
+      lwd && (duration >= lwd) ? AppydaysLogger.slow_query_log_level : sql_log_level,
       proc { "(#{'%0.6fs' % duration}) #{message}" },
       proc do
         query = AppydaysLogger.truncate_message(message)

data/lib/appydays/loggable/sidekiq_job_logger.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 require "sidekiq"
-require "sidekiq/version"
+require "sidekiq/component"
 require "sidekiq/job_logger"
+require "sidekiq/version"
 
 require "appydays/loggable"
 require "appydays/configurable"
@@ -10,15 +11,15 @@ require "appydays/configurable"
 class Appydays::Loggable::SidekiqJobLogger < Sidekiq::JobLogger
   include Appydays::Configurable
   include Appydays::Loggable
-  begin
-    require "sidekiq/util"
-    include Sidekiq::Util
-  rescue LoadError
-    require "sidekiq/component"
-    include Sidekiq::Component
-  end
+  include Sidekiq::Component
 
-  Sidekiq.logger = self.logger
+  # Level to log 'job_done' messages at.
+  # Defaults to +:info+.
+  attr_accessor :log_level_job_done
+
+  # Level to log slow jobs at.
+  # Defaults to +:warn+.
+  attr_accessor :log_level_slow_job
 
   def call(item, _queue, &)
     start = self.now
@@ -38,7 +39,11 @@ class Appydays::Loggable::SidekiqJobLogger < Sidekiq::JobLogger
     extra_tags = {job_class: item["class"], thread_id: self.tid}
     yield
     duration = self.elapsed(start)
-    log_method = duration >= self.slow_job_seconds ? :warn : :info
+    log_method = if duration >= self.slow_job_seconds
+                   self.log_level_slow_job || :warn
+    else
+      self.log_level_job_done || :info
+    end
     self.logger.send(log_method, "job_done", duration: duration * 1000, **extra_tags, **self.class.job_tags)
   rescue StandardError
     # Do not log the error since it is probably a sidekiq retry error
@@ -68,7 +73,7 @@ class Appydays::Loggable::SidekiqJobLogger < Sidekiq::JobLogger
 
   def self.job_tags = Thread.current[:appydays_sidekiq_job_logger_job_tags] || {}
 
-  def self.error_handler(ex, ctx)
+  def self.error_handler(ex, ctx, _config)
     # ctx looks like:
     # {
     # :context=>"Job raised exception",

data/lib/appydays/loggable/spec_helpers.rb

@@ -7,7 +7,7 @@ module Appydays::Loggable::SpecHelpers
     # Appydays::Loggable.ensure_stderr_appender
 
     context.around(:each) do |example|
-      override_level = (example.metadata[:log] || example.metadata[:logging])
+      override_level = example.metadata[:log] || example.metadata[:logging]
       if override_level
         orig_level = SemanticLogger.default_level
         SemanticLogger.default_level = override_level

data/lib/appydays/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appydays
-  VERSION = "0.12.1"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: appydays
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Lithic Tech
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: semantic_logger
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -142,56 +141,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.31.1
+        version: 1.77.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.31.1
+        version: 1.77.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.2
+        version: 1.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.2
+        version: 1.25.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: rubocop-sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +211,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -252,7 +251,6 @@ description: 'appydays provides support for env-based configuration, and common
   logging capabilities
 
   '
-email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -273,7 +271,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -281,15 +278,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Provides support for env-based configuration, and common structured logging
   capabilities